apply-clients 3.4.2-FuGu-17 → 3.4.2-FuGu-18

package/package.json

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

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

@@ -478,13 +478,11 @@ export default {
         }
       }))
     },
-    async 'streetChange' (index) {
+    async streetChange () {
       if (isEmpty(this.show_data.f_street)) {
         return
       }
 
-      this.setLabelValue('小区', null)
-
       let data = {
         tablename: 't_area',
         condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}'`
@@ -504,31 +502,6 @@ export default {
         }
       }))
     },
-    // 搜索小区
-    async 'searchArea' (area, index) {
-      let data = {
-        tablename: 't_area',
-        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}' and f_residential_area like '%${area}%'`
-      }
-      let http = new HttpResetClass()
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
-        {data: data},
-        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
-      )
-
-      if (res.data.length === 0) {
-        return
-      }
-
-      this.setLabelOptions('小区', res.data.map(item => {
-        return {
-          label: item.f_residential_area,
-          value: item.f_residential_area
-        }
-      }))
-    },
     // 缴费前置
     chargeBefore () {
       if (Number(this.show_data.f_due_money) > Number(this.show_data.f_cumulative_payment_money) || Number(this.show_data.f_surplus_money) > 0) {
@@ -653,6 +626,57 @@ export default {
         }
       }
     },
+    async 'streetChange' (index) {
+      if (isEmpty(this.show_data.f_street)) {
+        return
+      }
+
+      this.setLabelValue('小区', null)
+
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}'`
+      }
+      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_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
+    // 搜索小区
+    async 'searchArea' (area, index) {
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}' and f_residential_area like '%${area}%'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
+      )
+
+      if (res.data.length === 0) {
+        return
+      }
+
+      this.setLabelOptions('小区', res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
     // 打开模态框获取材料
     async 'getMaterialName' (index) {
       let data = {

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

@@ -616,11 +616,7 @@ export default {
     },
     async pcdChange () {
 
-      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)) {
+     if (isEmpty(this.show_data.f_pcd)) {
         return
       }