Merge branch 'master' into warning

曾国涛
2 parents ab8e1402 a5ac14c9
Showing 18 changed files with 79 additions and 46 deletions
.umirc.ts
src/pages/Invoice/Invoice/components/InvoiceVerificationModal.tsx
src/pages/Invoice/Invoice/components/invoiceWriteOffModal.tsx
src/pages/Invoice/Invoice/index.tsx
src/pages/Invoice/InvoiceRecord/components/InvoiceRecordDetailModal.tsx
src/pages/Invoice/InvoiceRecord/components/InvoiceVerificationModal.tsx
src/pages/Invoice/InvoiceVerification/components/InvoiceRecordDetailModal.tsx
src/pages/Invoice/InvoiceVerification/components/InvoiceVerificationModal.tsx
src/pages/Invoice/InvoiceVerification/index.tsx
src/pages/Invoice/constant.tsx
src/pages/Invoice/waitProcessRecord/components/InvoiceVerificationModal.tsx
src/pages/Order/Order/components/InvoiceSubOrderInfoTable.tsx
src/pages/Order/Order/components/InvoicingDrawerForm.tsx
src/pages/Order/Order/components/MessageListDrawer.tsx
src/pages/Order/Order/index.tsx
src/pages/Order/OrderWarning/components/InvoiceSubOrderInfoTable.tsx
src/pages/Order/OrderWarning/components/MessageListDrawer.tsx
src/pages/Order/OrderWarning/index.tsx
@@ -92,14 +92,14 @@ export default defineConfig({
           name: '发票核销',
           path: 'invoice',
           icon: 'BookOutlined',
-          access: 'canReadAdminAndFinance',
+          access: 'canReadAdminAndFinanceAndSales',
           component: './Invoice/Invoice',
         },
         {
           name: '银行流水',
           path: 'invoiceVerification',
           icon: 'BookOutlined',
-          access: 'canReadAdminAndFinance',
+          access: 'canReadAdminAndFinanceAndSales',
           component: './Invoice/InvoiceVerification',
         },
         {
@@ -14,7 +14,6 @@ import {
 import { useEffect, useRef, useState } from 'react';
 import '../index.less';
 import BankChooseModal from './BankChooseModal';
-
 export default ({ invoiceId, setVisible, onClose }) => {
   const [form] = Form.useForm<{ id: string }>();
   const [bankChooseModalVisible, setBankChooseModalVisible] = useState(false);
@@ -41,7 +40,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
             className="pl-1 pr-0"
             type="link"
             target="_blank"
-            href={'/order?id=' + item}
+            href={'/order/order?id=' + item}
           >
             {item}
           </Button>
@@ -275,7 +275,7 @@ export default ({ getData, triggerButton, readOnly }) =&gt; {
                           className="pl-1 pr-0"
                           type="link"
                           target="_blank"
-                          href={'/order?id=' + mainId}
+                          href={'/order/order?id=' + mainId}
                         >
                           {mainId}
                         </Button>
@@ -24,6 +24,7 @@ const InvoiceRecord = () =&gt; {
   const [invoiceVerificationVisible, setInvoiceVerificationVisible] =
     useState(false);
   const [invoiceId, setInvoiceId] = useState(undefined);
+  const [perms, setPerms] = useState([]);
   const [messageApi, contextHolder] = message.useMessage();
   const reloadInvoiceTable = () => {
     invoiceActionRef.current?.reload();
@@ -101,7 +102,7 @@ const InvoiceRecord = () =&gt; {
       width: 160,
       render: (text, record) => {
         let btns = [];
-        if (!record.writeOffId) {
+        if (record.paths?.includes('writeOff') && !record.writeOffId) {
           btns.push(
             <InvoiceWriteOffModal
               getData={() => {
@@ -120,7 +121,7 @@ const InvoiceRecord = () =&gt; {
           );
         }
  
-        if (record.writeOffId) {
+        if (record.paths?.includes('writeOff') && record.writeOffId) {
           btns.push(
             <InvoiceWriteOffModal
               getData={async () => {
@@ -192,13 +193,14 @@ const InvoiceRecord = () =&gt; {
         actionRef={invoiceActionRef}
         cardBordered
         pagination={{
-          pageSize: 10,
+          pageSizeOptions: ['10', '20', '50', '100'],
         }}
         request={async (params) => {
           const res = await postServiceInvoiceQueryInvoice({
             data: { ...params },
           });
           if (res) {
+            setPerms(res?.data?.specialPath);
             return {
               data: res?.data?.data || [],
               total: res?.data?.total || 0,
@@ -254,18 +256,26 @@ const InvoiceRecord = () =&gt; {
         headerTitle="发票列表"
         scroll={{ x: 1400, y: 360 }}
         toolBarRender={() => [
-          <AddInvoiceDrawerForm
-            onClose={() => {
-              invoiceActionRef.current?.reload();
-            }}
-            key="add"
-          ></AddInvoiceDrawerForm>,
-          <InvoiceWriteOffModal
-            readOnly={false}
-            getData={() => ({})}
-            key="writeOff"
-            triggerButton={<Button type="primary">核销</Button>}
-          />,
+          <>
+            {perms?.includes('add') && (
+              <AddInvoiceDrawerForm
+                onClose={() => {
+                  invoiceActionRef.current?.reload();
+                }}
+                key="add"
+              ></AddInvoiceDrawerForm>
+            )}
+          </>,
+          <>
+            {perms?.includes('writeOff') && (
+              <InvoiceWriteOffModal
+                readOnly={false}
+                getData={() => ({})}
+                key="writeOff"
+                triggerButton={<Button type="primary">核销</Button>}
+              />
+            )}
+          </>,
         ]}
       />
  
@@ -254,13 +254,13 @@ export default ({ id, setVisible, reloadTable }) =&gt; {
                 itemRender={({}, { record }) => {
                   console.log('record' + JSON.stringify(record));
                   return (
-                    <Space>
+                    <Space size={[8, 16]} wrap>
                       <Button
                         key={record.mainId}
                         className="pl-1 pr-0"
                         type="link"
                         target="_blank"
-                        href={'/order?id=' + record.mainId}
+                        href={'/order/order?id=' + record.mainId}
                       >
                         {record.mainId}
                       </Button>
@@ -272,7 +272,7 @@ export default ({ id, setVisible, reloadTable }) =&gt; {
                             className="pl-1 pr-0"
                             type="link"
                             target="_blank"
-                            href={'/order?subOrderId=' + item}
+                            href={'/order/order?subOrderId=' + item}
                           >
                             {item}
                           </Button>
@@ -57,7 +57,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
             className="pl-1 pr-0"
             type="link"
             target="_blank"
-            href={'/order?id=' + item}
+            href={'/order/order?id=' + item}
           >
             {item}
           </Button>
@@ -259,7 +259,7 @@ export default ({ id, setVisible }) =&gt; {
                         className="pl-1 pr-0"
                         type="link"
                         target="_blank"
-                        href={'/order?id=' + record.mainId}
+                        href={'/order/order?id=' + record.mainId}
                       >
                         {record.mainId}
                       </Button>
@@ -271,7 +271,7 @@ export default ({ id, setVisible }) =&gt; {
                             className="pl-1 pr-0"
                             type="link"
                             target="_blank"
-                            href={'/order?subOrderId=' + item}
+                            href={'/order/order?subOrderId=' + item}
                           >
                             {item}
                           </Button>
@@ -44,7 +44,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
             className="pl-1 pr-0"
             type="link"
             target="_blank"
-            href={'/order?id=' + item}
+            href={'/order/order?id=' + item}
           >
             {item}
           </Button>
@@ -30,6 +30,7 @@ const InvoiceRecord = () =&gt; {
   const [bankImportModalVisible, setBankImportModalVisible] = useState(false);
   const [invoiceVerificationVisible, setInvoiceVerificationVisible] =
     useState(false);
+  const [perms, setPerms] = useState([]);
   const [messageApi, contextHolder] = message.useMessage();
   const [invoiceId] = useState(undefined);
   const [invoiceRecordDetailVisible, setInvoiceRecordDetailVisible] =
@@ -137,7 +138,7 @@ const InvoiceRecord = () =&gt; {
           );
         }
  
-        if (record.writeOffId !== null) {
+        if (record.paths?.includes('writeOff') && record.writeOffId !== null) {
           btns.push(
             <InvoiceWriteOffModal
               getData={async () => {
@@ -192,7 +193,7 @@ const InvoiceRecord = () =&gt; {
         actionRef={bankActionRef}
         cardBordered
         pagination={{
-          pageSize: 10,
+          pageSizeOptions: ['10', '20', '50', '100'],
         }}
         editable={{
           type: 'multiple',
@@ -209,6 +210,7 @@ const InvoiceRecord = () =&gt; {
             data: { ...params },
           });
           if (res) {
+            setPerms(res?.data?.specialPath);
             return {
               data: res?.data?.data || [],
               total: res?.data?.total || 0,
@@ -264,16 +266,20 @@ const InvoiceRecord = () =&gt; {
         headerTitle="银行流水列表"
         scroll={{ x: 1400, y: 360 }}
         toolBarRender={() => [
-          <Button
-            key="button"
-            icon={<PlusOutlined />}
-            onClick={() => {
-              setBankImportModalVisible(true);
-            }}
-            type="primary"
-          >
-            导入
-          </Button>,
+          <>
+            {perms?.includes('import') && (
+              <Button
+                key="button"
+                icon={<PlusOutlined />}
+                onClick={() => {
+                  setBankImportModalVisible(true);
+                }}
+                type="primary"
+              >
+                导入
+              </Button>
+            )}
+          </>,
         ]}
       />
  
@@ -86,11 +86,18 @@ export const INVOICE_COLUMNS = [
   {
     title: '绑定流水号',
     dataIndex: 'serialNumbersTextByOrder',
-
+    hideInSearch: true,
     valueType: 'text',
     width: 180,
   },
   {
+    title: '金额',
+    dataIndex: 'money',
+    hideInTable: true,
+    valueType: 'money',
+    width: 180,
+  },
+  {
     title: '是否预付款',
     dataIndex: 'orderIsPrePay',
     valueType: 'select',
@@ -294,6 +301,13 @@ export const BANK_STATEMENT_COLUMNS = [
     hideInSearch: true,
   },
   {
+    dataIndex: 'amount',
+    title: '金额',
+    valueType: 'money',
+    width: 100,
+    hideInTable: true,
+  },
+  {
     dataIndex: 'remark',
     title: '备注',
     valueType: 'text',
@@ -57,7 +57,7 @@ export default ({ invoiceId, setVisible, onClose }) =&gt; {
             className="pl-1 pr-0"
             type="link"
             target="_blank"
-            href={'/order?id=' + item}
+            href={'/order/order?id=' + item}
           >
             {item}
           </Button>
@@ -27,7 +27,7 @@ const columns: ProColumns[] = [
                   className="pl-1 pr-0"
                   type="link"
                   target="_blank"
-                  href={'/order?id=' + subOrderId}
+                  href={'/order/order?id=' + subOrderId}
                 >
                   {subOrderId}
                 </Button>
@@ -60,7 +60,7 @@ export default ({ dataList, setVisible, mainOrder, onClose }) =&gt; {
           unit: item.unit,
           quantity: item.quantity,
           price: item.productPrice,
-          totalPrice: item.subOrderPayment,
+          totalPrice: item.quantity * item.productPrice,
         };
       });
       form.setFieldValue('invoiceDetails', initialValue);
@@ -58,7 +58,7 @@ export default ({ setVisible }) =&gt; {
    * 跳转到订单列表
    */
   function toOrderList(mainOrderIds: any) {
-    window.open('/order?id=' + mainOrderIds.join(","), '_blank');
+    window.open('/order/order?id=' + mainOrderIds.join(','), '_blank');
   }
  
   /**
@@ -4541,10 +4541,12 @@ const OrderPage = () =&gt; {
  
     return toolBtns;
   }
+
   const [invoiceWarningNum, setInvoiceWarningNum] = useState(0);
   const [invoiceRefundWarningNum, setInvoiceRefundWarningNum] = useState(0);
   const [open, setOpen] = useState(false);
   const { openCount, setOpenCount } = useModel('count');
+
   async function getInvoiceWarningNum() {
     const res = await postServiceOrderWarningOrderStatistics();
     if (
@@ -4559,6 +4561,7 @@ const OrderPage = () =&gt; {
     setInvoiceWarningNum(res.data.waitConfirmInvoice);
     setInvoiceRefundWarningNum(res.data.waitConfirmReceipt);
   }
+
   useEffect(() => {
     //预警订单数
     getInvoiceWarningNum();
@@ -27,7 +27,7 @@ const columns: ProColumns[] = [
                   className="pl-1 pr-0"
                   type="link"
                   target="_blank"
-                  href={'/order?id=' + subOrderId}
+                  href={'/order/order?id=' + subOrderId}
                 >
                   {subOrderId}
                 </Button>
@@ -58,7 +58,7 @@ export default ({ setVisible }) =&gt; {
    * 跳转到订单列表
    */
   function toOrderList(mainOrderIds: any) {
-    window.open('/order?id=' + mainOrderIds.join(","), '_blank');
+    window.open('/order/order?id=' + mainOrderIds.join(','), '_blank');
   }
  
   /**
@@ -4160,6 +4160,7 @@ const OrderPage = () =&gt; {
     }
     params.salesCode = userInfo.username;
     params.condition = filterCondifion;
+    params.paymentMethod = 'UNPAID';
     params.sorted = sorted;
     // params.isDeleteQueryOrder = filterCondifion === 70;
     params.isDeleteQueryOrder = false;