Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

陈鑫涛
2 parents a995f36a 4a6a112b
Showing 2 changed files with 48 additions and 41 deletions
src/components/Common/CommonElementEvent.js
src/components/Manufacture/CommonPackEvent.js
@@ -34,7 +34,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 !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         if (sModelsType === 'element/customerInfo') {
@@ -90,7 +90,7 @@ export default (ChildComponent) =&gt; {
         }
       }
       if (commonUtils.isEmptyObject(supplyOldConfig) && formData.length > 0 && sModelsType === 'element/materialsInfo') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -121,7 +121,7 @@ export default (ChildComponent) =&gt; {
       }
       /*  印件分类 */
       if (commonUtils.isEmptyObject(sisproductclassifyProcessClassifyConfig) && formData.length > 0 && sModelsType === 'element/sisproductclassify') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -146,7 +146,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(masterConfig) && formData.length > 0 && sModelsType === 'element/processInfo') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -213,7 +213,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(picFileOldConfig) && formData.length > 0 && sModelsType === 'element/printInfo') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -249,7 +249,7 @@ export default (ChildComponent) =&gt; {
       }
       // 常用规格信息  commonUtils.isEmptyArr(siscommonstyleproductclassifyColumn)
       if (commonUtils.isEmptyObject(siscommonstyleproductclassifyConfig) && formData.length > 0 && sModelsType === 'element/siscommonstyle') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -275,7 +275,7 @@ export default (ChildComponent) =&gt; {
       }
       // 班组信息
       if (commonUtils.isEmptyObject(eleemployeeOldConfig) && formData.length > 0 && sModelsType === 'element/teamInfo') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.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);
@@ -305,7 +305,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(jurgroupOldConfig) && formData.length > 0 && sModelsType === 'element/sftloginInfo') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -381,7 +381,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if ((bReceived === undefined || !bReceived) && formData.length > 0 && sModelsType === 'system/sisformulaInfo') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.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] : {};
@@ -552,7 +552,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if ((bReceived === undefined || !bReceived) && formData.length > 0 && sModelsType === 'element/machineInfo') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elemachine')[0];
         let addState = {};
         let slaveConfig = {};
@@ -626,7 +626,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(userOldConfig) && formData.length > 0 && sModelsType === 'element/checkModelInfo') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'elecheckmodel')[0];
         /* bGrd代表是否是表格 */
@@ -661,7 +661,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(sischeckphaselogininfoOldConfig) && formData.length > 0 && sModelsType === 'element/checkPhaseInfo') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'sischeckphase')[0];
         /* bGrd代表是否是表格 */
@@ -686,7 +686,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if ((bReceived === undefined || !bReceived) && formData.length > 0 && sModelsType === 'sis/paymentTerms') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         const masterConfig = formData.filter(item => !item.bGrd && item.sTbName === 'sispayment')[0];
         const firstRow = masterConfig.gdsconfigformslave.filter(item => item.bVisible && item.sName === 'sName');
@@ -712,7 +712,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (commonUtils.isEmptyObject(employeeConfig) && formData.length > 0 && sModelsType === 'element/employeeInfo') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -734,7 +734,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (formData.length > 0 && commonUtils.isEmptyObject(sysmsguserOldConfig) && sModelsType === 'smg/sendMailMsg') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
@@ -761,7 +761,7 @@ export default (ChildComponent) =&gt; {
         });
       }
       if (formData.length > 0 && commonUtils.isEmptyObject(masterConfig) && sModelsType === 'sis/monthEndingClosing') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         masterConfig = formData.filter(item => !item.bGrd)[0];
         const firstRow = masterConfig.gdsconfigformslave[0];
@@ -783,7 +783,7 @@ export default (ChildComponent) =&gt; {
       }
       /* 刀模信息 */
       if (commonUtils.isEmptyObject(eleknifemouldOldproductConfig) && formData.length > 0 && sModelsType === 'element/knifemouldInfo') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -820,7 +820,7 @@ export default (ChildComponent) =&gt; {
       }
       /* 检验标准 */
       if (commonUtils.isEmptyObject(eleteststandardOlditemConfig) && formData.length > 0 && sModelsType === 'element/eleteststandInfo') {
-        const sId = currentId !== undefined ? currentId : '';
+        const sId = currentId || this.props.masterData?.sId || '';
         /* 数据Id */
         const masterConfig = formData.filter(item => !item.bGrd)[0];
         /* bGrd代表是否是表格 */
@@ -1096,7 +1096,7 @@ export default (ChildComponent) =&gt; {
     handleGetData = (masterConfig, contactConfig, addressConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1117,7 +1117,7 @@ export default (ChildComponent) =&gt; {
     handleGetProductclassifyData = async (masterConfig, sisproductclassifyProcessClassifyConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       const addState = await this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, isWait: true, bEditClick,
       });
@@ -1137,7 +1137,7 @@ export default (ChildComponent) =&gt; {
     handleGetPrintData = (masterConfig, picFileConfig, stockConfig, customerInfoConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1155,7 +1155,7 @@ export default (ChildComponent) =&gt; {
     handleGetStyleData = (masterConfig, siscommonstyleproductclassifyConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1167,7 +1167,7 @@ export default (ChildComponent) =&gt; {
     handleGetCheckModelData = (masterConfig, userConfig, phaseConfig, conditionConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1185,7 +1185,7 @@ export default (ChildComponent) =&gt; {
     handleGetEleemployeeData = (masterConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1194,7 +1194,7 @@ export default (ChildComponent) =&gt; {
     handleGetSisproductclassifyData = (masterConfig, sisproductclassifyProcessClassifyConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1206,7 +1206,7 @@ export default (ChildComponent) =&gt; {
     handleGetCheckPhaseData = (masterConfig, sischeckphaselogininfoConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1219,7 +1219,7 @@ export default (ChildComponent) =&gt; {
     handleGetMaterialsData = (masterConfig, supplyConfig, stockConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1235,7 +1235,7 @@ export default (ChildComponent) =&gt; {
     handleGetSflLoginData = async (masterConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, flag, isWait, bEditClick, { approveGroupConfig, brandgroupConfig }) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       const masterAddState = await this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick, isWait,
       });
@@ -1460,7 +1460,7 @@ export default (ChildComponent) =&gt; {
     handleGetProcessData = (masterConfig, machineConfig, assortConfig, outsideConfig, processstyleConfig, processApsRuleConfig, dynamicParamConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1498,7 +1498,7 @@ export default (ChildComponent) =&gt; {
     handleGetTeamData = (masterConfig, eleemployeeConfig, elemachineConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1513,7 +1513,7 @@ export default (ChildComponent) =&gt; {
     handleGetEleKnifeMouldData = (masterConfig, knifemouldproductConfig, knifemouldfileConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1528,7 +1528,7 @@ export default (ChildComponent) =&gt; {
     handleGetTestStandData = (masterConfig, eleteststandarditemConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1540,7 +1540,7 @@ export default (ChildComponent) =&gt; {
     handleGetSysMsgData = (masterConfig, sysmsguserConfig, bEditClick) => {
       const { currentId } = this.props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       this.props.handleGetDataOne({
         name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick,
       });
@@ -1557,7 +1557,7 @@ export default (ChildComponent) =&gt; {
       const { currentId, sModelsType } = this.props;
       /* 当前页签数据 */
       let addState = {};
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       if (getType === 'One') {
         if(sModelsType === 'system/sisformulaInfo') {
           const addMaster = await  this.props.handleGetDataOne({
@@ -1643,15 +1643,19 @@ export default (ChildComponent) =&gt; {
           const configObj = sColTitleNameIndex === undefined ? JSON.parse(sColTitleName) : JSON.parse(sColTitleName)[sColTitleNameIndex];
           const gdsconfigformslaveNew = [];
           if (commonUtils.isNotEmptyObject(configObj)) {
+            const { extraConfig = {} } = configObj;
             for (const key of Object.keys(configObj)) {
-              if (key !== 'panelName') {
-                const configNew = {};
+              if (!['panelName', 'extraConfig'].includes(key)) {
+                let configNew = {};
                 configNew.sName = key;
                 configNew.sChinese = configObj[key];
                 configNew.bVisible = true;
                 configNew.iFitWidth = 80;
                 configNew.showName = configObj[key];
                 configNew.bReadonly = false;
+                if (extraConfig[key]) {
+                  configNew = { ...configNew, ...extraConfig[key] };
+                }
                 gdsconfigformslaveNew.push(configNew);
               }
             }
@@ -1978,7 +1982,7 @@ export default (ChildComponent) =&gt; {
       // const {
       //   app, currentId, token, masterConfig, sModelsId,
       // } = this.props;
-      // const sId = currentId !== undefined ? currentId : '';
+      // const sId = currentId || this.props.masterData?.sId || '';
       // const { userinfo } = app;
       // const value = {
       //   tableName: masterConfig.sTbName,
@@ -2064,7 +2068,7 @@ export default (ChildComponent) =&gt; {
         approveGroupConfig, brandgroupConfig,
       } = props;
       /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       let value = {};
       if (sModelsType === 'element/customerInfo' || sModelsType === 'element/supplyInfo') {
         value = {
@@ -3072,7 +3076,7 @@ export default (ChildComponent) =&gt; {
       const {
         currentId, sModelsId, masterData, masterConfig, handleType,
       } = props;
-      const sId = currentId !== undefined ? currentId : '';
+      const sId = currentId || this.props.masterData?.sId || '';
       const value = {
         sClientType: '1',
         sId: [sId],
@@ -1035,9 +1035,12 @@ const CommonPackEvent = props =&gt; {
       <Tabs size="small" style={{ marginTop: 10, marginBottom: 12 }}>
         {Object.keys(controlGroup).map(tabNameKey => {
           console.log("eeee", tabNameKey);
-          const tabName = tabNameKey.replace(/\d+/g, "");
+          let tabName = tabNameKey.replace(/\d+/g, "");
           const num = tabNameKey.replace(/[^\d]/g, "").trim();
-
+          const tableConfigArr = config?.gdsconfigformslave.filter(row => row.sControlName === tabNameKey.trim());
+          if(commonUtils.isNotEmptyArr(tableConfigArr)) {
+            tabName =tableConfigArr[0].showName;
+          }
           const viewProps = {
             ...props,
             viewConfigs: controlGroup[tabNameKey],