safecheck-client 3.0.39-5 → 3.0.39-51

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

@@ -79,27 +79,26 @@
                     :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>
           <!--<input type="text" readonly class="form-control rightipt" v-model="userinfo.addressinfo.f_street"  />-->
-          <v-select :value.sync="selectStreet" class="input-font" style="margin-left: 5%;"
+          <v-select :value="selectStreet" class="input-font" style="margin-left: 5%;"
                     :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>
           <!--<input type="text" readonly class="form-control rightipt" v-model="userinfo.addressinfo.f_residential_area"  />-->
-          <v-select :value.sync="selectArea" class="input-font" style="margin-left: 5%;"
+          <v-select :value="selectArea" class="input-font" style="margin-left: 5%;"
                     :width="'60%'"
                     v-model="selectArea"
                     :timeout="500"
-                    @select-search="select_search"
                     :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>
@@ -412,9 +411,12 @@ export default {
       headername: '基本信息',
       excessive: false,
       area: [],
+      areas:[],
+      selectAreaName:'',
+      f_slice_area:'',
       enable: false,
       f_meterno_path: Vue.nopic,
-      selectArea: {id: ''},
+      selectArea: '',
       selectPcd: {id: ''},
       selectStreet: {id: ''},
       changemeterno: false,//是否修改了机表表号
@@ -488,7 +490,7 @@ export default {
         checked = {ischeck: false, msg: '新地址不能为空！'}
       }
       if (this.addressType == '普通地址') {
-        if (!this.selectArea.id) {
+        if (!this.selectArea) {
           checked = {ischeck: false, msg: '请选择集收单位！'}
         }
         if (!this.userinfo.addressinfo.f_room) {
@@ -547,27 +549,31 @@ export default {
       return checked
     },
     select_search(text) {
-      //tag
-      if (this.selectStreet  && this.selectStreet.id) {
-        let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
-        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
-          data: {
-            items: "*",
-            tablename: "t_area",
-            orderitem: "id",
-            condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
-          }
-        }, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          //tag)
-          if (res.data.length > 0) {
-            this.area = []
-            res.data.forEach((result) => {
-              this.area.push({label: result.f_residential_area, value: result})
-            })
-          }
-        })
-      } else {
+      try {
+        if (this.selectStreet  && this.selectStreet.id) {
+          let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
+          new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+            data: {
+              items: "*",
+              tablename: "t_area",
+              orderitem: "id",
+              condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
+            }
+          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            //tag)
+            if (res.data.length > 0) {
+              this.area = []
+              res.data.forEach((result) => {
+                this.area.push({label: result.f_residential_area, value: result})
+              })
+            }
+          })
+        } else {
+          this.area = []
+        }
+      }catch (e) {
         this.area = []
+        console.log(e)
       }
     },
     cameraCallBack(prop, fileName) {
@@ -817,81 +823,107 @@ export default {
     changeNewAddress() {
       this.userinfo.addressinfo.f_address = this.addressType == '普通地址' ? this.getAddress : this.getAddressTS
     },
-    area_change() {
-      //tag
-      if( this.selectArea  && this.selectArea.f_residential_area){
-        this.userinfo.addressinfo.f_residential_area = this.selectArea.f_residential_area
-        this.userinfo.addressinfo.f_residential_area_id = this.selectArea.id
-        this.userinfo.addressinfo.f_slice_area = this.selectArea.f_slice_area
-        this.changeNewAddress()
+    area_change(val) {
+      if (!val || val instanceof Event){
+        return
+      }
+      try {
+        this.selectArea = val
+        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
+            }
+          })
+          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) {
+        console.log(e)
       }
-      //this.userinfo.addressinfo.f_residential_area=this.f_residential_area.f_residential_area
     },
-    async street_change() {
-      //tag
-      if (this.selectStreet && this.selectStreet.id) {
-        //如果街道改变--给街道赋值！
-        this.userinfo.addressinfo.f_street = this.selectStreet.f_street
-        this.userinfo.addressinfo.f_street_id = this.selectStreet.id
-        this.userinfo.addressinfo.f_iscity = this.selectStreet.f_iscity
-        //清空当前选中小区的值
-        this.userinfo.addressinfo.f_residential_area = ''
-        this.userinfo.addressinfo.f_residential_area_id = ''
-        this.userinfo.addressinfo.f_slice_area = ''
-        this.selectArea = {id: ''}
-        this.area = []
-        let pcdText = ` and f_street_id=${this.selectStreet.id}`
-        let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
-          data: {
-            items: "*",
-            tablename: "t_area",
-            orderitem: "id",
-            condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-        ////tag)
-        res.data.forEach((result) => {
-          this.area.push({label: result.f_residential_area, value: result})
-        })
-      } else {
+    async street_change(val) {
+      try {
+        this.selectStreet = val
+        //tag
+        if (this.selectStreet && this.selectStreet.id) {
+          //如果街道改变--给街道赋值！
+          this.userinfo.addressinfo.f_street = this.selectStreet.f_street
+          this.userinfo.addressinfo.f_street_id = this.selectStreet.id
+          this.userinfo.addressinfo.f_iscity = this.selectStreet.f_iscity
+          //清空当前选中小区的值
+          this.userinfo.addressinfo.f_residential_area = ''
+          this.userinfo.addressinfo.f_residential_area_id = ''
+          this.userinfo.addressinfo.f_slice_area = ''
+          this.selectArea = ''
+          this.area = []
+          this.areas = []
+          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,f_slice_area",
+              tablename: "t_area",
+              orderitem: "id",
+              condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          ////tag)
+          this.areas = res.data
+          res.data.forEach((result) => {
+            this.area.push({label: result.f_residential_area, value: result.id})
+          })
+        } else {
+          this.area = []
+          this.areas= []
+        }
+
+        this.changeNewAddress()
+      } catch (e) {
         this.area = []
+        console.log(e)
       }
-
-      this.changeNewAddress()
     },
     async pcd_change() {
-      //tag
-      if (this.selectPcd && this.selectPcd.id) {
+      try {
         //tag
-        //如果省市区改变-重新赋值
-        this.userinfo.addressinfo.f_pcd = this.selectPcd.f_pcd
-        this.userinfo.addressinfo.f_pcd_id = this.selectPcd.id
-        //清空 选中的街道和集收单位
-        this.selectStreet = {id: ''}
-        this.userinfo.addressinfo.f_street = ''
-        this.userinfo.addressinfo.f_street_id = ''
-        this.userinfo.addressinfo.f_iscity = ''
-        this.selectArea = {id: ''}
-        this.userinfo.addressinfo.f_residential_area = ''
-        this.userinfo.addressinfo.f_residential_area_id = ''
-        this.userinfo.addressinfo.f_slice_area = ''
-        this.streets = []
-        let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-        let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
-          data: {
-            items: "*",
-            tablename: "t_street",
-            orderitem: "id",
-            condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-        streetlist.data.forEach((result) => {
-          this.streets.push({label: result.f_street, value: result})
-        })
-      } else {
+        if (this.selectPcd && this.selectPcd.id) {
+          //tag
+          //如果省市区改变-重新赋值
+          this.userinfo.addressinfo.f_pcd = this.selectPcd.f_pcd
+          this.userinfo.addressinfo.f_pcd_id = this.selectPcd.id
+          //清空 选中的街道和集收单位
+          this.selectStreet = {id: ''}
+          this.userinfo.addressinfo.f_street = ''
+          this.userinfo.addressinfo.f_street_id = ''
+          this.userinfo.addressinfo.f_iscity = ''
+          this.selectArea = ''
+          this.userinfo.addressinfo.f_residential_area = ''
+          this.userinfo.addressinfo.f_residential_area_id = ''
+          this.userinfo.addressinfo.f_slice_area = ''
+          this.streets = []
+          let pcdText = `and f_pcd_id=${this.selectPcd.id}`
+          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+            data: {
+              items: "*",
+              tablename: "t_street",
+              orderitem: "id",
+              condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          streetlist.data.forEach((result) => {
+            this.streets.push({label: result.f_street, value: result})
+          })
+        } else {
+          this.streets = []
+        }
+        this.changeNewAddress()
+      } catch (e) {
         this.streets = []
+        console.log(e)
       }
-      this.changeNewAddress()
     },
     upUserState() {
       //tag)
@@ -965,57 +997,65 @@ export default {
       })
     },
     async getAreaList(text) {
-      if (this.selectStreet.id) {
-        this.area = []
-        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`, {
-          data: {
-            items: "*",
-            tablename: "t_area",
-            orderitem: "id",
-            condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-        ////tag)
-        res.data.forEach((result) => {
-          this.area.push({label: result.f_residential_area, value: result})
-        })
-        //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
-          }
-        })
-      } else {
+      try {
+        if (this.selectStreet.id) {
+          this.area = []
+          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,f_slice_area",
+              tablename: "t_area",
+              orderitem: "id",
+              condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          ////tag)
+          res.data.forEach((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: this.userinfo.addressinfo.f_residential_area_id
+          })
+        } else {
+          this.area = []
+        }
+      } catch (e) {
         this.area = []
+        console.log(e)
       }
 
     },
     async getStreetList() {
-      if (this.selectPcd.id) {
-        //tag
-        this.streets = []
-        let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-        let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
-          data: {
-            items: "*",
-            tablename: "t_street",
-            orderitem: "id",
-            condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-        streetlist.data.forEach((result) => {
-          //如果第一次进来有地址id 就拿下地址区域
-          if (this.selectStreet.id && this.selectStreet.id == result.id) {
-            //tag)
-            this.userinfo.addressinfo.f_iscity = result.f_iscity
-          }
-          this.streets.push({label: result.f_street, value: result})
-        })
-      } else {
+      try {
+        if (this.selectPcd.id) {
+          //tag
+          this.streets = []
+          let pcdText = `and f_pcd_id=${this.selectPcd.id}`
+          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+            data: {
+              items: "*",
+              tablename: "t_street",
+              orderitem: "id",
+              condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          streetlist.data.forEach((result) => {
+            //如果第一次进来有地址id 就拿下地址区域
+            if (this.selectStreet.id && this.selectStreet.id == result.id) {
+              //tag)
+              this.userinfo.addressinfo.f_iscity = result.f_iscity
+            }
+            this.streets.push({label: result.f_street, value: result})
+          })
+        } else {
+          this.streets = []
+        }
+      }catch (e) {
         this.streets = []
+        console.log(e)
       }
     },
     changeAddressType(val) {
@@ -1035,8 +1075,7 @@ export default {
   },
   computed: {
     getAddress() {
-      return (this.userinfo.addressinfo.f_pcd ? this.userinfo.addressinfo.f_pcd : '') +
-        (this.userinfo.addressinfo.f_street ? this.userinfo.addressinfo.f_street : '') +
+      return (this.userinfo.addressinfo.f_street ? this.userinfo.addressinfo.f_street : '') +
         (this.userinfo.addressinfo.f_residential_area ? this.userinfo.addressinfo.f_residential_area : '') +
         (this.userinfo.addressinfo.f_building ? this.userinfo.addressinfo.f_building + (this.userinfo.addressinfo.f_building_suffix ? this.userinfo.addressinfo.f_building_suffix : '') : '') +
         (this.userinfo.addressinfo.f_unit ? this.userinfo.addressinfo.f_unit + (this.userinfo.addressinfo.f_unit_suffix ? this.userinfo.addressinfo.f_unit_suffix : '') : '') +
@@ -1044,8 +1083,7 @@ export default {
         (this.userinfo.addressinfo.f_room ? this.userinfo.addressinfo.f_room + (this.userinfo.addressinfo.f_room_suffix ? this.userinfo.addressinfo.f_room_suffix : '') : '')
     },
     getAddressTS() {
-      return (this.userinfo.addressinfo.f_pcd ? this.userinfo.addressinfo.f_pcd : '') +
-        (this.userinfo.addressinfo.f_street ? this.userinfo.addressinfo.f_street : '') +
+      return (this.userinfo.addressinfo.f_street ? this.userinfo.addressinfo.f_street : '') +
         (this.userinfo.addressinfo.f_residential_area ? this.userinfo.addressinfo.f_residential_area : '')
     }
   },
@@ -1119,11 +1157,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.id = 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

package/src/filiale/jinhuang/android.js

@@ -7,7 +7,8 @@ let specialComp = {
   'current-create': (resolve) => { require(['./android/CurrentCreate.vue'], resolve) },
   'check-plan-down': (resolve) => { require(['./android/CheckPlanDown.vue'], resolve) },
   'safe-history-look': (resolve) => { require(['./android/safeHistoryLook'], resolve) },
-  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV.vue'], resolve) }
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV.vue'], resolve) },
+  'add-plan-item': (resolve) => { require(['./android/AddPlanItem.vue'], resolve) }
 }
 
 exports.specialComp = specialComp