apply-clients 3.4.1 → 3.4.2-FuGu-4

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

@@ -517,11 +517,11 @@ export default {
 
       for (const item of this.show_data.fields) {
         if (f_address_type === '民用市区') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+          if (item.label === '区/县' || item.label === '街道' || item.label === '小区' || item.label === '门牌号') {
             item.hidden = false
             item.required = true
           }
-          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+          if (item.label === '楼号' || item.label === '单元' || item.label === '楼层') {
             item.hidden = false
             item.required = false
           }
@@ -530,11 +530,11 @@ export default {
           }
         }
         if (f_address_type === '民用乡镇') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+          if (item.label === '区/县' || item.label === '街道' || item.label === '小区' || item.label === '门牌号') {
             item.hidden = false
             item.required = true
           }
-          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+          if (item.label === '楼号' || item.label === '单元' || item.label === '楼层') {
             item.hidden = false
             item.required = false
           }
@@ -547,15 +547,15 @@ export default {
           }
         }
         if (f_address_type === '特殊地址') {
-          if (item.label === '区/县' || item.label === '街道/乡镇') {
+          if (item.label === '区/县' || item.label === '街道') {
             item.hidden = false
             item.required = true
           }
-          if (item.label === '集收单位') {
+          if (item.label === '小区') {
             item.hidden = false
             item.required = false
           }
-          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
+          if (item.label === '楼号' || item.label === '单元' || item.label === '楼层' || item.label === '门牌号') {
             item.hidden = true
             item.required = false
           }
@@ -583,10 +583,10 @@ export default {
         'POST',
         `rs/sql/singleTable`,
         {data: data},
-        {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )
 
-      this.setLabelOptions('集收单位', res.data.map(item => {
+      this.setLabelOptions('小区', res.data.map(item => {
         return {
           label: item.f_residential_area,
           value: item.f_residential_area
@@ -616,10 +616,10 @@ export default {
         'POST',
         `rs/sql/singleTable`,
         {data: data},
-        {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+        {resolveMsg: null, rejectMsg: '街道查询失败！！！'}
       )
 
-      this.setLabelOptions('街道/乡镇', res.data.map(item => {
+      this.setLabelOptions('街道', res.data.map(item => {
         return {
           label: item.f_street,
           value: item.f_street
@@ -673,14 +673,14 @@ export default {
         'POST',
         `rs/sql/singleTable`,
         {data: data},
-        {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )
 
       if (res.data.length === 0) {
         return
       }
 
-      this.setLabelOptions('集收单位', res.data.map(item => {
+      this.setLabelOptions('小区', res.data.map(item => {
         return {
           label: item.f_residential_area,
           value: item.f_residential_area
@@ -938,7 +938,7 @@ export default {
         return
       }
 
-      this.setLabelValue('集收单位', null)
+      this.setLabelValue('小区', null)
 
       let data = {
         tablename: 't_area',
@@ -949,10 +949,10 @@ export default {
         'POST',
         `rs/sql/singleTable`,
         {data: data},
-        {resolveMsg: null, rejectMsg: '集收单位查询失败！！！'}
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )
 
-      this.setLabelOptions('集收单位', res.data.map(item => {
+      this.setLabelOptions('小区', res.data.map(item => {
         return {
           label: item.f_residential_area,
           value: item.f_residential_area
@@ -965,8 +965,8 @@ export default {
         return
       }
 
-      this.setLabelValue('街道/乡镇', null)
-      this.setLabelValue('集收单位', null)
+      this.setLabelValue('街道', null)
+      this.setLabelValue('小区', null)
 
 
 
@@ -988,10 +988,10 @@ export default {
         'POST',
         `rs/sql/singleTable`,
         {data: data},
-        {resolveMsg: null, rejectMsg: '街道/乡镇查询失败！！！'}
+        {resolveMsg: null, rejectMsg: '街道查询失败！！！'}
       )
 
-      this.setLabelOptions('街道/乡镇', res.data.map(item => {
+      this.setLabelOptions('街道', res.data.map(item => {
         return {
           label: item.f_street,
           value: item.f_street
@@ -1000,17 +1000,17 @@ export default {
     },
     // 地址类型失去焦点
     'addressTypeChange' (index) {
-      this.setLabelValue('街道/乡镇', null)
-      this.setLabelValue('集收单位', null)
+      this.setLabelValue('街道', null)
+      this.setLabelValue('小区', null)
       let f_address_type = this.show_data.fields[index].value
       for (const item of this.show_data.fields) {
-        if (f_address_type === '民用市区') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+        if (f_address_type === '民用地址') {
+          if (item.label === '区/县' || item.label === '街道' || item.label === '小区' || item.label === '门牌号') {
             item.hidden = false
             item.required = true
             item.value = null
           }
-          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+          if (item.label === '楼号' || item.label === '单元' || item.label === '楼层') {
             item.hidden = false
             item.required = false
             item.value = null
@@ -1020,39 +1020,18 @@ export default {
             item.value = null
           }
         }
-        if (f_address_type === '民用乡镇') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
-            item.hidden = false
-            item.required = true
-            item.value = null
-          }
-          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
-            item.hidden = false
-            item.required = false
-            item.value = null
-          }
-          if (item.label === '楼层') {
-            item.hidden = true
-            item.required = false
-            item.value = null
-          }
-          if (item.label === '地址') {
-            item.readonly = true
-            item.value = null
-          }
-        }
         if (f_address_type === '特殊地址') {
-          if (item.label === '区/县' || item.label === '街道/乡镇') {
+          if (item.label === '区/县' || item.label === '街道') {
             item.hidden = false
             item.required = true
             item.value = null
           }
-          if (item.label === '集收单位') {
+          if (item.label === '小区') {
             item.hidden = false
             item.required = false
             item.value = null
           }
-          if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
+          if (item.label === '楼号' || item.label === '单元' || item.label === '楼层' || item.label === '门牌号') {
             item.hidden = true
             item.required = false
             item.value = null
@@ -1113,33 +1092,41 @@ export default {
     },
     // 失去焦点出触发事件
     'onchange' (index) {
-      if (this.show_data.defname === '报装申请' || this.show_data.defname === '信息确认') {
+      if (this.show_data.defname === '申请登记') {
         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_pcd = this.getLableValue('区/县') || ''
-          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_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 = f_floor ? this.config.f_floor_suffix : ''
+          let f_floor_suffix = isEmpty(this.getLableValue('楼层')) ? '' : '层'
           let f_room = this.getLableValue('门牌号') || ''
-          let f_room_suffix = f_room ? this.config.f_room_suffix : ''
+          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)
         }
       }
+      if (this.show_data.fields[index].label === '联系电话') {
+        let phone = this.show_data.fields[index].value
+        // 电话号码效验
+        if (!(/^1[3456789]\d{9}$/.test(phone))) {
+          this.show_data.fields[index].value = ""
+          this.$showAlert('电话号码格式不正确，请重新输入。', 'info', 2000)
+        }
+      }
     },
     selectSearch (val, index) {},
     'onblur' (index) {},

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

@@ -1,33 +1,33 @@
-<template>
-  <div style="height: auto;text-align: center" class="col-sm-12" v-if="data != null">
-    <span style="color: red;font-family: 微软雅黑;font-weight: bold;font-size: 18px">请注意被退回原因为:{{data.f_back_reason}} 退回时间：{{data.f_date}}</span>
-  </div>
-</template>
-<script>
-import {HttpResetClass} from 'vue-client'
-
-export default {
-  title: '退回原因展示',
-  props: ['selectdata'],
-  data () {
-    return {
-      data: null
-    }
-  },
-  async ready () {
-    let data = {
-      tablename: 't_backcause',
-      condition: `actid = '${this.selectdata.actid}' and f_process_id = '${this.selectdata.f_process_id}'`
-    }
-    let http = new HttpResetClass()
-    let res = await http.load(
-      'POST',
-      'rs/sql/singleTable',
-      {data: data}, {
-        resolveMsg: null,
-        rejectMsg: '退回原因查询失败！！！'
-      })
-    this.data = res.data[0]
-  }
-}
-</script>
+<template>
+  <div style="height: auto;text-align: center" class="col-sm-12" v-if="data != null">
+    <span style="color: red;font-family: 微软雅黑;font-weight: bold;font-size: 18px">请注意被退回原因为:{{data.f_back_reason}} 退回时间：{{data.f_date}}</span>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '退回原因展示',
+  props: ['selectdata'],
+  data () {
+    return {
+      data: null
+    }
+  },
+  async ready () {
+    let data = {
+      tablename: 't_backcause',
+      condition: `actid = '${this.selectdata.actid}' and f_process_id = '${this.selectdata.f_process_id}'`
+    }
+    let http = new HttpResetClass()
+    let res = await http.load(
+      'POST',
+      'rs/sql/singleTable',
+      {data: data}, {
+        resolveMsg: null,
+        rejectMsg: '退回原因查询失败！！！'
+      })
+    this.data = res.data[0]
+  }
+}
+</script>