批量修改sId的获取方式；

zhangzzzz
1 parent da2f349e
Showing 1 changed file with 18 additions and 18 deletions
src/components/Common/CommonElementEvent.js
@@ -35,7 +35,7 @@ export default (ChildComponent) =&gt; {
         eleknifemouldproductConfig: eleknifemouldOldproductConfig, eleteststandarditemConfig: eleteststandardOlditemConfig,
       } = nextProps;
       if (commonUtils.isEmptyObject(contactOldConfig) && (sModelsType === 'element/supplyInfo' || sModelsType === 'element/customerInfo') && formData.length > 0) {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         if (sModelsType === 'element/customerInfo') {
@@ -91,7 +91,7 @@ export default (ChildComponent) =&gt; {
         }
       }
       if (commonUtils.isEmptyObject(supplyOldConfig) && formData.length > 0 && sModelsType === 'element/materialsInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -122,7 +122,7 @@ export default (ChildComponent) =&gt; {
       }
       /*  印件分类 */
       if (commonUtils.isEmptyObject(sisproductclassifyProcessClassifyConfig) && formData.length > 0 && sModelsType === 'element/sisproductclassify') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -147,7 +147,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(masterConfig) && formData.length > 0 && sModelsType === 'element/processInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -214,7 +214,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(picFileOldConfig) && formData.length > 0 && sModelsType === 'element/printInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -250,7 +250,7 @@ export default (ChildComponent) =&gt; {
       }
       // 常用规格信息  commonUtils.isEmptyArr(siscommonstyleproductclassifyColumn)
       if (commonUtils.isEmptyObject(siscommonstyleproductclassifyConfig) && formData.length > 0 && sModelsType === 'element/siscommonstyle') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -276,7 +276,7 @@ export default (ChildComponent) =&gt; {
       }
       // 班组信息
       if (commonUtils.isEmptyObject(eleemployeeOldConfig) && formData.length > 0 && sModelsType === 'element/teamInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'eleteam')[0];
         const eleemployeeConfig = formData.filter(item => item.bGrd && item.sTbName === 'eleteamemployee')[0];
         const eleemployeeColumn = commonFunc.getHeaderConfig(eleemployeeConfig);
@@ -306,7 +306,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(jurgroupOldConfig) && formData.length > 0 && sModelsType === 'element/sftloginInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -382,7 +382,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if ((bReceived === undefined || !bReceived) && formData.length > 0 && sModelsType === 'system/sisformulaInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'sisformula')[0];
         const paramConfig = formData.filter(item => item.bGrd && item.sTbName === 'sisformulaparam')[0];
         let customizeParamConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')) ? formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')[0] : {};
@@ -553,7 +553,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if ((bReceived === undefined || !bReceived) && formData.length > 0 && sModelsType === 'element/machineInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elemachine')[0];
         let addState = {};
         let slaveConfig = {};
@@ -627,7 +627,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(userOldConfig) && formData.length > 0 && sModelsType === 'element/checkModelInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elecheckmodel')[0];
         /* bGrd代表是否是表格 */
@@ -662,7 +662,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(sischeckphaselogininfoOldConfig) && formData.length > 0 && sModelsType === 'element/checkPhaseInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'sischeckphase')[0];
         /* bGrd代表是否是表格 */
@@ -687,7 +687,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if ((bReceived === undefined || !bReceived) && formData.length > 0 && sModelsType === 'sis/paymentTerms') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'sispayment')[0];
         const firstRow = masterConfig.gdsconfigformslave.filter(item => item.bVisible && item.sName === 'sName');
@@ -713,7 +713,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(employeeConfig) && formData.length > 0 && sModelsType === 'element/employeeInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -735,7 +735,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (formData.length > 0 && commonUtils.isEmptyObject(sysmsguserOldConfig) && sModelsType === 'smg/sendMailMsg') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
@@ -762,7 +762,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (formData.length > 0 && commonUtils.isEmptyObject(masterConfig) && sModelsType === 'sis/monthEndingClosing') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         masterConfig = formData.filter(item => !item.bGrd)[0];
         const firstRow = masterConfig.gdsconfigformslave[0];
@@ -784,7 +784,7 @@ export default (ChildComponent) =&gt; {
       }
       /* 刀模信息 */
       if (commonUtils.isEmptyObject(eleknifemouldOldproductConfig) && formData.length > 0 && sModelsType === 'element/knifemouldInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -821,7 +821,7 @@ export default (ChildComponent) =&gt; {
       }
       /* 检验标准 */
       if (commonUtils.isEmptyObject(eleteststandardOlditemConfig) && formData.length > 0 && sModelsType === 'element/eleteststandInfo') {
-        const sId = currentId || this.props.masterData?.sId || '';
+        const sId = currentId || nextProps.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */