【U审批】代码回退

uas-office-web/wxuasapproval/src/pages/approval/ApprovalAdd.jsx

@@ -387,27 +387,25 @@ export default class ApprovalAdd extends Component {
             }
           })
         } else {
-          billGroupModelList.forEach((billGroup, index) => {
-            if (!isObjNull(billGroup)) {
-              let showBillFields = billGroup.showBillFields
-              let hideBillFields = billGroup.hideBillFields
-              if (!isObjEmpty(showBillFields)) {
-                showBillFields.forEach((showModel, index) => {
-                  if (showModel.field in dataObj) {
-                    showModel.value = dataObj[showModel.field]
-                  }
-                })
-              }
-              if (!isObjEmpty(hideBillFields)) {
-                hideBillFields.forEach((showModel, index) => {
-                  if (showModel.field in dataObj) {
-                    showModel.value = dataObj[showModel.field]
-                  }
-                })
-              }
+          let billGroup = billGroupModelList[groupIndex]
+          if (!isObjNull(billGroup)) {
+            let showBillFields = billGroup.showBillFields
+            let hideBillFields = billGroup.hideBillFields
+            if (!isObjEmpty(showBillFields)) {
+              showBillFields.forEach((showModel, index) => {
+                if (showModel.field in dataObj) {
+                  showModel.value = dataObj[showModel.field]
+                }
+              })
             }
-          });
-
+            if (!isObjEmpty(hideBillFields)) {
+              hideBillFields.forEach((showModel, index) => {
+                if (showModel.field in dataObj) {
+                  showModel.value = dataObj[showModel.field]
+                }
+              })
+            }
+          }
         }
       }
       // console.log(billGroupModelList)
@@ -649,7 +647,6 @@ export default class ApprovalAdd extends Component {
       }
       let dataStr = response.data
       let dataList = JSON.parse(dataStr)
-      let dbColumns = response.columns
       if (isObjEmpty(dataList)) {
         message.warn('选项数据为空')
         return
@@ -673,16 +670,10 @@ export default class ApprovalAdd extends Component {
         let localData = new LocalData()
         localData.name = item[fieldKeyLike]
         let jsonMap = {}
-        let jsonMapV = {}
         for (let key in configMap) {
           jsonMap[configMap[key]] = item[key]
-          dbColumns.forEach((col, index) => {
-            if(col.dataIndex == key && col.width  > 0){
-              jsonMapV[configMap[key]] = item[key]
-            }
-          });
         }
-        localData.value = this.getShowValue(jsonMapV)
+        localData.value = this.getShowValue(jsonMap)
         localData.obj = jsonMap
         dbList.push(localData)
       })