Merge branch 'master' into zgt移除ManualInvoicingModal中的非必要注释代码

发现并删除了ManualInvoicingModal组件中未使用的注释代码，以提高代码清晰度和维护性。

Merge branch 'master' into zgt移除ManualInvoicingModal中的非必要注释代码
发现并删除了ManualInvoicingModal组件中未使用的注释代码，以提高代码清晰度和维护性。
曾国涛
1 parent 2d6efa55
Showing 5 changed files with 74 additions and 38 deletions
src/pages/Client/index.tsx
src/pages/Invoice/InvoiceRecord/index.tsx
src/pages/Invoice/waitProcessRecord/index.tsx
src/pages/Order/index.tsx
src/pages/procure/components/AddDrawer.tsx
@@ -256,7 +256,6 @@ export default () =&gt; {
             return data;
           }}
           search={{
-            defaultCollapsed: false,
             optionRender: (searchConfig, formProps, dom) => [
               ...dom.reverse(),
               <Button
@@ -53,11 +53,13 @@ const InvoiceRecord = () =&gt; {
     {
       dataIndex: 'index',
       valueType: 'indexBorder',
+      width: 50,
     },
     {
       title: '开票编号',
       valueType: 'text',
       dataIndex: 'id',
+      width: 100,
       copyable: true,
       ellipsis: true,
     },
@@ -65,13 +67,14 @@ const InvoiceRecord = () =&gt; {
       title: '发票号码',
       valueType: 'text',
       dataIndex: 'invoiceNumber',
+      width: 150,
       copyable: true,
       ellipsis: true,
     },
     {
       title: '重开发票',
       key: 'reissueInvoiceNumbers',
-      width: 120,
+      width: 150,
       ellipsis: true,
       hideInSearch: true,
       render: (_, record) => {
@@ -101,6 +104,7 @@ const InvoiceRecord = () =&gt; {
       title: '发票类型',
       valueType: 'Text',
       dataIndex: 'typeText',
+      width: 100,
       hideInSearch: true,
       ellipsis: true,
     },
@@ -108,6 +112,7 @@ const InvoiceRecord = () =&gt; {
       title: '发票状态',
       valueType: 'Text',
       dataIndex: 'statusText',
+      width: 100,
       hideInSearch: true,
       ellipsis: true,
     },
@@ -122,6 +127,7 @@ const InvoiceRecord = () =&gt; {
       title: '联系人',
       valueType: 'text',
       dataIndex: 'contacts',
+      width: 100,
       hideInSearch: true,
       ellipsis: true,
     },
@@ -141,6 +147,7 @@ const InvoiceRecord = () =&gt; {
     {
       title: '申请人',
       valueType: 'text',
+      width: 100,
       dataIndex: 'createByName',
       hideInSearch: true,
       ellipsis: true,
@@ -149,6 +156,7 @@ const InvoiceRecord = () =&gt; {
       title: '开票金额(元)',
       valueType: 'money',
       dataIndex: 'price',
+      width: 100,
       hideInSearch: true,
       ellipsis: true,
     },
@@ -395,7 +403,7 @@ const InvoiceRecord = () =&gt; {
         form={{}}
         dateFormatter="string"
         headerTitle="待开票列表"
-        scroll={{ x: 1400, y: 360 }}
+        scroll={{ x: 2400, y: 360 }}
         toolBarRender={() => []}
       />
@@ -135,6 +135,14 @@ const InvoiceRecord = () =&gt; {
       ellipsis: true,
     },
     {
+      title: '联系人',
+      valueType: 'text',
+      dataIndex: 'contacts',
+      width: 100,
+      hideInSearch: true,
+      ellipsis: true,
+    },
+    {
       title: '购方税号',
       valueType: 'text',
       hideInSearch: true,
@@ -194,6 +202,12 @@ const InvoiceRecord = () =&gt; {
       hideInTable: true,
     },
     {
+      title: '联系人',
+      valueType: 'text',
+      dataIndex: 'contactsLike',
+      hideInTable: true,
+    },
+    {
       title: '收款单位',
       valueType: 'select',
       dataIndex: 'partyB',
@@ -402,7 +416,7 @@ const InvoiceRecord = () =&gt; {
         form={{}}
         dateFormatter="string"
         headerTitle="待开票列表"
-        scroll={{ x: 2400, y: 500 }}
+        scroll={{ x: 2000, y: 500 }}
       />
       {invoiceRecordDetailVisible ? (
         <InvoiceRecordDetailModal
@@ -77,7 +77,7 @@ import {
 } from 'antd';
 import Base64 from 'base-64';
 import { cloneDeep } from 'lodash';
-import React, { Key, useEffect, useRef, useState } from 'react';
+import React, { Key, useEffect, useMemo, useRef, useState } from 'react';
 import OrderPrintModal from '../OrderPrint/OrderPrintModal';
 import AfterSalesDrawer from './components/AfterSalesDrawer';
 import ApplyForInvoicingModal from './components/ApplyForInvoicingModal';
@@ -188,7 +188,7 @@ const OrderPage = () =&gt; {
   const [imagesViewerOptType, setImagesViewerOptType] = useState('');
   const [filterCondifion, setFilterCondition] = useState(0);
   const [mainOrderSelectedMap] = useState(new Map()); //选中的主订单Map key：主订单id value：主订单数据
-  const [subOrderSelectedMap] = useState(new Map()); //选中的子订单Map key：主订单id value：选中的子订单数据集合
+  const [subOrderSelectedMap, setSubOrderSelectedMap] = useState(new Map()); //选中的子订单Map key：主订单id value：选中的子订单数据集合
   const [currentOptMainId, setCurrentMainId] = useState<any>(undefined); //当前操作对象的主订单id
   const [curretnOptSubId, setCurretnOptSubId] = useState<any>(undefined); //当前操作对象的子订单id
   const [subOrderCount, setSubOrderCount] = useState(0);
@@ -206,6 +206,18 @@ const OrderPage = () =&gt; {
   const [ids, setIds] = useState([]);
   const [recordOptNode, setRecordOptNode] = useState(null);
   const roleCode = userInfo?.roleSmallVO?.code;
+  const canMergeInvoicing = useMemo(() => {
+    if (subOrderSelectedMap.size === 0) {
+      return false;
+    }
+    // 检查 value.items 中的每个元素
+    console.log(
+      'map' + JSON.stringify([...subOrderSelectedMap.values()].flat()),
+    );
+    return [...subOrderSelectedMap.values()]
+      .flat()
+      .every((subItem) => subItem.paths.includes('applyInvoicing_old'));
+  }, [selectedSubOrderKeys]);
   const triggerRecordOptNode = async (id) => {
     const res = await postServiceOrderGetCurrentOptNode({
@@ -227,12 +239,6 @@ const OrderPage = () =&gt; {
   const exportLoadingDestory = () => {
     messageApi.destroy();
   };
-  useEffect(() => {
-    console.log(
-      'selectedRows',
-      selectedRows.every((item) => item.paths.includes('applyInvoicing_old')),
-    );
-  }, [selectedRows]);
   const refreshTable = () => {
     mainTableRef.current?.reload();
@@ -580,6 +586,7 @@ const OrderPage = () =&gt; {
       mainOrderSelectedMap.set(record.id, record);
       //选中子订单
       subOrderSelectedMap.set(record.id, record.subOrderInformationLists);
+      setSubOrderSelectedMap(new Map(subOrderSelectedMap));
       //如果所有主订单都勾选上了，那么勾选上总选中按钮
       if (
@@ -2347,7 +2354,7 @@ const OrderPage = () =&gt; {
             }
             //如果该主订单已经没有子订单选中，删除key
-            if (currentMainOrderSelectedSubOrderList.length === 0) {
+            if (currentMainOrderSelectedSubOrderList?.length === 0) {
               subOrderSelectedMap.delete(record.id);
             } else {
               subOrderSelectedMap.set(
@@ -4322,12 +4329,7 @@ const OrderPage = () =&gt; {
             setIsMainOrder(true);
             setApplyForInvoicingVisible(true);
           }}
-          disabled={
-            selectedRows.length === 0 ||
-            !selectedRows.every((item) =>
-              item.paths.includes('applyInvoicing_old'),
-            )
-          } /*{selectedSubOrderKeys?.length === 0}*/
+          disabled={!canMergeInvoicing} /*{selectedSubOrderKeys?.length === 0}*/
         >
           {roleCode === 'admin' ? '合并(销售)' : '合并开票'}
         </Button>,
+import { RESPONSE_CODE } from '@/constants/enum';
 import {
   postOrderErpOrderStagesUpload,
+  postProcureReturnBillAdd,
   postServiceConstStores,
 } from '@/services';
 import { enumToSelect } from '@/utils';
@@ -13,7 +15,7 @@ import {
 import { Button, Form, message } from 'antd';
 import { RcFile } from 'antd/es/upload';
-export default () => {
+export default ({ reloadTable }) => {
   const [form] = Form.useForm();
   return (
     <DrawerForm
@@ -33,8 +35,15 @@ export default () =&gt; {
       }}
       submitTimeout={2000}
       onFinish={async (values) => {
-        console.log(values.name);
+        const res = await postProcureReturnBillAdd({
+          data: values,
+        });
+        if (res.result === RESPONSE_CODE.SUCCESS) {
+          message.success('新增成功');
+          return true;
+        }
         message.success('提交成功');
+        reloadTable();
         // 不返回不会关闭弹框
         return true;
       }}
@@ -84,7 +93,7 @@ export default () =&gt; {
         ]}
       ></ProFormTextArea>
       <ProFormSelect
-        name="sendStore"
+        name="sendStoreCode"
         label="发货仓库"
         request={async () => {
           const res = await postServiceConstStores();
@@ -106,22 +115,26 @@ export default () =&gt; {
         label="附件"
         name="attachmentsFile"
         action="upload.do"
-        onChange={({ fileList: newFileList }) => {
-          if (newFileList.length > 0) {
-            const formData = new FormData();
-            formData.append('file', newFileList[0].originFileObj as RcFile);
-            const res = await postOrderErpOrderStagesUpload({
-              data: formData,
-              headers: {
-                'Content-Type':
-                  'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
-              },
-            });
-            const url = res.data;
-            form.setFieldValue('attachments', url);
-          } else {
-            form.setFieldValue('attachments', null);
-          }
+        onChange={(info) => {
+          const uploadFile = async ({ fileList: newFileList }) => {
+            if (newFileList.length > 0) {
+              const formData = new FormData();
+              formData.append('file', newFileList[0].originFileObj as RcFile);
+              const res = await postOrderErpOrderStagesUpload({
+                data: formData,
+                headers: {
+                  'Content-Type':
+                    'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
+                },
+              });
+              const url = res.data;
+              console.log('attachments' + JSON.stringify(url));
+              form.setFieldValue('attachments', url);
+            } else {
+              form.setFieldValue('attachments', null);
+            }
+          };
+          uploadFile(info);
         }}
         max={1}
       />