【UAS移动端】【字段顺序影响放大镜赋值问题】代码回退

uas-office-web/uas-mobile/src/components/common/currencyDetail/CurrencyDetail.jsx

@@ -518,26 +518,25 @@ class CurrencyDetail extends Component {
           }
         })
       } else {
-        billGroupList.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 = billGroupList[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]
+              }
+            })
+          }
+        }
       }
     }
     this.setState({

uas-office-web/uas-mobile/src/pages/private/approval/pages/ApprovalAdd.jsx

@@ -378,26 +378,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]
+                }
+              })
+            }
+          }
         }
       }
       this.setState({