apply-clients 3.4.2-FuGu-18 → 3.4.2-FuGu-21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.4.2-FuGu-18",
+  "version": "3.4.2-FuGu-21",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/android/Process/AppServiceControl.vue

@@ -626,6 +626,45 @@ export default {
         }
       }
     },
+    // 区县失去焦点
+    async 'pcdChange' (index) {
+      if (isEmpty(this.show_data.f_pcd)) {
+        return
+      }
+
+      this.setLabelValue('街道', null)
+      this.setLabelValue('小区', null)
+
+
+
+      let data = {
+        tablename: 't_street',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
+      }
+      let f_address_type = this.getLableValue('地址类型')
+
+      if (f_address_type === '民用市区') {
+        data.condition = `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '市区'`
+      }
+      if (f_address_type === '民用乡镇') {
+        data.condition = `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '乡镇'`
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '街道查询失败！！！'}
+      )
+
+      this.setLabelOptions('街道', res.data.map(item => {
+        return {
+          label: item.f_street,
+          value: item.f_street
+        }
+      }))
+    },
     async 'streetChange' (index) {
       if (isEmpty(this.show_data.f_street)) {
         return
@@ -845,39 +884,30 @@ export default {
     },
     // 失去焦点出触发事件
     'onchange' (index) {
-      if (this.show_data.defname === '报装申请') {
+      if (this.show_data.defname === '申请登记' || (this.show_data.defname === '现场勘察' && this.show_data.f_apply_source === '微信公众号')) {
         if (
+          this.show_data.fields[index].label === '片区' ||
+          this.show_data.fields[index].label === '区/县' ||
           this.show_data.fields[index].label === '街道' ||
           this.show_data.fields[index].label === '小区' ||
-          this.show_data.fields[index].label === '楼号(乡/镇)' ||
-          this.show_data.fields[index].label === '单元(村)' ||
-          this.show_data.fields[index].label === '楼层(组)' ||
-          this.show_data.fields[index].label === '门牌号(号)'
+          this.show_data.fields[index].label === '楼号' ||
+          this.show_data.fields[index].label === '单元' ||
+          this.show_data.fields[index].label === '楼层' ||
+          this.show_data.fields[index].label === '门牌号'
         ) {
-
-          let f_street = this.getLableValue('街道')
-          let f_residential_area = this.getLableValue('小区')
-          let f_building = this.getLableValue('楼号(乡/镇)')
-          let f_building_suffix = f_building ? this.config.f_building_suffix : ''
-          let f_unit = this.getLableValue('单元(村)')
-          let f_unit_suffix = f_unit ? this.config.f_unit_suffix : ''
-          let f_floor = this.getLableValue('楼层(组)')
-          let f_floor_suffix = f_floor ? this.config.f_floor_suffix : ''
-          let f_room = this.getLableValue('门牌号(号)')
-          let f_room_suffix = f_room ? this.config.f_room_suffix : ''
-
-          let f_address = null
-
-          let f_address_type = this.show_data.f_address_type
-          if (f_address_type === '民用城区') {
-            f_address = f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
-          }
-          if (f_address_type === '民用农村') {
-            f_address = f_building + f_unit + f_floor + f_room
-          }
-          if (f_address_type === '特殊城区') {
-            f_address = f_street + f_residential_area
-          }
+          let f_pcd = this.getLableValue('区/县') || ''
+          let f_street = this.getLableValue('街道') || ''
+          let f_residential_area = this.getLableValue('小区') || ''
+          let f_building = this.getLableValue('楼号') || ''
+          let f_building_suffix = isEmpty(this.getLableValue('楼号')) ? '' : '号楼'
+          let f_unit = this.getLableValue('单元') || ''
+          let f_unit_suffix = isEmpty(this.getLableValue('单元')) ? '' : '单元'
+          let f_floor = this.getLableValue('楼层') || ''
+          let f_floor_suffix = isEmpty(this.getLableValue('楼层')) ? '' : '层'
+          let f_room = this.getLableValue('门牌号') || ''
+          let f_room_suffix = isEmpty(this.getLableValue('门牌号')) ? '' : '室'
+
+          let f_address = f_pcd + f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
           this.setLabelValue("地址", f_address)
         }
       }

package/src/components/product/Process/Service/ServiceControl.vue

@@ -616,7 +616,11 @@ export default {
     },
     async pcdChange () {
 
-     if (isEmpty(this.show_data.f_pcd)) {
+      if (isEmpty(this.show_data)) {
+        if (!isEmpty(this.selectdata.f_pcd)) {
+          this.show_data.f_pcd = this.selectdata.f_pcd
+        }
+      } if (isEmpty(this.show_data.f_pcd)) {
         return
       }