feat: 开票后确认发货功能开发。

曾国涛
1 parent 0c58fbdf
Showing 3 changed files with 90 additions and 87 deletions
src/pages/Order/components/CheckModal.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
@@ -34,6 +34,7 @@ import {
 } from '@/utils';
 import { PlusOutlined } from '@ant-design/icons';
 import { cloneDeep } from 'lodash';
+
 export default ({
   setCheckVisible,
   data,
@@ -43,6 +44,7 @@ export default ({
   onClose,
 }) => {
   const [previewOpen, setPreviewOpen] = useState(false);
+  const [aPopoverTitle, setAPopoverTitle] = useState('审核');
   const [previewImage, setPreviewImage] = useState('');
   const [previewTitle, setPreviewTitle] = useState('');
   const [paymentReceiptsImages, setPymentReceiptsImages] = useState<any[]>([]);
@@ -116,6 +118,9 @@ export default ({
   };
   useEffect(() => {
+    if (checkType(CHECK_TYPE.CONFIRM_DELIVER)) {
+      setAPopoverTitle('确认发货');
+    }
     getOrderAfterSalesInfo();
     let paymentReceiptsImagesList: any[] = [];
@@ -347,6 +352,32 @@ export default ({
     }
   }
+  function computeType() {
+    let type: string = '';
+    if (checkType(CHECK_TYPE.CONFIRM_DELIVER)) {
+      type = 'confirm_deliver';
+    }
+    if (checkType(CHECK_TYPE.WEARHOUSE_KEEPER)) {
+      type = 'warehouse_audit';
+    }
+    if (checkType(CHECK_TYPE.WAITING_FOR_POST_AUDIT)) {
+      type = 'post_audit';
+    }
+    if (checkType(CHECK_TYPE.NODE_OPERATING_AUDIT)) {
+      type = 'node_operating_audit';
+    }
+    if (checkType(CHECK_TYPE.MODIFY_LEADER_AUDIT)) {
+      type = 'modify_leader_audit';
+    }
+    if (checkType(CHECK_TYPE.URGENT_INVOICE_AUDITING)) {
+      type = 'urgent_invoice_audit';
+    }
+    if (checkType(CHECK_TYPE.PAYMENT_RECEIPTS_AUDIT)) {
+      type = 'payment_receipt_audit';
+    }
+    return type;
+  }
+
   return (
     <>
       <ModalForm<{
@@ -355,7 +386,7 @@ export default ({
       }>
         width={500}
         open
-        title="审核"
+        title={aPopoverTitle}
         form={form}
         autoFocusFirstInput
         modalProps={{
@@ -369,77 +400,63 @@ export default ({
         submitter={{
           render: (props, defaultDoms) => {
             let myDoms = [];
-            myDoms.push(
-              <Button
-                key="驳回"
-                onClick={async () => {
-                  if (checkType(CHECK_TYPE.AFTER_SALES)) {
-                    doAfterSalesCheck({
-                      applyType: 'after-sales',
-                      isAfterSalesSuccess: false,
-                      subOrderIds: subOrderIds,
-                      mainId: mainOrderId,
-                      afterSalesRejectionNotes: form.getFieldValue('name'),
-                    });
-                    return;
-                  }
+            if (!checkType(CHECK_TYPE.CONFIRM_DELIVER)) {
+              myDoms.push(
+                <Button
+                  key="驳回"
+                  onClick={async () => {
+                    if (checkType(CHECK_TYPE.AFTER_SALES)) {
+                      doAfterSalesCheck({
+                        applyType: 'after-sales',
+                        isAfterSalesSuccess: false,
+                        subOrderIds: subOrderIds,
+                        mainId: mainOrderId,
+                        afterSalesRejectionNotes: form.getFieldValue('name'),
+                      });
+                      return;
+                    }
-                  if (checkType(CHECK_TYPE.FINALCIAL)) {
-                    let values = { name: form.getFieldValue('name') };
-                    doFinancailCheck(values, false);
-                    return;
-                  }
+                    if (checkType(CHECK_TYPE.FINALCIAL)) {
+                      let values = { name: form.getFieldValue('name') };
+                      doFinancailCheck(values, false);
+                      return;
+                    }
-                  if (checkType(CHECK_TYPE.LEADER_AUDIT)) {
-                    doLeaderCheck({
-                      pass: false,
-                      subOrderIds: subOrderIds,
-                      reason: form.getFieldValue('name'),
-                    });
-                    return;
-                  }
+                    if (checkType(CHECK_TYPE.LEADER_AUDIT)) {
+                      doLeaderCheck({
+                        pass: false,
+                        subOrderIds: subOrderIds,
+                        reason: form.getFieldValue('name'),
+                      });
+                      return;
+                    }
+
+                    if (checkType(CHECK_TYPE.MODIFY_APPLY_WAIT_FOR_AUDIT)) {
+                      doAfterSalesCheck({
+                        applyType: 'order-change-normal',
+                        isAfterSalesSuccess: false,
+                        subOrderIds: subOrderIds,
+                        mainId: mainOrderId,
+                        afterSalesRejectionNotes: form.getFieldValue('name'),
+                      });
+                      return;
+                    }
-                  if (checkType(CHECK_TYPE.MODIFY_APPLY_WAIT_FOR_AUDIT)) {
-                    doAfterSalesCheck({
-                      applyType: 'order-change-normal',
-                      isAfterSalesSuccess: false,
+                    let type = '';
+                    type = computeType();
+                    console.log('type:' + type);
+                    doCheck({
+                      pass: false,
                       subOrderIds: subOrderIds,
-                      mainId: mainOrderId,
-                      afterSalesRejectionNotes: form.getFieldValue('name'),
+                      type: type,
+                      notes: form.getFieldValue('name'),
                     });
-                    return;
-                  }
-
-                  let type = '';
-                  if (checkType(CHECK_TYPE.WEARHOUSE_KEEPER)) {
-                    type = 'warehouse_audit';
-                  }
-                  if (checkType(CHECK_TYPE.WAITING_FOR_POST_AUDIT)) {
-                    type = 'post_audit';
-                  }
-                  if (checkType(CHECK_TYPE.NODE_OPERATING_AUDIT)) {
-                    type = 'node_operating_audit';
-                  }
-                  if (checkType(CHECK_TYPE.MODIFY_LEADER_AUDIT)) {
-                    type = 'modify_leader_audit';
-                  }
-                  if (checkType(CHECK_TYPE.URGENT_INVOICE_AUDITING)) {
-                    type = 'urgent_invoice_audit';
-                  }
-                  if (checkType(CHECK_TYPE.PAYMENT_RECEIPTS_AUDIT)) {
-                    type = 'payment_receipt_audit';
-                  }
-                  doCheck({
-                    pass: false,
-                    subOrderIds: subOrderIds,
-                    type: type,
-                    notes: form.getFieldValue('name'),
-                  });
-                }}
-              >
-                驳回
-              </Button>,
-            );
+                  }}
+                >
+                  驳回
+                </Button>,
+              );
+            }
             //如果是仓库审核，那么显示这个外部采购
             if (checkType(CHECK_TYPE.WEARHOUSE_KEEPER)) {
@@ -508,24 +525,7 @@ export default ({
           }
           let type = '';
-          if (checkType(CHECK_TYPE.WEARHOUSE_KEEPER)) {
-            type = 'warehouse_audit';
-          }
-          if (checkType(CHECK_TYPE.WAITING_FOR_POST_AUDIT)) {
-            type = 'post_audit';
-          }
-          if (checkType(CHECK_TYPE.NODE_OPERATING_AUDIT)) {
-            type = 'node_operating_audit';
-          }
-          if (checkType(CHECK_TYPE.MODIFY_LEADER_AUDIT)) {
-            type = 'modify_leader_audit';
-          }
-          if (checkType(CHECK_TYPE.URGENT_INVOICE_AUDITING)) {
-            type = 'urgent_invoice_audit';
-          }
-          if (checkType(CHECK_TYPE.PAYMENT_RECEIPTS_AUDIT)) {
-            type = 'payment_receipt_audit';
-          }
+          type = computeType();
           doCheck({
             pass: true,
             subOrderIds: subOrderIds,
@@ -578,12 +578,14 @@ export default ({
         )}
         <div>请特别注意订单总金额与订单金额。</div>
-        {checkType(CHECK_TYPE.FINALCIAL) && (
+        {!checkType(CHECK_TYPE.CONFIRM_DELIVER) ? (
           <ProFormTextArea
             width="lg"
             name="name"
             placeholder="若驳回，请填写驳回理由"
           />
+        ) : (
+          <></>
         )}
         {checkType(CHECK_TYPE.FINALCIAL) ? (
@@ -159,6 +159,7 @@ export const PAYMENT_RECEIPTS_STATUS_OPTIONS = {
 };
 export const ORDER_STATUS_OPTIONS = {
+  WAIT_CONFIRM_DELIVER_AFTER_INVOICE: '待开票后确认发货',
   UNAUDITED: '未审核',
   LEADER_PROCESS: '领导待审核',
   MODIFY_APPLY_WAIT_FOR_AUDIT: '修改待审核',
@@ -1933,8 +1933,8 @@ const OrderPage = () =&gt; {
                 type="link"
                 onClick={() => {
                   createOptObject(optRecord.id, record.id);
-                  setCheckVisible(true);
                   setOrderCheckType(CHECK_TYPE.CONFIRM_DELIVER);
+                  setCheckVisible(true);
                 }}
               >
                 确认发货