feat: update 历史记录bug修复

zhongnanhuang
1 parent de8a4b34
Showing 2 changed files with 18 additions and 11 deletions
src/pages/Order/components/HistoryModal.tsx
src/pages/Order/constant.ts
@@ -40,15 +40,6 @@ export default ({ subOrders, isCancelledOrder, onClose }) =&gt; {
  
     record.push(<span>进行了</span>);
  
-    record.push(
-      <span className="text-[#3b83e5]">
-        {HISTORY_OPT_TYPE.get(history.record) +
-          (history.record === 'INVOICING'
-            ? '(开票号码：' + history.invoiceNumber + ')'
-            : '')}
-      </span>,
-    );
-
     // let label = enumValueToLabel(history.status, ORDER_STATUS_OPTIONS);
  
     // if (
@@ -67,15 +58,29 @@ export default ({ subOrders, isCancelledOrder, onClose }) =&gt; {
  
     if (history.record?.indexOf(':') !== -1) {
       let values = history.record?.split(':');
+      let type = values[0];
+      let target = values[1];
+      if (target === 'null') {
+        target = '未指定';
+      }
       //采购转发
-      if (values[0] === 'PROCURE_CONVERT_PROCURE') {
+      if (type === 'PROCURE_CONVERT_PROCURE') {
         record.push(
           <>
             <span>采购转发，{history.createByName}将订单转发给了</span>
-            <span className="text-[#3b83e5]">{values[1]}</span>
+            <span className="text-[#3b83e5]">{target}</span>
           </>,
         );
       }
+    } else {
+      record.push(
+        <span className="text-[#3b83e5]">
+          {HISTORY_OPT_TYPE.get(history.record) +
+            (history.record === 'INVOICING'
+              ? '(开票号码：' + history.invoiceNumber + ')'
+              : '')}
+        </span>,
+      );
     }
  
     if (history.notes !== null) {
@@ -390,6 +390,8 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([
   ['after-sales-CHECK', '售后审核'],
   ['order-change-normal', '申请修改'],
   ['order-change-normal-CHECK', '申请修改审核'],
+  ['modify_leader_audit', '申请修改领导审核'],
+  ['node_operating_audit', '申请修改节点审核'],
   ['warehouse_audit', '仓库审核'],
   ['post_audit', '后置审核'],
   ['applyModify', '申请修改订单信息'],