优化核价；

zhangzzzz
1 parent 5532c55e
Showing 2 changed files with 43 additions and 17 deletions
src/components/Common/CommonBillEvent.js
src/components/QuickQuote/index.jsx
@@ -2345,7 +2345,7 @@ export default (ChildComponent) =&gt; {
           }
         }
         this.props.onSaveState({
-          loading: false,
+          loading: false, slaveDelData: [], controlDelData: [], materialsDelData: [], processDelData: [], manyqtysDelData: [], colorDelData: [], packDelData: []
         });
         return true;
       } else {
@@ -532,13 +532,36 @@ const QuickQuoteEvent = props =&gt; {
       packDelData: packDelDataOld = [],
     } = props;
     const addState = {
-      slaveDelData: [...slaveDelDataOld, ...slaveData.map(item => ({ ...item, handleType: "del" }))],
-      controlDelData: [...controlDelDataOld, ...controlData.map(item => ({ ...item, handleType: "del" }))],
-      materialsDelData: [...materialsDelDataOld, ...materialsData.map(item => ({ ...item, handleType: "del" }))],
-      processDelData: [...processDelDataOld, ...processData.map(item => ({ ...item, handleType: "del" }))],
-      manyqtysDelData: [...manyqtysDelDataOld, ...manyqtysData.map(item => ({ ...item, handleType: "del" }))],
-      colorDelData: [...colorDelDataOld, ...colorData.map(item => ({ ...item, handleType: "del" }))],
-      packDelData: [...packDelDataOld, ...packData.map(item => ({ ...item, handleType: "del" }))],
+      slaveDelData: [
+        ...slaveDelDataOld,
+        ...slaveData.filter(item => !slaveDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+      ],
+      controlDelData: [
+        ...controlDelDataOld,
+        ...controlData.filter(item => !controlDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+      ],
+      materialsDelData: [
+        ...materialsDelDataOld,
+        ...materialsData
+          .filter(item => !materialsDelDataOld.map(item1 => item1.sId).includes(item.sId))
+          .map(item => ({ ...item, handleType: "del" })),
+      ],
+      processDelData: [
+        ...processDelDataOld,
+        ...processData.filter(item => !processDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+      ],
+      manyqtysDelData: [
+        ...manyqtysDelDataOld,
+        ...manyqtysData.filter(item => !manyqtysDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+      ],
+      colorDelData: [
+        ...colorDelDataOld,
+        ...colorData.filter(item => !colorDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+      ],
+      packDelData: [
+        ...packDelDataOld,
+        ...packData.filter(item => !packDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+      ],
     };
     return addState;
   };
@@ -2718,17 +2741,20 @@ const ManyComponent = props =&gt; {
       manyDataCache: [],
     };
  
-    props.onSaveState(
-      {
-        masterData: { ...props.masterData, handleType: props.masterData.handleType || "update" },
-        ...addState,
-      },
-      () => {
-        props.handleCalcPrice();
-      }
-    );
+    props.onSaveState({
+      masterData: { ...props.masterData, handleType: props.masterData.handleType || "update" },
+      calcPriceTime: commonUtils.createSid(),
+      ...addState,
+    });
   };
  
+  useEffect(() => {
+    if (props.calcPriceTime) {
+      props.onSaveState({ calcPriceTime: undefined });
+      props.handleCalcPrice();
+    }
+  }, [props.calcPriceTime]);
+
   // 根据主表数量更改多数量表
   useEffect(() => {
     const baseCount = masterData.dProductQty || 1000;