qiangmj / ebc-Mes

Commit e893d03bea66987d8fce3f2eb0706be3dffcb636

Authored by chenxt
1 parent 51f36d8a

选择版材弹窗空白问题修复

Inline Side-by-side
Showing 1 changed file with 4 additions and 10 deletions
src/components/Common/CommonHooks/useCommonBase.js
  View file @e893d03
... ... @@ -56,8 +56,8 @@ const useCommonBase = props => {
56 56 return;
57 57 }
58 58 const { sModelsId, app } = state;
  59 + const isChoosePlate = sModelsId !== '12710101117087374661080'
59 60 const formData = await handleGetModelConfig({ sModelsId });
60   -
61 61 const addState = {};
62 62 let pageRoute = props.sModelType;
63 63 // 如果是弹窗且没有pageLayout，则认为是commonBill
... ... @@ -67,7 +67,7 @@ const useCommonBase = props => {
67 67  
68 68 if (formData.length && !props.currentContent && ['/indexPage/commonList', '/indexPage/commonBill'].includes(pageRoute) && !formData[0].gdsconfigformslave.some(item => item.sControlName === 'pageLayout')) {
69 69 if (pageRoute === '/indexPage/commonList') {
70   - formData[0].sGrd = 'slave';
  70 + formData[0].sGrd = isChoosePlate ? 'slave' : formData[0].sGrd;
71 71 formData[0].gdsconfigformslave.push({
72 72 sId: commonUtils.createSid(),
73 73 sControlName: 'pageLayout',
... ... @@ -78,12 +78,12 @@ const useCommonBase = props => {
78 78 const [tableList, tabConfig] = [[], []];
79 79 formData.forEach((item, index) => {
80 80 if (index === 0) {
81   - item.sGrd = 'master';
  81 + item.sGrd = isChoosePlate ? 'master' : item.sGrd;
82 82 tableList.push('master');
83 83 tabConfig.push({ "configList": [{ "sName": "master", "showType": "form", "bHideTitle": true, "defaultEnabled": true }], "mode": "advanced", "height": "auto", "width": "100%" });
84 84 } else {
85 85 const tablename = `slave${index - 2 < 0 ? '' : index - 2}`;
86   - item.sGrd = tablename;
  86 + item.sGrd = isChoosePlate ? tablename : item.sGrd;
87 87 tableList.push(tablename);
88 88 if (!tabConfig[1]) {
89 89 tabConfig.push({ "configList": [], "mode": "advanced" });
... ... @@ -118,7 +118,6 @@ const useCommonBase = props =&gt; {
118 118 * @param {Function} callback - 回调函数
119 119 */
120 120 const handleSaveState = (values, callback) => {
121   - console.log("🚀 ~ handleSaveState ~ values:", values)
122 121 if (commonUtils.isNotEmptyObject(values.masterConfig) && values.masterConfig.bMerged) {
123 122 delete values.masterConfig;
124 123 }
... ... @@ -1675,7 +1674,6 @@ const useCommonBase = props =&gt; {
1675 1674 ) {
1676 1675 const sRulesObjArr = JSON.parse(sRulesJson);
1677 1676 if (commonUtils.isNotEmptyArr(sRulesObjArr)) {
1678   - console.log("sRulesObjArr:", sRulesObjArr);
1679 1677 sRulesObjArr.forEach(sRulesObj => {
1680 1678 const {
1681 1679 showColumn,
... ... @@ -1684,7 +1682,6 @@ const useCommonBase = props =&gt; {
1684 1682 tbName,
1685 1683 sConfigName
1686 1684 } = sRulesObj;
1687   - console.log("tbName:", tbName,);
1688 1685 /* 主表单表字段根据条件控制 其他字段的显示与隐藏 */
1689 1686 if (commonUtils.isEmptyObject(tbName)) {
1690 1687 if (commonUtils.isNotEmptyArr(condition)) {
... ... @@ -3318,7 +3315,6 @@ const useCommonBase = props =&gt; {
3318 3315 const newCopyTo = {};
3319 3316 newCopyTo.master = masterData;
3320 3317 const sName = selectConfig.sKeyUpFilter; /* 将后台配置筛选字段作为 列字段 */
3321   - console.log("🚀 ~ handleSelectCommonPopupNew ~ sName:", sName)
3322 3318 let sValue = '';
3323 3319 if (iIndex > -1) {
3324 3320 newCopyTo.slave = tableData[iIndex];
... ... @@ -3477,7 +3473,6 @@ const useCommonBase = props =&gt; {
3477 3473 };
3478 3474 /** toolbar审核(消审) */
3479 3475 const handleAudit = async (flag) => {
3480   - console.log("🚀 ~ handleAudit ~ flag:", flag)
3481 3476 /* 待用数据声明 */
3482 3477 let bResult = true;
3483 3478 const { masterData, gdsformconst } = props;
... ... @@ -3501,7 +3496,6 @@ const useCommonBase = props =&gt; {
3501 3496 };
3502 3497 /** 数据审核 */
3503 3498 const dataAudit = async (flag, tmpCheck, isWait) => {
3504   - console.log("🚀 ~ dataAudit ~ flag:", flag)
3505 3499 message.destroy();
3506 3500 /* 待用数据声明 */
3507 3501 const {
... ...