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

曾国涛
1 parent 11109695
Showing 5 changed files with 94 additions and 33 deletions
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/FinancialDrawer.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
@@ -8,7 +8,17 @@ import {
   postServiceOrderToProcureAudit,
 } from '@/services';
 import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
-import { Button, Col, Form, Modal, Row, UploadFile, message, Image, Divider } from 'antd';
+import {
+  Button,
+  Col,
+  Divider,
+  Form,
+  Image,
+  Modal,
+  Row,
+  UploadFile,
+  message,
+} from 'antd';
 import Upload, { RcFile, UploadProps } from 'antd/es/upload';
 import { useEffect, useRef, useState } from 'react';
 import {
@@ -113,7 +123,7 @@ export default ({
       if (item.paymentReceiptAnnexList) {
         paymentReceiptsImagesList.push(...item.paymentReceiptAnnexList);
       }
-    })
+    });
     //去重
     paymentReceiptsImagesList = [...new Set(paymentReceiptsImagesList)];
     setPymentReceiptsImages(paymentReceiptsImagesList);
@@ -205,8 +215,8 @@ export default ({
     setPreviewOpen(true);
     setPreviewTitle(
       file.name ||
-      file.originFileObj?.name ||
-      file.url!.substring(file.url!.lastIndexOf('/') + 1),
+        file.originFileObj?.name ||
+        file.url!.substring(file.url!.lastIndexOf('/') + 1),
     );
   };
@@ -543,35 +553,39 @@ export default ({
           ''
         )}
-        {
-          checkType(CHECK_TYPE.PAYMENT_RECEIPTS_AUDIT) ? (
-            <>
-              <Divider orientation="center"><span className='text-sm'>回款凭证</span></Divider>
-              <Image.PreviewGroup
-                className="mr-10"
-                preview={{
-                  onChange: (current, prev) =>
-                    console.log(`current index: ${current}, prev index: ${prev}`),
-                }}
-              >
-                {paymentReceiptsImages.map((url) => (
-                  <>
-                    <Image width={120} src={url} /> <Divider type="vertical" />
-                  </>
-                ))}
-              </Image.PreviewGroup>
-              <Divider></Divider>
-            </>
-          )
-            : ""
-        }
+        {checkType(CHECK_TYPE.PAYMENT_RECEIPTS_AUDIT) ? (
+          <>
+            <Divider orientation="center">
+              <span className="text-sm">回款凭证</span>
+            </Divider>
+            <Image.PreviewGroup
+              className="mr-10"
+              preview={{
+                onChange: (current, prev) =>
+                  console.log(`current index: ${current}, prev index: ${prev}`),
+              }}
+            >
+              {paymentReceiptsImages.map((url) => (
+                <>
+                  <Image width={120} src={url} /> <Divider type="vertical" />
+                </>
+              ))}
+            </Image.PreviewGroup>
+            <Divider></Divider>
+          </>
+        ) : (
+          ''
+        )}
         <div>请特别注意订单总金额与订单金额。</div>
-        <ProFormTextArea
-          width="lg"
-          name="name"
-          placeholder="若驳回，请填写驳回理由"
-        />
+        {checkType(CHECK_TYPE.FINALCIAL) && (
+          <ProFormTextArea
+            width="lg"
+            name="name"
+            placeholder="若驳回，请填写驳回理由"
+          />
+        )}
+
         {checkType(CHECK_TYPE.FINALCIAL) ? (
           <>
             <div className="pb-4 text-xs decoration-gray-50">
@@ -117,7 +117,7 @@ export default ({
         ''
       )}
-      <ProFormText
+      <ProFormTextArea
         width="lg"
         name="invoiceIdentificationNumber"
         label="开票信息"
@@ -87,6 +87,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     deleteSubOrderLists: [];
     filePaths: [];
     notes: '';
+    invoiceFirst: boolean;
     list: [
       {
         productCode: '';
@@ -1106,10 +1107,30 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               form.setFieldValue('invoiceIdentificationNumber', undefined);
               form.setFieldValue('bank', undefined);
               form.setFieldValue('bankAccountNumber', undefined);
+              form.setFieldValue('invoiceFirst', false);
             }
           }}
           rules={[{ required: true, message: '是否需要开票必填' }]}
         />
+        <ProFormSelect
+          placeholder="是否开票后发货"
+          name="invoiceFirst"
+          width="lg"
+          key="invoiceFirst"
+          label="是否开票后发货"
+          disabled={optType('after-sales-check')}
+          hidden={invoicingStatus === 'UN_INVOICE'}
+          options={[
+            {
+              value: true,
+              label: '是',
+            },
+            {
+              value: false,
+              label: '否',
+            },
+          ]}
+        />
         <ProFormSelect
           placeholder="收款单位"
@@ -91,6 +91,7 @@ export const INVOCING_STATUS = {
  * 采购审核
  */
 export const CHECK_TYPE = {
+  CONFIRM_DELIVER: 'CONFIRM_DELIVER',
   WEARHOUSE_KEEPER: 'WEARHOUSE_KEEPER',
   FINALCIAL: 'FINALCIAL',
   PROCURE: 'PROCURE',
@@ -258,6 +259,7 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
   ['WAIT_AUDIT', 'warning'],
   ['AUDIT_PASS', 'success'],
   ['AUDIT_NOTPASS', 'error'],
+  ['WAIT_CONFIRM_DELIVER_AFTER_INVOICE', 'processing'],
 ]);
 export const SALES_CODE_OPTIONS = [
   { label: 'D-Linda', value: 'D-Linda' },
@@ -616,7 +616,15 @@ const OrderPage = () =&gt; {
         ORDER_STATUS_OPTIONS,
       );
-      //如果是未审核或者领导已审核，付款状态为预付款则需要财务审核【财务待审核】，否则仓库审核【仓库待审核】
+      if (orderStatus === 'WAIT_CONFIRM_DELIVER_AFTER_INVOICE') {
+        if (optRecord.afterInvoicingStatus !== 'COMPLETE_INVOICING') {
+          orderStatusTagText = '待开票';
+        } else {
+          orderStatusTagText = '待确认发货';
+        }
+      }
+
+      //如果是未审核或者领导已审核，付款状态为预付款则需要财务审核【财务待审核】，否则仓库审核【】
       if (orderStatus === 'UNAUDITED' || orderStatus === 'LEADER_AUDITED') {
         if (paymentMethod === 'PAYMENT_IN_ADVANCE') {
           orderStatusTagText = '财务待审核';
@@ -1919,6 +1927,22 @@ const OrderPage = () =&gt; {
               ''
             )}
+            {optRecord.subPath?.includes('confirmDeliver') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  createOptObject(optRecord.id, record.id);
+                  setCheckVisible(true);
+                  setOrderCheckType(CHECK_TYPE.CONFIRM_DELIVER);
+                }}
+              >
+                确认发货
+              </Button>
+            ) : (
+              ''
+            )}
+
             {optRecord.subPath?.includes('orderCancel') ? (
               <ButtonConfirm
                 className="p-0"