xlyErp / xlyUmi

Commit 49e8874ca5beea8df16a37f1b3d24fef9c7b1d52

Authored by zhangzzzz
1 parent da2f349e

批量修改sId的获取方式；

Inline Side-by-side
Showing 1 changed file with 18 additions and 18 deletions
src/components/Common/CommonElementEvent.js
  View file @49e8874
... ... @@ -35,7 +35,7 @@ export default (ChildComponent) => {
35 35 eleknifemouldproductConfig: eleknifemouldOldproductConfig, eleteststandarditemConfig: eleteststandardOlditemConfig,
36 36 } = nextProps;
37 37 if (commonUtils.isEmptyObject(contactOldConfig) && (sModelsType === 'element/supplyInfo' || sModelsType === 'element/customerInfo') && formData.length > 0) {
38   - const sId = currentId || this.props.masterData?.sId || '';
  38 + const sId = currentId || nextProps.masterData?.sId || '';
39 39 /* 数据Id */
40 40 const masterConfig = formData.filter(item => !item.bGrd)[0];
41 41 if (sModelsType === 'element/customerInfo') {
... ... @@ -91,7 +91,7 @@ export default (ChildComponent) => {
91 91 }
92 92 }
93 93 if (commonUtils.isEmptyObject(supplyOldConfig) && formData.length > 0 && sModelsType === 'element/materialsInfo') {
94   - const sId = currentId || this.props.masterData?.sId || '';
  94 + const sId = currentId || nextProps.masterData?.sId || '';
95 95 /* 数据Id */
96 96 const masterConfig = formData.filter(item => !item.bGrd)[0];
97 97 /* bGrd代表是否是表格 */
... ... @@ -122,7 +122,7 @@ export default (ChildComponent) => {
122 122 }
123 123 /* 印件分类 */
124 124 if (commonUtils.isEmptyObject(sisproductclassifyProcessClassifyConfig) && formData.length > 0 && sModelsType === 'element/sisproductclassify') {
125   - const sId = currentId || this.props.masterData?.sId || '';
  125 + const sId = currentId || nextProps.masterData?.sId || '';
126 126 /* 数据Id */
127 127 const masterConfig = formData.filter(item => !item.bGrd)[0];
128 128 /* bGrd代表是否是表格 */
... ... @@ -147,7 +147,7 @@ export default (ChildComponent) => {
147 147 });
148 148 }
149 149 if (commonUtils.isEmptyObject(masterConfig) && formData.length > 0 && sModelsType === 'element/processInfo') {
150   - const sId = currentId || this.props.masterData?.sId || '';
  150 + const sId = currentId || nextProps.masterData?.sId || '';
151 151 /* 数据Id */
152 152 const masterConfig = formData.filter(item => !item.bGrd)[0];
153 153 /* bGrd代表是否是表格 */
... ... @@ -214,7 +214,7 @@ export default (ChildComponent) => {
214 214 });
215 215 }
216 216 if (commonUtils.isEmptyObject(picFileOldConfig) && formData.length > 0 && sModelsType === 'element/printInfo') {
217   - const sId = currentId || this.props.masterData?.sId || '';
  217 + const sId = currentId || nextProps.masterData?.sId || '';
218 218 /* 数据Id */
219 219 const masterConfig = formData.filter(item => !item.bGrd)[0];
220 220 /* bGrd代表是否是表格 */
... ... @@ -250,7 +250,7 @@ export default (ChildComponent) => {
250 250 }
251 251 // 常用规格信息 commonUtils.isEmptyArr(siscommonstyleproductclassifyColumn)
252 252 if (commonUtils.isEmptyObject(siscommonstyleproductclassifyConfig) && formData.length > 0 && sModelsType === 'element/siscommonstyle') {
253   - const sId = currentId || this.props.masterData?.sId || '';
  253 + const sId = currentId || nextProps.masterData?.sId || '';
254 254 /* 数据Id */
255 255 const masterConfig = formData.filter(item => !item.bGrd)[0];
256 256 /* bGrd代表是否是表格 */
... ... @@ -276,7 +276,7 @@ export default (ChildComponent) => {
276 276 }
277 277 // 班组信息
278 278 if (commonUtils.isEmptyObject(eleemployeeOldConfig) && formData.length > 0 && sModelsType === 'element/teamInfo') {
279   - const sId = currentId || this.props.masterData?.sId || '';
  279 + const sId = currentId || nextProps.masterData?.sId || '';
280 280 const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'eleteam')[0];
281 281 const eleemployeeConfig = formData.filter(item => item.bGrd && item.sTbName === 'eleteamemployee')[0];
282 282 const eleemployeeColumn = commonFunc.getHeaderConfig(eleemployeeConfig);
... ... @@ -306,7 +306,7 @@ export default (ChildComponent) => {
306 306 });
307 307 }
308 308 if (commonUtils.isEmptyObject(jurgroupOldConfig) && formData.length > 0 && sModelsType === 'element/sftloginInfo') {
309   - const sId = currentId || this.props.masterData?.sId || '';
  309 + const sId = currentId || nextProps.masterData?.sId || '';
310 310 /* 数据Id */
311 311 const masterConfig = formData.filter(item => !item.bGrd)[0];
312 312 /* bGrd代表是否是表格 */
... ... @@ -382,7 +382,7 @@ export default (ChildComponent) => {
382 382 });
383 383 }
384 384 if ((bReceived === undefined || !bReceived) && formData.length > 0 && sModelsType === 'system/sisformulaInfo') {
385   - const sId = currentId || this.props.masterData?.sId || '';
  385 + const sId = currentId || nextProps.masterData?.sId || '';
386 386 const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'sisformula')[0];
387 387 const paramConfig = formData.filter(item => item.bGrd && item.sTbName === 'sisformulaparam')[0];
388 388 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) => {
553 553 });
554 554 }
555 555 if ((bReceived === undefined || !bReceived) && formData.length > 0 && sModelsType === 'element/machineInfo') {
556   - const sId = currentId || this.props.masterData?.sId || '';
  556 + const sId = currentId || nextProps.masterData?.sId || '';
557 557 const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elemachine')[0];
558 558 let addState = {};
559 559 let slaveConfig = {};
... ... @@ -627,7 +627,7 @@ export default (ChildComponent) => {
627 627 });
628 628 }
629 629 if (commonUtils.isEmptyObject(userOldConfig) && formData.length > 0 && sModelsType === 'element/checkModelInfo') {
630   - const sId = currentId || this.props.masterData?.sId || '';
  630 + const sId = currentId || nextProps.masterData?.sId || '';
631 631 /* 数据Id */
632 632 const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elecheckmodel')[0];
633 633 /* bGrd代表是否是表格 */
... ... @@ -662,7 +662,7 @@ export default (ChildComponent) => {
662 662 });
663 663 }
664 664 if (commonUtils.isEmptyObject(sischeckphaselogininfoOldConfig) && formData.length > 0 && sModelsType === 'element/checkPhaseInfo') {
665   - const sId = currentId || this.props.masterData?.sId || '';
  665 + const sId = currentId || nextProps.masterData?.sId || '';
666 666 /* 数据Id */
667 667 const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'sischeckphase')[0];
668 668 /* bGrd代表是否是表格 */
... ... @@ -687,7 +687,7 @@ export default (ChildComponent) => {
687 687 });
688 688 }
689 689 if ((bReceived === undefined || !bReceived) && formData.length > 0 && sModelsType === 'sis/paymentTerms') {
690   - const sId = currentId || this.props.masterData?.sId || '';
  690 + const sId = currentId || nextProps.masterData?.sId || '';
691 691 const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'sispayment')[0];
692 692  
693 693 const firstRow = masterConfig.gdsconfigformslave.filter(item => item.bVisible && item.sName === 'sName');
... ... @@ -713,7 +713,7 @@ export default (ChildComponent) => {
713 713 });
714 714 }
715 715 if (commonUtils.isEmptyObject(employeeConfig) && formData.length > 0 && sModelsType === 'element/employeeInfo') {
716   - const sId = currentId || this.props.masterData?.sId || '';
  716 + const sId = currentId || nextProps.masterData?.sId || '';
717 717 /* 数据Id */
718 718 const masterConfig = formData.filter(item => !item.bGrd)[0];
719 719 /* bGrd代表是否是表格 */
... ... @@ -735,7 +735,7 @@ export default (ChildComponent) => {
735 735 });
736 736 }
737 737 if (formData.length > 0 && commonUtils.isEmptyObject(sysmsguserOldConfig) && sModelsType === 'smg/sendMailMsg') {
738   - const sId = currentId || this.props.masterData?.sId || '';
  738 + const sId = currentId || nextProps.masterData?.sId || '';
739 739 /* 数据Id */
740 740 const masterConfig = formData.filter(item => !item.bGrd)[0];
741 741  
... ... @@ -762,7 +762,7 @@ export default (ChildComponent) => {
762 762 });
763 763 }
764 764 if (formData.length > 0 && commonUtils.isEmptyObject(masterConfig) && sModelsType === 'sis/monthEndingClosing') {
765   - const sId = currentId || this.props.masterData?.sId || '';
  765 + const sId = currentId || nextProps.masterData?.sId || '';
766 766 masterConfig = formData.filter(item => !item.bGrd)[0];
767 767  
768 768 const firstRow = masterConfig.gdsconfigformslave[0];
... ... @@ -784,7 +784,7 @@ export default (ChildComponent) => {
784 784 }
785 785 /* 刀模信息 */
786 786 if (commonUtils.isEmptyObject(eleknifemouldOldproductConfig) && formData.length > 0 && sModelsType === 'element/knifemouldInfo') {
787   - const sId = currentId || this.props.masterData?.sId || '';
  787 + const sId = currentId || nextProps.masterData?.sId || '';
788 788 /* 数据Id */
789 789 const masterConfig = formData.filter(item => !item.bGrd)[0];
790 790 /* bGrd代表是否是表格 */
... ... @@ -821,7 +821,7 @@ export default (ChildComponent) => {
821 821 }
822 822 /* 检验标准 */
823 823 if (commonUtils.isEmptyObject(eleteststandardOlditemConfig) && formData.length > 0 && sModelsType === 'element/eleteststandInfo') {
824   - const sId = currentId || this.props.masterData?.sId || '';
  824 + const sId = currentId || nextProps.masterData?.sId || '';
825 825 /* 数据Id */
826 826 const masterConfig = formData.filter(item => !item.bGrd)[0];
827 827 /* bGrd代表是否是表格 */
... ...