Merge remote-tracking branch 'origin/branch_qywx_v2' into branch_qywx_v2

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

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

uas-office-web/uas-mobile/src/components/common/map/MapSearch.jsx

@@ -39,7 +39,7 @@ export default class MapSearch extends Component {
         onSearchComplete: (results) => {
           if (results) {
             that.setState({
-              searchList: results.ok,
+              searchList: results.lk,
             })
           } else {
             that.setState({

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

@@ -378,25 +378,26 @@ export default class ApprovalAdd extends Component {
             }
           })
         } else {
-          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]
-                }
-              })
+          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]
+                  }
+                })
+              }
             }
-          }
+          });
         }
       }
       this.setState({
@@ -637,6 +638,7 @@ 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
@@ -660,10 +662,16 @@ 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(jsonMap)
+        localData.value = this.getShowValue(jsonMapV)
         localData.obj = jsonMap
         dbList.push(localData)
       })

uas-office-web/wxuasapproval/src/components/map/MapSearch.jsx

@@ -38,7 +38,7 @@
          onSearchComplete: (results) => {
            if (results) {
              that.setState({
-               searchList: results.ok,
+               searchList: results.lk,
              })
            } else {
              that.setState({

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

@@ -387,25 +387,27 @@ export default class ApprovalAdd extends Component {
             }
           })
         } else {
-          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]
-                }
-              })
+          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]
+                  }
+                })
+              }
             }
-          }
+          });
+
         }
       }
       // console.log(billGroupModelList)
@@ -647,6 +649,7 @@ 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
@@ -670,10 +673,16 @@ 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(jsonMap)
+        localData.value = this.getShowValue(jsonMapV)
         localData.obj = jsonMap
         dbList.push(localData)
       })