处理页面报错问题；

zhangzzzz
1 parent 8dff3662
Showing 2 changed files with 74 additions and 66 deletions
src/components/Common/CommonCostomTabBill.js
src/components/Common/CommonNewTabBillEvent.js
@@ -3680,42 +3680,45 @@ const SlaveTableComponent = props =&gt; {
   }
   // 多表树形展示
-  useEffect(async () => {
-    const { config, name } = tableProps;
-    const { sTableType, sGrd } = config;
-    if (sTableType === "multiple") {
-      const { formData, currentId } = props;
-      const sId = currentId !== undefined ? currentId : "";
-      const tableInfoConfig = formData.find(
-        item => item.sGrd === `${sGrd}_child`
-      );
-      if (tableInfoConfig) {
-        let addState = {};
-        if (tableInfoConfig.sSqlStr !== "noQuery") {
-          const conditonValues = props.onGetSqlConditionValues(tableInfoConfig);
-          addState =
-            (await props.handleGetDataSet({
-              name: `${name}Info`,
-              configData: tableInfoConfig,
-              condition: {
-                sSqlCondition: { ...conditonValues, sParentId: sId }
-              },
-              isWait: true
-            })) || {};
-        }
-        addState[`${name}InfoConfig`] = tableInfoConfig;
-        addState[`${name}InfoColumn`] = commonFunc.getHeaderConfig(
-          tableInfoConfig
+  useEffect(() => {
+    const tempFun = async () => {
+      const { config, name } = tableProps;
+      const { sTableType, sGrd } = config;
+      if (sTableType === "multiple") {
+        const { formData, currentId } = props;
+        const sId = currentId !== undefined ? currentId : "";
+        const tableInfoConfig = formData.find(
+          item => item.sGrd === `${sGrd}_child`
         );
-        addState[`${name}InfoPageSize`] =
-          commonUtils.isNotEmptyNumber(tableInfoConfig.iPageSize) &&
-          tableInfoConfig.iPageSize !== 0
-            ? tableInfoConfig.iPageSize
-            : commonConfig.pageSize;
+        if (tableInfoConfig) {
+          let addState = {};
+          if (tableInfoConfig.sSqlStr !== "noQuery") {
+            const conditonValues = props.onGetSqlConditionValues(tableInfoConfig);
+            addState =
+              (await props.handleGetDataSet({
+                name: `${name}Info`,
+                configData: tableInfoConfig,
+                condition: {
+                  sSqlCondition: { ...conditonValues, sParentId: sId }
+                },
+                isWait: true
+              })) || {};
+          }
+          addState[`${name}InfoConfig`] = tableInfoConfig;
+          addState[`${name}InfoColumn`] = commonFunc.getHeaderConfig(
+            tableInfoConfig
+          );
+          addState[`${name}InfoPageSize`] =
+            commonUtils.isNotEmptyNumber(tableInfoConfig.iPageSize) &&
+            tableInfoConfig.iPageSize !== 0
+              ? tableInfoConfig.iPageSize
+              : commonConfig.pageSize;
-        props.onSaveState(addState);
+          props.onSaveState(addState);
+        }
       }
-    }
+    };
+    tempFun();
   }, []);
   return (
@@ -5791,41 +5794,44 @@ const GrandChildTableComponent = props =&gt; {
   if (commonUtils.isEmptyObject(configCm) && bWzps) {
     return "";
   }
-  useEffect(async () => {
-    let addState = {};
-    if (config.sSqlStr !== "noQuery") {
-      const conditonValues = props.onGetSqlConditionValues(config);
-      addState =
-        (await props.handleGetDataSet({
-          name,
-          configData: config,
-          condition: { sSqlCondition: { ...conditonValues, sParentId: sId } },
-          isWait: true
-        })) || {};
-    }
-    addState[`${name}Config`] = config;
-    addState[`${name}Column`] = commonFunc.getHeaderConfig(config);
-    addState[`${name}PageSize`] =
-      commonUtils.isNotEmptyNumber(config.iPageSize) && config.iPageSize !== 0
-        ? config.iPageSize
-        : commonConfig.pageSize;
-    if(commonUtils.isNotEmptyObject(configCm)) { /* 特殊处理更新材料信息 */
-      addState[`${nameCm}Config`] = configCm;
-      addState[`${nameCm}Column`] = commonFunc.getHeaderConfig(configCm);
-      addState[`${nameCm}PageSize`] =
-        commonUtils.isNotEmptyNumber(configCm.iPageSize) && configCm.iPageSize !== 0
-          ? configCm.iPageSize
+  useEffect(() => {
+    const tempFun = async () => {
+      let addState = {};
+      if (config.sSqlStr !== "noQuery") {
+        const conditonValues = props.onGetSqlConditionValues(config);
+        addState =
+          (await props.handleGetDataSet({
+            name,
+            configData: config,
+            condition: { sSqlCondition: { ...conditonValues, sParentId: sId } },
+            isWait: true
+          })) || {};
+      }
+      addState[`${name}Config`] = config;
+      addState[`${name}Column`] = commonFunc.getHeaderConfig(config);
+      addState[`${name}PageSize`] =
+        commonUtils.isNotEmptyNumber(config.iPageSize) && config.iPageSize !== 0
+          ? config.iPageSize
           : commonConfig.pageSize;
+      if(commonUtils.isNotEmptyObject(configCm)) { /* 特殊处理更新材料信息 */
+        addState[`${nameCm}Config`] = configCm;
+        addState[`${nameCm}Column`] = commonFunc.getHeaderConfig(configCm);
+        addState[`${nameCm}PageSize`] =
+          commonUtils.isNotEmptyNumber(configCm.iPageSize) && configCm.iPageSize !== 0
+            ? configCm.iPageSize
+            : commonConfig.pageSize;
+      }
+      if(commonUtils.isNotEmptyObject(configRm)) { /* 特殊处理更新材料信息 */
+        addState[`${nameRm}Config`] = configRm;
+        addState[`${nameRm}Column`] = commonFunc.getHeaderConfig(configRm);
+        addState[`${nameRm}PageSize`] =
+          commonUtils.isNotEmptyNumber(configRm.iPageSize) && configRm.iPageSize !== 0
+            ? configRm.iPageSize
+            : configRm.pageSize;
+      }
+      props.onSaveState(addState);
     }
-    if(commonUtils.isNotEmptyObject(configRm)) { /* 特殊处理更新材料信息 */
-      addState[`${nameRm}Config`] = configRm;
-      addState[`${nameRm}Column`] = commonFunc.getHeaderConfig(configRm);
-      addState[`${nameRm}PageSize`] =
-        commonUtils.isNotEmptyNumber(configRm.iPageSize) && configRm.iPageSize !== 0
-          ? configRm.iPageSize
-          : configRm.pageSize;
-    }
-    props.onSaveState(addState);
+    tempFun();
   }, []);
   const { bGrdVisible } = config;
@@ -6983,6 +6983,8 @@ export default (ChildComponent) =&gt; {
     render() {
       const { masterData, sModelsType, app } = this.props;
       const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
+      const imgPersonSrc = commonBusiness.handleCheckIcon(masterData);
+
       return (
         <ChildComponent
           {...this.props}