apply-clients 3.4.2-FuGu-16 → 3.4.2-FuGu-19

package/build/dev-server.js

@@ -6,10 +6,10 @@ var proxyMiddleware = require('http-proxy-middleware')
 var app = express()
 var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
-// var ldap = 'http://121.36.79.201:8400'
-// var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'http://192.168.50.4:8400'
-var applyinstall = 'http://127.0.0.1:8082'
+var ldap = 'http://124.70.12.19:8400'
+var applyinstall = 'http://124.70.12.19:8400'
+// var ldap = 'http://192.168.50.4:8400'
+// var applyinstall = 'http://127.0.0.1:8082'
 
 var proxyTable = {
   '/rs/logic/getSaleInitData': {

package/package.json

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

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

@@ -282,27 +282,27 @@ export default {
           })
         }
       }
-      if (this.selectdata.f_apply_source === '微信公众号' && this.selectdata.defname === '现场勘察') {
-        for (const item of this.selectdata.fields) {
+      // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
+      let temp = JSON.parse(JSON.stringify(this.selectdata))
+
+      this.show_data = temp
+      this.$nextTick(() => {
+        this.showview = true
+      })
+      if (this.show_data.f_apply_source === '微信公众号' && this.show_data.defname === '现场勘察') {
+        for (const item of this.show_data.fields) {
           if (item.label==='预约地址' || item.label==='地址类型' || item.label==='片区' || item.label==='区/县' || item.label==='街道' || item.label==='小区') {
             item.hidden = false
             item.required = true
           }
-          if (item.label==='区/县' && item.value){
-            this.pcdChange
+          if (item.label==='区/县' && item.value !== null && item.value !==''){
+            this.pcdChange()
           }
-          if (item.label==='街道' && item.value){
-            this.streetChange
+          if (item.label==='街道' && item.value !== null && item.value !==''){
+            this.streetChange()
           }
         }
       }
-      // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
-      let temp = JSON.parse(JSON.stringify(this.selectdata))
-
-      this.show_data = temp
-      this.$nextTick(() => {
-        this.showview = true
-      })
     },
     // 金额转大写
     smalltoBIG(n) {
@@ -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,96 @@ 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 = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
+      }
+      let f_address_type = this.getLableValue('地址类型')
+
+      if (f_address_type === '民用市区') {
+        data.condition = `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.show_data.f_pcd}' and f_iscity = '市区'`
+      }
+      if (f_address_type === '民用乡镇') {
+        data.condition = `f_filialeid = '${this.$login.f.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
+      }
+
+      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

@@ -261,27 +261,27 @@ export default {
         }
       }
 
-      if (this.selectdata.f_apply_source === '微信公众号' && this.selectdata.defname === '现场勘察') {
-        for (const item of this.selectdata.fields) {
+      // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
+      let temp = JSON.parse(JSON.stringify(this.selectdata))
+
+      this.show_data = temp
+      this.$nextTick(() => {
+        this.showview = true
+      })
+      if (this.show_data.f_apply_source === '微信公众号' && this.show_data.defname === '现场勘察') {
+        for (const item of this.show_data.fields) {
           if (item.label==='预约地址' || item.label==='地址类型' || item.label==='片区' || item.label==='区/县' || item.label==='街道' || item.label==='小区') {
             item.hidden = false
             item.required = true
           }
-          if (item.label==='区/县' && item.value){
-            this.pcdChange
+          if (item.label==='区/县' && item.value !== null && item.value !==''){
+            this.pcdChange()
           }
-          if (item.label==='街道' && item.value){
-            this.streetChange
+          if (item.label==='街道' && item.value !== null && item.value !==''){
+            this.streetChange()
           }
         }
       }
-      // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
-      let temp = JSON.parse(JSON.stringify(this.selectdata))
-
-      this.show_data = temp
-      this.$nextTick(() => {
-        this.showview = true
-      })
     },
     // 金额转大写
     smalltoBIG(n) {
@@ -615,7 +615,12 @@ 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
       }