address-client 3.2.7 → 3.2.8-gongyi

package/src/filiale/gongyi/AddAreaMsg.vue

@@ -54,7 +54,7 @@
             <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
                    v-validate:slice='{required: true }'>
             <v-select :value.sync="areamodel.slice_area" v-model="areamodel.slice_area"
-                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+                      :options='sliceAreaConfig' placeholder='片区/管理站' filer-key="name"
                       close-on-select v-ref:slice>
             </v-select>
           </div>
@@ -569,6 +569,9 @@ export default {
     }
   },
   computed: {
+    sliceAreaConfig() {
+      return this.$appdata.getParam('小区片区')
+    },
     metertypes() {
       return this.$appdata.getParam('气表类型')
     },

package/src/filiale/gongyi/UserAddress.vue

@@ -460,34 +460,37 @@
         if (!this.usertype) {
           return
         }
-        console.log("省/市/区变化",val)
-        if(val){
-          //那就把[小区，街道]重新组织一下
-          await this.initstreets(`  f_pcd_id ='${val}' `)
-          if(this.model.f_street_id){
-            if (this.findbyid(this.streetslist,this.model.f_street_id)) {
-              let pcd_id=this.findbyid(this.streetslist,this.model.f_street_id).f_pcd_id
-              if(pcd_id!=val){
-                this.model.f_street_id=''
-              }
-            } else {
+        let pcdId = this.model.f_pcd_id
+        console.log("省/市/区变化，原始val:",val, "实际使用的pcdId:", pcdId)
+        if(!pcdId){
+          console.log("省市区ID为空，不执行后续操作")
+          return
+        }
+        //那就把[小区，街道]重新组织一下
+        await this.initstreets(`  f_pcd_id ='${pcdId}' `)
+        if(this.model.f_street_id){
+          if (this.findbyid(this.streetslist,this.model.f_street_id)) {
+            let pcd_id=this.findbyid(this.streetslist,this.model.f_street_id).f_pcd_id
+            if(pcd_id!=pcdId){
               this.model.f_street_id=''
             }
+          } else {
+            this.model.f_street_id=''
+          }
 
-            //那就把[小区，街道]重新组织一下
-            if (this.model.f_street_id) {
-              await this.initareas(` f_street_id ='${this.model.f_street_id}' `)
-              if(this.model.f_residential_area_id){
-                if (this.findbyid(this.areaslist,this.model.f_residential_area_id)) {
-                  let pcd_id=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_pcd_id
-                  if(pcd_id!=val){
-                    this.model.f_residential_area_id=''
-                  }
-                } else {
+          //那就把[小区，街道]重新组织一下
+          if (this.model.f_street_id) {
+            await this.initareas(` f_street_id ='${this.model.f_street_id}' `)
+            if(this.model.f_residential_area_id){
+              if (this.findbyid(this.areaslist,this.model.f_residential_area_id)) {
+                let pcd_id=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_pcd_id
+                if(pcd_id!=pcdId){
                   this.model.f_residential_area_id=''
                 }
-
+              } else {
+                this.model.f_residential_area_id=''
               }
+
             }
           }
         }
@@ -495,11 +498,16 @@
       },
       //小区变化
       areaChange(val){
-        console.log("小区变化",val)
+        let areaId = this.model.f_residential_area_id
+        console.log("小区变化，原始val:",val, "实际使用的areaId:", areaId)
+        if(!areaId){
+          console.log("小区ID为空，不执行后续操作")
+          return
+        }
         // 选择小区后级联出省市区和街道
         let selectArea // 选中的小区数据
         for (let row of this.areaslist) {
-          if (val == row.value) {
+          if (areaId == row.value) {
             selectArea = row.data
             break
           }
@@ -519,29 +527,33 @@
       },
       //街道变化
       async streetChange(val){
-        console.log("街道变化",val)
+        let streetId = this.model.f_street_id
+        console.log("街道变化，原始val:",val, "实际使用的streetId:", streetId)
+        if(!streetId){
+          console.log("街道ID为空，不执行后续操作")
+          return
+        }
         if(this.streetslist[0]) {
           var street=''
           this.streetslist.forEach((item)=>{
-            if(item.id===val){
+            if(item.id===streetId){
               street=item.label
             }
           })
-          this.model.f_address = street
+          if(street){
+            this.model.f_address = street
+          }
         }
-        if(val){
-          //那就把[小区]重新组织一下
-          await this.initareas(` f_street_id ='${val}' `)
-          if(this.model.f_residential_area_id){
-            if (this.findbyid(this.areaslist,this.model.f_residential_area_id)) {
-              let street_id=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_street_id
-              if(street_id!=val){
-                this.model.f_residential_area_id=''
-              }
-            } else {
+        //那就把[小区]重新组织一下
+        await this.initareas(` f_street_id ='${streetId}' `)
+        if(this.model.f_residential_area_id){
+          if (this.findbyid(this.areaslist,this.model.f_residential_area_id)) {
+            let street_id=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_street_id
+            if(street_id!=streetId){
               this.model.f_residential_area_id=''
             }
-
+          } else {
+            this.model.f_residential_area_id=''
           }
         }
         this.$resetValidation()

package/src/main.js

@@ -1,21 +1,21 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import { sale } from 'sale-client'
-import address from './address'
-
-Vue.config.silent = true
-
-/** **************************通用组件******************************/
-all()
-address("WEINAN")
-system(false)
-sale()
-require('system-clients/src/styles/less/bootstrap.less')
-
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import { sale } from 'sale-client'
+import address from './address'
+
+Vue.config.silent = true
+
+/** **************************通用组件******************************/
+all()
+address()
+system(false)
+sale()
+require('system-clients/src/styles/less/bootstrap.less')
+
+
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/AddressClient.iml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="AddressClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.7.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/out" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>