vue2-client 1.8.241 → 1.8.243

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.241",
+  "version": "1.8.243",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/AddressSearchCombobox/AddressSearchCombobox.vue

@@ -170,7 +170,9 @@ export default {
           return
         }
       }
-      this.$emit('update:searchResult', this.addressInput)
+      debounce(() => {
+        this.selected(null, this.addressInput)
+      }, 200)()
     },
     initMap (aMap) {
       this.map = new (aMap).Map('addressSearchCombobox_map', { // 设置地图容器id
@@ -198,23 +200,24 @@ export default {
       this.addressObj.lng_lat = _arr[1]
       this.map.setCenter(this.addressObj.lng_lat.split(','))
     },
-    selected () {
+    selected (_value, _addstr) {
       let result
       if (this.searchResultType !== 'Default') {
         if (this.searchResultType === 'Array') {
-          result = [this.addressObj.address, this.addressObj.lng_lat]
+          result = [_addstr || this.addressObj.address, this.addressObj.lng_lat]
         } else {
           result = {}
-          result[this.resultKeys.address] = this.addressObj.address
+          result[this.resultKeys.address] = _addstr || this.addressObj.address
           result[this.resultKeys.coords] = this.addressObj.lng_lat
         }
       }
-      this.addressInput = this.addressObj.address
-      console.log(' result--- ', result)
       this.visible = false
       this.$emit('onSelect', JSON.stringify(result))
-      this.$emit('onDivisionsChange', Object.assign({}, result, { divisions: this.divisions, vm: this }))
-      // this.$emit('onClick', result || value)
+      // 如果传递了地址 是为了更新上级 不做省市区检验处理
+      if (!_addstr) {
+        this.addressInput = this.addressObj.address
+        this.$emit('onDivisionsChange', Object.assign({}, result, { divisions: this.divisions, vm: this }))
+      }
     },
     // 懒加载检索方法
     fetchFunction (value) {
@@ -283,51 +286,53 @@ export default {
   watch: {
     'visible' (val) {
       if (val) {
-        GetGDMap(this.gaode_secret_key, this.gaode_key).then(aMap => {
-          this.initMap(aMap)
-          this.mapAutocomplete = new (aMap).AutoComplete({
-            // city 限定城市，默认全国
-            city: '全国',
-            dragEnable: true,
-            animateEnable: false
-          })
-          this.positionPicker = new window.AMapUI.PositionPicker({
-            mode: 'dragMap',
-            map: this.map
-          })
-          this.positionPicker.on('success', (positionResult) => {
-            console.log(positionResult)
-            console.log(positionResult.position)
-            // 设置 行政区划信息
-            if (positionResult?.regeocode?.addressComponent) {
-              const { addressComponent } = positionResult?.regeocode
-              this.divisions.province = addressComponent.province
-              this.divisions.city = addressComponent.city
-              this.divisions.district = addressComponent.district
-              this.divisions.township = addressComponent.township
-              this.divisions.towncode = addressComponent.towncode
-              this.divisions.street = addressComponent.street
-              // 试着获取小区
-              if (positionResult?.regeocode?.aois && positionResult?.regeocode?.aois.length) {
-                // 取第一个当做小区
-                this.divisions.area = positionResult?.regeocode?.aois[0]?.name
-              } else if (positionResult?.regeocode?.pois && positionResult?.regeocode?.pois.length) {
-                // 取第一个当做小区
-                this.divisions.area = positionResult?.regeocode?.pois[0]?.name
+        this.$nextTick(() => {
+          GetGDMap(this.gaode_secret_key, this.gaode_key).then(aMap => {
+            this.initMap(aMap)
+            this.mapAutocomplete = new (aMap).AutoComplete({
+              // city 限定城市，默认全国
+              city: '全国',
+              dragEnable: true,
+              animateEnable: false
+            })
+            this.positionPicker = new window.AMapUI.PositionPicker({
+              mode: 'dragMap',
+              map: this.map
+            })
+            this.positionPicker.on('success', (positionResult) => {
+              console.log(positionResult)
+              console.log(positionResult.position)
+              // 设置 行政区划信息
+              if (positionResult?.regeocode?.addressComponent) {
+                const { addressComponent } = positionResult?.regeocode
+                this.divisions.province = addressComponent.province
+                this.divisions.city = addressComponent.city
+                this.divisions.district = addressComponent.district
+                this.divisions.township = addressComponent.township
+                this.divisions.towncode = addressComponent.towncode
+                this.divisions.street = addressComponent.street
+                // 试着获取小区
+                if (positionResult?.regeocode?.aois && positionResult?.regeocode?.aois.length) {
+                  // 取第一个当做小区
+                  this.divisions.area = positionResult?.regeocode?.aois[0]?.name
+                } else if (positionResult?.regeocode?.pois && positionResult?.regeocode?.pois.length) {
+                  // 取第一个当做小区
+                  this.divisions.area = positionResult?.regeocode?.pois[0]?.name
+                }
+                this.divisions.str =
+                  `${addressComponent.province}${addressComponent.city}${addressComponent.district}${addressComponent.township}`
               }
-              this.divisions.str =
-                `${addressComponent.province}${addressComponent.city}${addressComponent.district}${addressComponent.township}`
-            }
-            if (this.divisions.str && positionResult.address.startsWith(this.divisions.str)) {
-              // 如果 省市区信息和获取到的地址的前缀一致 那么省市区前缀禁止修改只能修改后面的 通过 onchange事件拦截
-              this.readOnlyDivisions = true
-            }
-            this.addressObj.address = positionResult.address
-            this.addressObj.lng_lat = `${positionResult.position.lng},${positionResult.position.lat}`
-          })
-          this.positionPicker.on('fail', function (positionResult) {
+              if (this.divisions.str && positionResult.address.startsWith(this.divisions.str)) {
+                // 如果 省市区信息和获取到的地址的前缀一致 那么省市区前缀禁止修改只能修改后面的 通过 onchange事件拦截
+                this.readOnlyDivisions = true
+              }
+              this.addressObj.address = positionResult.address
+              this.addressObj.lng_lat = `${positionResult.position.lng},${positionResult.position.lat}`
+            })
+            this.positionPicker.on('fail', function (positionResult) {
+            })
+            this.positionPicker.start()
           })
-          this.positionPicker.start()
         })
       }
     }

package/src/base-client/components/common/CitySelect/CitySelect.vue

@@ -117,7 +117,9 @@ export default {
           this.setValue(this.value, res)
         }
       } else {
-        runLogic('getOperatingAreas', {}, 'af-revenue').then(res => {
+        runLogic('getOperatingAreas', {
+          orgId: this.currUser.orgid
+        }, 'af-revenue').then(res => {
           this.tagData.divisionsForTree = handleTree(res, 'code', 'parentcode')
           if (this.value) {
             this.setValue(this.value, res)