1.处理工单计算，处理del的数据

Min
1 parent eb63d37c
Showing 3 changed files with 84 additions and 13 deletions
src/components/IndexCenter/IndexCenter.js
src/components/Manufacture/CommonPackEvent.js
src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
@@ -105,7 +105,6 @@ class IndexCenter extends Component {
   componentWillReceiveProps(nextProps) {
     const { dispatch } = nextProps;
     const { modelCenter, comParameter:comParameterAll = [], dataCode, kpiData, logoImageInfo, userinfo, token } = nextProps.app;
-    console.log('1-comParameterAll', comParameterAll);
     const comParameter =  comParameterAll.filter(item => item.sDisplayType ? item.sDisplayType !== 'LargeScreen' : !item.sFormUrl?.includes('http'));
     const commonThirdApp = comParameterAll.filter(item => item.sDisplayType ? item.sDisplayType === 'LargeScreen' : item.sFormUrl?.includes('http'));
     const { modelCenter: modelCenterOld } = this.props;
@@ -134,14 +134,14 @@ const CommonPackEvent = props =&gt; {
         colorConfig,
         sModelsType,
         colorData,
-        slaveDelData,
-        controlDelData,
-        processDelData,
-        colorDelData,
-        packDelData,
+        slaveDelData = [],
+        controlDelData= [],
+        processDelData= [],
+        colorDelData= [],
+        packDelData= [],
         addStateMap,
         materials0Config,
-        materials0DelData,
+        materials0DelData = [],
       } = props;
       let { slaveData, packData, controlData, processData, masterData, materials0Data } = props;
       const sMakePerson = masterData.sMakePerson;
@@ -172,11 +172,79 @@ const CommonPackEvent = props =&gt; {
         if (masterData.handleType === "update" && !commonUtils.isEmpty(sMakePerson)) {
           masterData.sMakePerson = sMakePerson;
         }
-        slaveData = valueReturn[`${slaveConfig.sTbName.toLowerCase()}_tmp`];
-        packData = valueReturn[`${packConfig.sTbName.toLowerCase()}_tmp`];
-        controlData = valueReturn[`${controlConfig.sTbName.toLowerCase()}_tmp`];
-        materials0Data = valueReturn[`${materials0Config.sTbName.toLowerCase()}_tmp`];
-        processData = valueReturn[`${processConfig.sTbName.toLowerCase()}_tmp`];
+        let slaveData = valueReturn[`${slaveConfig.sTbName.toLowerCase()}_tmp`] || [];
+        let packData = valueReturn[`${packConfig.sTbName.toLowerCase()}_tmp`] || [];
+        let controlData = valueReturn[`${controlConfig.sTbName.toLowerCase()}_tmp`] || [];
+        let materials0Data = valueReturn[`${materials0Config.sTbName.toLowerCase()}_tmp`] || [];
+        let processData = valueReturn[`${processConfig.sTbName.toLowerCase()}_tmp`] || [];
+
+        const slaveDelNewData = slaveData.filter(item => item?.handleType === 'del');
+        slaveData = slaveData.filter(item => item?.handleType !== 'del');
+
+        const packDelNewData = packData.filter(item => item?.handleType === 'del');
+        packData = packData.filter(item => item?.handleType !== 'del');
+
+        const controlDelNewData = controlData.filter(item => item?.handleType === 'del');
+        controlData = controlData.filter(item => item?.handleType !== 'del');
+
+        const materials0DelNewData = materials0Data.filter(item => item?.handleType === 'del');
+        materials0Data = materials0Data.filter(item => item?.handleType !== 'del');
+
+        const processDelNewData = processData.filter(item => item?.handleType === 'del');
+        processData = processData.filter(item => item?.handleType !== 'del');
+
+
+        slaveDelNewData.forEach(item => {
+          // 获取当前项的 sId，使用可选链避免报错
+          const currentSId = item?.sId;
+          // 查找目标数组中是否存在相同 sId 的项
+          const existIndex = slaveDelData.findIndex(row => row?.sId === currentSId);
+          // 不存在（index === -1）且 currentSId 有效时，执行 push
+          if (currentSId && existIndex === -1) {
+            slaveDelData.push(item);
+          }
+        });
+
+
+        packDelNewData.forEach(item => {
+          const currentSId = item?.sId;
+          const existIndex = packDelData.findIndex(row => row?.sId === currentSId);
+          if (currentSId && existIndex === -1) {
+            packDelData.push(item);
+          }
+        });
+
+
+        controlDelNewData.forEach(item => {
+          const currentSId = item?.sId;
+          const existIndex = controlDelData.findIndex(row => row?.sId === currentSId);
+          if (currentSId && existIndex === -1) {
+            controlDelData.push(item);
+          }
+        });
+
+
+        materials0DelNewData.forEach(item => {
+          const currentSId = item?.sId;
+          const existIndex = materials0DelData.findIndex(row => row?.sId === currentSId);
+          if (currentSId && existIndex === -1) {
+            materials0DelData.push(item);
+          }
+        });
+
+
+        processDelNewData.forEach(item => {
+          const currentSId = item?.sId;
+          const existIndex = processDelData.findIndex(row => row?.sId === currentSId);
+          if (currentSId && existIndex === -1) {
+            processDelData.push(item);
+          }
+        });
+        console.log('计算',
+          {
+            slaveData, controlData, materials0Data, packDelData, processData,
+            slaveDelData, controlDelData, materials0DelData, packDelNewData, processDelData
+          })
  
         /* 计算成功后自动调用保存 */
         if (bSave) {
@@ -226,6 +294,11 @@ const CommonPackEvent = props =&gt; {
             materials0Data,
             processData,
             masterData,
+            slaveDelData,
+            controlDelData,
+            materials0DelData,
+            processDelData,
+            colorDelData,
             loading: false,
             calculated: true,
           });
@@ -254,7 +254,6 @@ const WorkOrderPackTableTreeNewEvent = props =&gt; {
     }, {});
  
     const func = props[`${tableName}Props`]?.[funcName];
-    console.log("=====func", func);
     if (func) {
       return func(params);
     }