feat: 添加批处理

PurelzMgnead
1 parent 4a58703c
Showing 11 changed files with 187 additions and 81 deletions
src/access.ts
src/pages/Instalment/components/checkModal/TableCheckModal.tsx
src/pages/Instalment/components/checkModal/checkModal.tsx
src/pages/Instalment/components/detail/detail.tsx
src/pages/Instalment/components/edit/edit.tsx
src/pages/Instalment/components/payWayDetail/payWayDetail.tsx
src/pages/Instalment/components/productDetail/productDetail.tsx
src/pages/Instalment/components/read/read.tsx
src/pages/Instalment/components/title/title.tsx
src/pages/Instalment/components/title/titletest.tsx
src/pages/Instalment/components/upload/payWayUpload.tsx
@@ -13,7 +13,7 @@ export default (initialState: API.UserInfo) =&gt; {
     roleSmallVO?.code === 'salesRepresentative';
   return {
     canReadAdmin: canReadAdmin,
-    canReadProcure: canReadProcure,
+    canReadProcure: canReadProcure || canReadAdmin,
     canReadLinda: username === 'Linda',
     canReadAdminAndFinance: canReadFinance || canReadAdmin,
     canReadSales: canReadSales,
+import { postOrderErpOrderStagesCheckOrderStages } from '@/services';
+import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
+import { Button, Form, Space, message } from 'antd';
+
+const waitTime = (time: number = 100) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+};
+
+export default ({ id, toReload, isShow }) => {
+  const [form] = Form.useForm<{ mark: string }>();
+
+  return (
+    <Space>
+      <ModalForm<{
+        mark: string;
+      }>
+        title="账单审核"
+        width={460}
+        form={form}
+        trigger={
+          <Button type="primary" disabled={isShow}>
+            批量审核
+          </Button>
+        }
+        modalProps={{
+          okText: '通过',
+          cancelText: '驳回',
+          destroyOnClose: true,
+        }}
+        submitter={{
+          render: (props, defaultDoms) => {
+            let myDoms = [];
+            myDoms.push(
+              <Button
+                key="驳回"
+                onClick={async () => {
+                  if (id?.length === 0) {
+                    message.error('没有可审核的订单');
+                    toReload();
+                  } else {
+                    const res = await postOrderErpOrderStagesCheckOrderStages({
+                      data: {
+                        ids: id,
+                        isPass: false,
+                        mark: form.getFieldValue('mark'),
+                      },
+                    });
+                    await waitTime(2000);
+                    if (res.message === '成功') {
+                      message.success('操作成功');
+                    }
+                    toReload();
+                  }
+                  return;
+                }}
+              >
+                驳回
+              </Button>,
+            );
+            myDoms.push(defaultDoms[1]);
+            return myDoms;
+          },
+        }}
+        onFinish={async (values) => {
+          if (id?.length === 0) {
+            message.error('没有可审核的订单');
+            return true;
+          } else {
+            const res = await postOrderErpOrderStagesCheckOrderStages({
+              data: {
+                ids: id,
+                isPass: true,
+                mark: values.mark,
+              },
+            });
+            await waitTime(2000);
+            if (res.message === '成功') {
+              message.success('操作成功');
+            }
+            toReload();
+            return true;
+          }
+        }}
+      >
+        <ProFormTextArea
+          width="lg"
+          name="mark"
+          label="备注"
+          tooltip="请特别注意订单总金额与订单金额。"
+          placeholder="请输入名称"
+        />
+      </ModalForm>
+    </Space>
+  );
+};
@@ -36,7 +36,7 @@ export default ({ id, toReload }) =&gt; {
                 onClick={async () => {
                   const res = await postOrderErpOrderStagesCheckOrderStages({
                     data: {
-                      id: id,
+                      ids: id,
                       isPass: false,
                       mark: form.getFieldValue('mark'),
                     },
@@ -59,7 +59,7 @@ export default ({ id, toReload }) =&gt; {
         onFinish={async (values) => {
           const res = await postOrderErpOrderStagesCheckOrderStages({
             data: {
-              id: id,
+              ids: id,
               isPass: true,
               mark: values.mark,
             },
@@ -186,7 +186,6 @@ export default ({ toReload }) =&gt; {
       }}
       submitTimeout={2000}
       onFinish={async (values) => {
-        console.log(values);
         if (editProductBody.length === 0) {
           message.error('请填写产品数据');
           return false;
@@ -268,11 +267,9 @@ export default ({ toReload }) =&gt; {
             let returnOssID = await postOrderErpOrderStagesSearch({
               data: { contract: values.contract || contextBody.contract },
             });
-            console.log(returnOssID.data);
-
             if (returnOssID) {
               makeEnd = remakeValue.map((item) => {
-                return { ...item, ossId: returnOssID.data[0].id };
+                return { ...item, ossId: returnOssID.data.data[0].id };
               });
             }
           };
@@ -74,7 +74,7 @@ export default ({ currentContract, toReload, showTarget }) =&gt; {
     const res = await postOrderErpOrderStagesSearch({
       data: { contract: currentContract },
     });
-    const context = res.data[0];
+    const context = res.data.data[0];
     if (context?.contract !== null) {
       setContextBody(context);
@@ -84,7 +84,6 @@ export default ({ currentContract, toReload, showTarget }) =&gt; {
   }
   function setSave(value) {
-    console.log(value);
     setOtherBody(value);
   }
@@ -143,8 +142,7 @@ export default ({ currentContract, toReload, showTarget }) =&gt; {
       const res = await postOrderErpOrderStagesSearch({
         data: { contract: value },
       });
-      const context = res.data[0];
-      console.log(context);
+      const context = res.data.data[0];
       if (context?.contract !== null) {
         setContextBody(context);
         setTotal(context?.totalPrice);
@@ -155,7 +153,7 @@ export default ({ currentContract, toReload, showTarget }) =&gt; {
       const res = await postOrderErpOrderStagesSearch({
         data: { contract: currentContract },
       });
-      const context = res.data[0];
+      const context = res.data.data[0];
       if (context?.contract !== null) {
         setContextBody(context);
         setTotal(context?.totalPrice);
@@ -194,7 +192,6 @@ export default ({ currentContract, toReload, showTarget }) =&gt; {
         }
         let remakeValue = [];
         const promises = [];
-        console.log(otherBody);
         otherBody.forEach((item) => {
           let remakeItem = {
             ossId: contextBody.id,
@@ -262,7 +259,6 @@ export default ({ currentContract, toReload, showTarget }) =&gt; {
           data: { ...toSendEdit },
         });
         if (isSaveOrUpdate.message === '成功') {
-          console.log('2');
           getBody(toSendEdit.contract);
           toReload();
         }
@@ -114,7 +114,6 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
         });
         return currt;
       });
-      // console.log(remake);
       setPayWayDetailBody(remake);
       setIsRetrun(true);
     }
@@ -147,10 +146,8 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
         payPrice: value[obj.id - 1]?.payPrice,
       };
     });
-    // console.log(remakeData);
     setPayWayDetailBody(remakeData);
-    // console.log(thisId);
     if (thisId !== null) {
       getOther(thisId, remakeData);
@@ -162,7 +159,6 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
   }, [payBody]);
   // function setCurrtSave(value) {
-  //     // console.log(value);
   //     setIsCurrtSave(payWayDetailBody)
   // }
@@ -201,7 +197,6 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
       render: (text, record) => {
         const handleChange = (value) => {
           const updatedDataSource = payWayDetailBody.map((item) => {
-            console.log(value);
             if (item.id === record.id) {
               return {
                 ...item,
@@ -210,7 +205,6 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
             }
             return item;
           });
-          // console.log(updatedDataSource);
           setPayWayDetailBody(updatedDataSource);
           currtSave(updatedDataSource);
@@ -302,7 +296,6 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
           type: 'multiple',
           editableKeys,
           onSave: async () => {
-            // console.log(rowKey, data, row);
             await waitTime(2000);
           },
           onChange: setEditableRowKeys,
@@ -35,9 +35,6 @@ export default ({ productBody, EditProductBody }) =&gt; {
     }
   }
   function setEditProductBody(value) {
-    // console.log(value);
-    // console.log(dataSource);
-
     const modifiedArray = value.map((obj) => {
       if (obj.dId && Number(obj.dId) <= 1000) {
         return {
@@ -53,7 +50,6 @@ export default ({ productBody, EditProductBody }) =&gt; {
         return { ...obj, price: Number(obj.unitPrice) * Number(obj.count) };
       }
     });
-    // console.log(modifiedArray);
     EditProductBody(modifiedArray);
     setDataSource(value);
@@ -75,18 +75,16 @@ export default ({ currentContract }) =&gt; {
     const res = await postOrderErpOrderStagesSearch({
       data: { contract: currentContract },
     });
-    const context = res.data[0];
-    // console.log(context);
+    const context = res?.data?.data[0];
-    if (context.contract !== null) {
+    if (context?.contract !== null) {
       setContextBody(context);
-      setTotal(context.totalPrice);
-      form.setFieldValue('totalPrice', context.totalPrice);
+      setTotal(context?.totalPrice);
+      form.setFieldValue('totalPrice', context?.totalPrice);
     }
   }
   function setSave(value) {
-    // console.log(value);
     setOtherBody(value);
   }
@@ -140,15 +138,14 @@ export default ({ currentContract }) =&gt; {
     const res = await postOrderErpOrderStagesSearch({
       data: { contract: currentContract },
     });
-    const context = res.data[0];
-    // console.log(context);
+    const context = res.data.data[0];
-    if (context.contract !== null) {
+    if (context?.contract !== null) {
       setContextBody(context);
-      setTotal(context.totalPrice);
-      form.setFieldValue('totalPrice', context.totalPrice);
+      setTotal(context?.totalPrice);
+      form.setFieldValue('totalPrice', context?.totalPrice);
     }
-    handleInputChange(context.payWay, 0, context.totalPrice);
+    handleInputChange(context?.payWay, 0, context?.totalPrice);
   }
   useEffect(() => {
@@ -156,8 +153,6 @@ export default ({ currentContract }) =&gt; {
   }, []);
   function getEditProductBody(value) {
-    // console.log(value);
-
     setEditProductBody(value);
     let price = 0;
     value.map((obj) => (price += obj.count * obj.unitPrice));
@@ -174,7 +169,6 @@ export default ({ currentContract }) =&gt; {
       autoFocusFirstInput
       modalProps={{
         destroyOnClose: true,
-        // onCancel: () => console.log('run'),
       }}
       submitter={{
         resetButtonProps: {},
@@ -186,8 +180,6 @@ export default ({ currentContract }) =&gt; {
       }}
       submitTimeout={2000}
       onFinish={async (values) => {
-        // console.log(values);
-        // console.log(otherBody);
         let remakeValue = [];
         // 创建一个用于存储所有异步操作的Promise数组
         const promises = [];
@@ -254,8 +246,6 @@ export default ({ currentContract }) =&gt; {
             },
           });
           if (res.data) {
-            // console.log(values)
-            // console.log(contextBody);
             toSendEdit.annex = res.data;
           }
         }
@@ -263,7 +253,6 @@ export default ({ currentContract }) =&gt; {
           data: { ...toSendEdit },
         });
         if (isSaveOrUpdate) {
-          // console.log(isSaveOrUpdate);
           getBody();
         }
         await waitTime(2000);
@@ -278,7 +267,7 @@ export default ({ currentContract }) =&gt; {
             name="vendor"
             label="供应商名称"
             placeholder="请输入"
-            initialValue={contextBody.vendor}
+            initialValue={contextBody?.vendor}
             readonly
           />
@@ -287,7 +276,7 @@ export default ({ currentContract }) =&gt; {
             name="terminal"
             label="终端名称"
             placeholder="请输入"
-            initialValue={contextBody.terminal}
+            initialValue={contextBody?.terminal}
             readonly
           />
@@ -299,7 +288,7 @@ export default ({ currentContract }) =&gt; {
             fieldProps={{
               format: (value) => value.format('YYYY-MM-DD'),
             }}
-            initialValue={contextBody.dateRange}
+            initialValue={contextBody?.dateRange}
             readonly
           />
@@ -308,7 +297,7 @@ export default ({ currentContract }) =&gt; {
             name="payWay"
             label="付款比例"
             placeholder="请输入"
-            initialValue={contextBody.payWay}
+            initialValue={contextBody?.payWay}
             readonly
             onBlur={(e) => {
               handleInputChange(e.target.value, 1);
@@ -320,7 +309,7 @@ export default ({ currentContract }) =&gt; {
             name="contract"
             label="合同编号"
             placeholder="请输入"
-            initialValue={contextBody.contract}
+            initialValue={contextBody?.contract}
             readonly
           />
@@ -342,7 +331,7 @@ export default ({ currentContract }) =&gt; {
             readonly
             // rules={[{ required: true, message: '此项为必填项' }]}
             // value={contextBody.totalPrice}
-            initialValue={contextBody.totalPrice}
+            initialValue={contextBody?.totalPrice}
           />
         </ProForm.Group>
       </ProCard>
@@ -353,7 +342,7 @@ export default ({ currentContract }) =&gt; {
         bordered
       >
         <ProductDetail
-          productBody={contextBody.orderStagesDeviceVoList}
+          productBody={contextBody?.orderStagesDeviceVoList}
           EditProductBody={getEditProductBody}
         ></ProductDetail>
       </ProCard>
@@ -366,7 +355,7 @@ export default ({ currentContract }) =&gt; {
       >
         <PayWayDetail
           payBody={payWayBody}
-          thisId={contextBody.id}
+          thisId={contextBody?.id}
           currtSave={setSave}
         ></PayWayDetail>
       </ProCard>
@@ -375,7 +364,7 @@ export default ({ currentContract }) =&gt; {
         <ProFormTextArea
           label="备注"
           name="remark"
-          initialValue={contextBody.remark}
+          initialValue={contextBody?.remark}
           readonly
         />
       </ProCard>
@@ -341,7 +341,6 @@ export default () =&gt; {
       actionRef={ref}
       scroll={{ x: 1400, y: 360 }}
       request={async (params) => {
-        // console.log(params);
         if (
           params.id !== null ||
           params.contract !== null ||
@@ -350,9 +349,6 @@ export default () =&gt; {
           params.deviceName !== null ||
           params.dateRange !== null
         ) {
-          // console.log(params.id);
-          // console.log(params.contract);
-          // console.log(params.vendor);
           let PostOrderErpOrderStagesSearchOption = {
             id: params.id,
             contract: params.contract,
@@ -580,7 +576,6 @@ export default () =&gt; {
           option: { fixed: 'right', disable: true },
         },
         // onChange(value) {
-        //     console.log('value: ', value);
         // },
       }}
       rowKey="dId"
@@ -605,7 +600,6 @@ export default () =&gt; {
       }}
       pagination={{
         pageSize: 10,
-        // onChange: (page) => console.log(page),
       }}
       dateFormatter="string"
       headerTitle={[]}
@@ -7,8 +7,9 @@ import { orderExport } from &#39;@/services/order&#39;;
 import { VerticalAlignTopOutlined } from '@ant-design/icons';
 import type { ProColumns } from '@ant-design/pro-components';
 import { EditableProTable } from '@ant-design/pro-components';
-import { Button, Tag, message } from 'antd';
-import { useRef } from 'react';
+import { Button, Space, Table, Tag, message } from 'antd';
+import { Key, useRef, useState } from 'react';
+import TableCheckModal from '../checkModal/TableCheckModal';
 import CheckModal from '../checkModal/checkModal';
 import Comfire from '../comfire/comfire';
 import AddModel from '../detail/detail';
@@ -146,6 +147,7 @@ export default () =&gt; {
     startEditable: (rowKey: Key) => boolean;
     cancelEditable: (rowKey: Key) => boolean;
   }
+  const [specialPath, setSpecialPath] = useState<string[]>([]);
   const ref = useRef<ActionType>({
     reload: () => {
@@ -172,8 +174,8 @@ export default () =&gt; {
   async function toDelete(value) {
     const res = await deleteOrderErpOrderStagesDelect({
       data: {
-        ids: null,
-        deviceIds: value,
+        ids: value,
+        deviceIds: null,
       },
     });
     if (res) {
@@ -423,7 +425,7 @@ export default () =&gt; {
             <>
               {hasCheckPermission && (
                 <>
-                  <CheckModal id={record.id} toReload={reload}></CheckModal>
+                  <CheckModal id={[record.id]} toReload={reload}></CheckModal>
                   &nbsp;
                 </>
               )}
@@ -456,10 +458,7 @@ export default () =&gt; {
               )}
               {hasDeletePermission && (
                 <>
-                  <Comfire
-                    currtDid={record.dId}
-                    sureDelete={toDelete}
-                  ></Comfire>
+                  <Comfire currtDid={record.id} sureDelete={toDelete}></Comfire>
                 </>
               )}
             </>
@@ -476,9 +475,15 @@ export default () =&gt; {
         className="title-index"
         columnEmptyText=""
         columns={columns}
+        rowSelection={{
+          // 自定义选择项参考: https://ant.design/components/table-cn/#components-table-demo-row-selection-custom
+          // 注释该行则默认不显示下拉选项
+          selections: [Table.SELECTION_ALL, Table.SELECTION_INVERT],
+          defaultSelectedRowKeys: [],
+        }}
         cardBordered
         actionRef={ref}
-        scroll={{ x: 1400, y: 360 }}
+        scroll={{ x: 1400 }}
         recordCreatorProps={false}
         request={async (params) => {
           if (params.id === '') {
@@ -509,7 +514,9 @@ export default () =&gt; {
             params.terminal !== null ||
             params.deviceName !== null ||
             params.dateRange !== null ||
-            params.status !== null
+            params.status !== null ||
+            params.current !== null ||
+            params.pageSize !== null
           ) {
             let PostOrderErpOrderStagesSearchOption = {
               id: params.id,
@@ -519,13 +526,17 @@ export default () =&gt; {
               deviceName: params.deviceName,
               dateRange: params.dateRange,
               statusText: params.status,
+              current: params.current,
+              pageSize: params.pageSize,
             };
             let res = await postOrderErpOrderStagesSearch({
               data: { ...PostOrderErpOrderStagesSearchOption },
             });
             await waitTime(2000);
             if (res) {
-              const orderStagesWithList: OrderStagesWithListItem[] = res?.data;
+              const orderStagesWithList: OrderStagesWithListItem[] =
+                res?.data.data;
+              setSpecialPath(res.data.specialPath);
               let orderStagesList: OrderStagesItem[] = [];
               for (let ind = 0; ind < orderStagesWithList.length; ind++) {
                 for (
@@ -661,6 +672,7 @@ export default () =&gt; {
               }
               return {
                 data: orderStagesList || [],
+                total: res?.data?.total || 0,
               };
             }
           } else {
@@ -839,10 +851,48 @@ export default () =&gt; {
         }}
         pagination={{
           pageSize: 10,
-          // onChange: (page) => console.log(page),
         }}
         dateFormatter="string"
         headerTitle={[]}
+        tableAlertOptionRender={({ selectedRows, onCleanSelected }) => {
+          return (
+            <Space size={16}>
+              <TableCheckModal
+                id={selectedRows
+                  .filter(
+                    (item) =>
+                      item.status === 'SAVE_CHECK' ||
+                      item.status === 'UPDATE_CHECK' ||
+                      item.status === 'IMPORT_CHECK',
+                  )
+                  .map((item) => item.id)}
+                toReload={reload}
+                isShow={!specialPath?.includes('BatchModeration')}
+              />
+              <Button
+                title="确认删除所选中的分期账单吗？"
+                type="primary"
+                disabled={!specialPath?.includes('BatchDelete')}
+                onClick={() => {
+                  let ids = selectedRows.map((item: any) => {
+                    return item.id;
+                  });
+                  toDelete(ids);
+                  onCleanSelected();
+                }}
+              >
+                批量删除
+              </Button>
+              <Button
+                type="primary"
+                onClick={onCleanSelected}
+                disabled={!specialPath?.includes('UnSelect')}
+              >
+                取消选中
+              </Button>
+            </Space>
+          );
+        }}
         toolBarRender={() => [
           <>
             <AddModel toReload={reload}></AddModel>
@@ -8,7 +8,6 @@ import React, { useEffect } from &#39;react&#39;;
 const App: React.FC = ({ natureModel, setCurryFile }) => {
   const [fileList, setFileList] = React.useState([{}]);
   useEffect(() => {
-    console.log(natureModel);
     if (natureModel.fileUrl !== undefined && natureModel.fileUrl !== null) {
       setFileList([{ name: natureModel.fileName, url: natureModel.fileUrl }]);
     }
@@ -27,7 +26,6 @@ const App: React.FC = ({ natureModel, setCurryFile }) =&gt; {
     ) {
       (async () => {
         if (!(value.fileList[0].originFileObj instanceof File)) {
-          console.log('is not file');
           return false;
         } else {
           const formData = new FormData();
@@ -40,12 +38,6 @@ const App: React.FC = ({ natureModel, setCurryFile }) =&gt; {
           });
           if (res) {
             message.success('提交成功');
-            console.log({
-              uid: value.fileList[0].originFileObj.uid,
-              name: value.fileList[0].originFileObj.name,
-              url: res.data,
-            });
-            console.log(natureModel.id);
             setCurryFile({
               id: natureModel.id,