feat: update 新版本合并

zhongnanhuang
1 parent 0b6aa8d1
Showing 2 changed files with 36 additions and 6 deletions
src/pages/Order/components/CheckModal.tsx
src/pages/Order/constant.ts
 import { RESPONSE_CODE } from '@/constants/enum';
 import {
+  postPrepaidAudit,
   postServiceOrderAfterSalesCheck,
   postServiceOrderAudit,
   postServiceOrderFileProcess,
@@ -360,6 +361,20 @@ export default ({
     }
   }
  
+  /**
+   * 预存审核
+   * @param body
+   */
+  async function doPrepaidAudit(body: any) {
+    const data = await postPrepaidAudit({
+      data: body,
+    });
+    if (data.result === RESPONSE_CODE.SUCCESS) {
+      message.success(data.message);
+      onClose();
+    }
+  }
+
   function computeType() {
     let type: string = '';
     if (checkType(CHECK_TYPE.CONFIRM_DELIVER)) {
@@ -453,6 +468,15 @@ export default ({
                       return;
                     }
  
+                    //预存审核，先暂时共用同一个审核弹窗
+                    if (checkType(CHECK_TYPE.PREPAID_AUDIT)) {
+                      return doPrepaidAudit({
+                        pass: false,
+                        ids: subOrderIds,
+                        auditNotes: form.getFieldValue('name'),
+                      });
+                    }
+
                     let type = '';
                     type = computeType();
                     console.log('type:' + type);
@@ -535,6 +559,15 @@ export default ({
             });
           }
  
+          //预存审核，先暂时共用同一个审核弹窗
+          if (checkType(CHECK_TYPE.PREPAID_AUDIT)) {
+            return doPrepaidAudit({
+              pass: true,
+              ids: subOrderIds,
+              auditNotes: form.getFieldValue('name'),
+            });
+          }
+
           let type = '';
           type = computeType();
           doCheck({
@@ -8,7 +8,6 @@ export const PAYMENT_CHANNEL_OPTIONS = {
   WECHAT: '微信',
   BANK_TRANSFER: '银行转账',
   BALANCE: '预存款',
-  OFFLINE: '线下支付',
 };
  
 export const RECEIPTS_RECORD_TYPES = {
@@ -92,6 +91,7 @@ export const INVOCING_STATUS = {
  * 采购审核
  */
 export const CHECK_TYPE = {
+  CONFIRM_DELIVER: 'CONFIRM_DELIVER',
   WEARHOUSE_KEEPER: 'WEARHOUSE_KEEPER',
   FINALCIAL: 'FINALCIAL',
   PROCURE: 'PROCURE',
@@ -104,6 +104,7 @@ export const CHECK_TYPE = {
   MODIFY_LEADER_AUDIT: 'MODIFY_LEADER_AUDIT',
   URGENT_INVOICE_AUDITING: 'URGENT_INVOICE_AUDITING',
   PAYMENT_RECEIPTS_AUDIT: 'PAYMENT_RECEIPTS_AUDIT',
+  CONFIRM_REISSUE: 'CONFIRM_REISSUE',
   PREPAID_AUDIT: 'PREPAID_AUDIT',
 };
  
@@ -392,11 +393,7 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([
   ['warehouse_audit', '仓库审核'],
   ['post_audit', '后置审核'],
   ['applyModify', '申请修改订单信息'],
-  ['OUTSIDE_SYSTEM_PUSH', '外部系统创建订单'],
-  ['api_applyAddressModify', '外部系统申请修改收货地址'],
-  ['api_applyAfterSales', '外部系统申请售后'],
-  ['api_toEvaluated', '外部系统评价'],
-  ['api_confirmReceive', '外部系统确认收货'],
+  ['OUTSIDE_SYSTEM_PUSH', '外部系统推送了本订单'],
 ]);
  
 export const MAIN_ORDER_COLUMNS = [