safecheck-client 3.0.39-40 → 3.0.39-42

package/src/filiale/jinhuang/android/PhoneUpUserinfo.vue

@@ -79,7 +79,7 @@
                     :width="'60%'"
                     v-model="selectPcd"
                     :options='pcds' placeholder='请选择省市区' close-on-select clear-button value-single
-                    @change="pcd_change()"></v-select>
+                    @change="pcd_change"></v-select>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">街道名称:</label>
@@ -88,7 +88,7 @@
                     :width="'60%'"
                     v-model="selectStreet"
                     :options='streets' placeholder='请选择街道' close-on-select clear-button value-single
-                    @change="street_change()"></v-select>
+                    @change="street_change"></v-select>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">集收单位:</label>
@@ -98,7 +98,7 @@
                     v-model="selectArea"
                     :timeout="500"
                     :options='area' placeholder='请选择集收单位' close-on-select clear-button value-single
-                    @change="area_change()"></v-select>
+                    @change="area_change"></v-select>
         </div>
         <!--<div class="row auto" style="margin: 5px 0"  v-show="addressType=='特殊地址'">
           <label class="righttxt">集收单位:</label>
@@ -826,16 +826,16 @@ export default {
     area_change(val) {
       try {
         this.selectArea = val
-        if (this.selectArea) {
+        if (this.selectArea && this.areas.length> 0) {
           this.areas.forEach((result) => {
-             if(result.id  == this.selectArea){
-               this.selectAreaName = result.f_residential_area
-               this.f_slice_area = result.f_slice_area
-             }
+            if(result.id  == this.selectArea){
+              this.selectAreaName = result.f_residential_area
+              this.f_slice_area = result.f_slice_area
+            }
           })
-          this.userinfo.addressinfo.f_residential_area = this.selectAreaName
-          this.userinfo.addressinfo.f_residential_area_id = this.selectArea
-          this.userinfo.addressinfo.f_slice_area = this.f_slice_area
+          this.userinfo.addressinfo.f_residential_area = this.selectAreaName ?this.selectAreaName:this.userinfo.addressinfo.f_residential_area
+          this.userinfo.addressinfo.f_residential_area_id = this.selectArea?this.selectArea:this.userinfo.addressinfo.f_residential_area_id
+          this.userinfo.addressinfo.f_slice_area = this.f_slice_area?this.f_slice_area:this.userinfo.addressinfo.f_slice_area
           this.changeNewAddress()
         }
       } catch (e) {
@@ -861,7 +861,7 @@ export default {
           let pcdText = ` and f_street_id=${this.selectStreet.id}`
           let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=999999`, {
             data: {
-              items: "id,f_residential_area",
+              items: "id,f_residential_area,f_slice_area",
               tablename: "t_area",
               orderitem: "id",
               condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
@@ -1000,7 +1000,7 @@ export default {
           let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
           let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=999999`, {
             data: {
-              items: "id,f_residential_area",
+              items: "id,f_residential_area,f_slice_area",
               tablename: "t_area",
               orderitem: "id",
               condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
@@ -1008,15 +1008,13 @@ export default {
           }, {resolveMsg: null, rejectMsg: null})
           ////tag)
           res.data.forEach((result) => {
-            this.area.push({label: result.f_residential_area, value: result})
+            this.area.push({label: result.f_residential_area, value: result.id})
           })
+          this.areas = res.data
           //tag
           this.area.push({
             label: this.userinfo.addressinfo.f_residential_area,
-            value: {
-              id: this.userinfo.addressinfo.f_residential_area_id,
-              f_residential_area: this.userinfo.addressinfo.f_residential_area
-            }
+            value: this.userinfo.addressinfo.f_residential_area_id
           })
         } else {
           this.area = []
@@ -1156,11 +1154,11 @@ export default {
       this.userinfo = res.data
       this.userinfo_old = JSON.parse(JSON.stringify(res.data))
       this.model = this.userinfo.meterinfo[0].devicesinfo
-      this.selectArea = this.userinfo.addressinfo.f_residential_area_id
       this.selectPcd.id = this.userinfo.addressinfo.f_pcd_id
       this.selectPcd.f_pcd = this.userinfo.addressinfo.f_pcd
       this.selectStreet.id = this.userinfo.addressinfo.f_street_id
       this.selectStreet.f_street = this.userinfo.addressinfo.f_street
+      this.selectArea = this.userinfo.addressinfo.f_residential_area_id
       await this.getStreetList()
       await this.getAreaList()
       this.excessive = false