address-client 3.2.40 → 3.2.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.40",
+  "version": "3.2.41",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/filiale/qianneng/AddAreaMsg.vue

@@ -335,6 +335,9 @@
       initGen(this)
     },
     methods: {
+      selected(val){
+        this.buildingmodel = {...val.val}
+      },
       loadMeterBooks(){
         this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
       },
@@ -569,15 +572,20 @@
       // 保存楼栋
       async savebuilding () {
         this.buildingmodel.f_residential_area = this.$refs.areaselect.selectedItems
-        this.buildingmodel.f_filialeid = this.f_filialeids
-        this.buildingmodel.f_operator = this.$login.f.name
-        this.buildingmodel.f_operatorid = this.$login.f.id
-        this.buildingmodel.f_orgid = this.$login.f.orgid
-        this.buildingmodel.f_orgname = this.$login.f.orgs
-        this.buildingmodel.f_depid = this.$login.f.depids
-        this.buildingmodel.f_depname = this.$login.f.deps
+        this.buildingmodel.f_filialeid = this.buildingmodel.f_filialeid?this.buildingmodel.f_filialeid:this.f_filialeids
+        this.buildingmodel.f_operator = this.buildingmodel.f_operator?this.buildingmodel.f_operator:this.$login.f.name
+        this.buildingmodel.f_operatorid = this.buildingmodel.f_operatorid?this.buildingmodel.f_operatorid:this.$login.f.id
+        this.buildingmodel.f_orgid = this.buildingmodel.f_orgid?this.buildingmodel.f_orgid:this.$login.f.orgid
+        this.buildingmodel.f_orgname = this.buildingmodel.f_orgname?this.buildingmodel.f_orgname:this.$login.f.orgs
+        this.buildingmodel.f_depid = this.buildingmodel.f_depid?this.buildingmodel.f_depid:this.$login.f.depids
+        this.buildingmodel.f_depname = this.buildingmodel.f_depname?this.buildingmodel.f_depname:this.$login.f.deps
         await this.$resetpost('rs/logic/address_savebuilding', this.buildingmodel)
         this.$refs.buildinglist.search()
+        this.buildingmodel= {
+          f_residential_area: '',
+            f_residential_area_id: '',
+            f_building: ''
+        }
       },
       //保存小区
       async savearea(){

package/src/filiale/qianneng/AddStreetOrPcd.vue

@@ -146,6 +146,9 @@
       getAreaConfig(this)
     },
     methods: {
+      selected(val){
+        this.pcdmodel = {...val.val}
+      },
       async streetyanzheng(){
         console.log(this.streetmodel.f_street_number.length)
         if (this.streetmodel.f_street_number.length != 2){
@@ -252,15 +255,22 @@
       },
       //保存省市区
       async savepcd(){
-        this.pcdmodel.f_filialeid = this.f_filialeids
-        this.pcdmodel.f_operator = this.$login.f.name
-        this.pcdmodel.f_operatorid = this.$login.f.id
-        this.pcdmodel.f_orgid = this.$login.f.orgid
-        this.pcdmodel.f_orgname = this.$login.f.orgs
-        this.pcdmodel.f_depid = this.$login.f.depids
-        this.pcdmodel.f_depname = this.$login.f.deps
+        this.pcdmodel.f_filialeid = this.pcdmodel.f_filialeid?this.pcdmodel.f_filialeid:this.f_filialeids
+        this.pcdmodel.f_operator = this.pcdmodel.f_operator?this.pcdmodel.f_operator:this.$login.f.name
+        this.pcdmodel.f_operatorid = this.pcdmodel.f_operatorid?this.pcdmodel.f_operatorid:this.$login.f.id
+        this.pcdmodel.f_orgid = this.pcdmodel.f_orgid?this.pcdmodel.f_orgid:this.$login.f.orgid
+        this.pcdmodel.f_orgname = this.pcdmodel.f_orgname?this.pcdmodel.f_orgname:this.$login.f.orgs
+        this.pcdmodel.f_depid = this.pcdmodel.f_depid?this.pcdmodel.f_depid:this.$login.f.depids
+        this.pcdmodel.f_depname = this.pcdmodel.f_depname?this.pcdmodel.f_depname:this.$login.f.deps
         this.pcdmodel.f_pcd = this.pcdmodel.f_province+this.pcdmodel.f_city+this.pcdmodel.f_district
         await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
+        this.pcdmodel= {
+          f_province:'',
+            f_city:'',
+            f_district:'',
+            f_comments:'',
+            f_pcd_number: ''
+        }
       },
       //保存街道
       async savestreet(){