apply-clients 3.4.2-FuGu-29 → 3.4.2-FuGu-30

package/package.json

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

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

@@ -5,7 +5,8 @@
         <app-service-view v-ref:serviceview :data="show_data" v-if="showview"></app-service-view>
       </panel>
       <panel header="拍照" :is-open="false" type="primary" v-if="selectdata.f_process_id">
-        <app-take-pic :blobid="selectdata.f_process_id" :defname="selectdata.defname" :isdelete="true" :istakepic="true" :istype="true"></app-take-pic>
+        <app-take-pic :blobid="selectdata.f_process_id" :defname="selectdata.defname" :isdelete="true" :istakepic="true"
+                      :istype="true"></app-take-pic>
       </panel>
     </accordion>
   </div>
@@ -34,7 +35,7 @@ Date.prototype.Format = function (fmt) {
 export default {
   title: '报建流程业务控制层',
   props: ['selectdata'],
-  data () {
+  data() {
     return {
       json_datas: null,
       data: null,
@@ -43,7 +44,7 @@ export default {
       config: {}
     }
   },
-  ready () {
+  ready() {
     this.refurbish()
   },
   methods: {
@@ -291,14 +292,14 @@ export default {
       })
       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==='小区') {
+          if (item.label === '预约地址' || item.label === '地址类型' || item.label === '片区' || item.label === '区/县' || item.label === '街道' || item.label === '小区') {
             item.hidden = false
             item.required = true
           }
-          if (item.label==='区/县' && item.value !== null && item.value !==''){
+          if (item.label === '区/县' && item.value !== null && item.value !== '') {
             this.pcdChange()
           }
-          if (item.label==='街道' && item.value !== null && item.value !==''){
+          if (item.label === '街道' && item.value !== null && item.value !== '') {
             this.streetChange()
           }
         }
@@ -377,7 +378,7 @@ export default {
         this.$showMessage(`${this.show_data.fields[index].label}已存在！！！`)
       }
     },
-    async breakControl () {
+    async breakControl() {
       if (this.show_data.id) {
         let data = {
           condition: `u.id = ${this.show_data.id}`,
@@ -403,7 +404,7 @@ export default {
       this.refurbish()
     },
     // 获取片区
-    async getSliceArea () {
+    async getSliceArea() {
       let data = {
         source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
         userid: Vue.user.id
@@ -425,7 +426,7 @@ export default {
       })
     },
     // 获取区县
-    async getPcd () {
+    async getPcd() {
       let data = {
         tablename: 't_pcd',
         condition: `f_filialeid = '${Vue.user.orgid}'`
@@ -445,7 +446,7 @@ export default {
         }
       })
     },
-    async pcdChange () {
+    async pcdChange() {
       if (isEmpty(this.show_data.f_pcd)) {
         return
       }
@@ -478,7 +479,7 @@ export default {
         }
       }))
     },
-    async streetChange () {
+    async streetChange() {
       if (isEmpty(this.show_data.f_street)) {
         return
       }
@@ -503,7 +504,7 @@ export default {
       }))
     },
     // 缴费前置
-    chargeBefore () {
+    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) {
         this.$showMessage("费用未结清！！！")
         throw null
@@ -511,7 +512,7 @@ export default {
     },
 
     // 施工前置
-    async constructionBefore () {
+    async constructionBefore() {
       let http = new HttpResetClass()
       let data = {
         condition: `ui.f_process_id = '${this.show_data.f_process_id}' and uf.f_table_state = '待开通'`
@@ -529,7 +530,7 @@ export default {
         throw `还有${res.data[0].num}户未安装，无法提交`
       }
     },
-    changePipeBuild () {
+    changePipeBuild() {
       if (this.selectdata.f_process_dep === '工程部') {
         return 'this.getParentByType($organization$).getChildByName($工程部报装$).getChildren()'
       }
@@ -538,7 +539,7 @@ export default {
       }
       return 'this.getParentByType($organization$).getChildByName($工程部报装$).getChildren()'
     },
-    async getPrice (f_price_id) {
+    async getPrice(f_price_id) {
       console.log('=======================')
       console.log(f_price_id)
 
@@ -565,7 +566,7 @@ export default {
       })
     },
     // 获取施工负责人
-    async getWorker () {
+    async getWorker() {
       let data = {
         source: 'this.getParentByType($organization$).getChildByName($安装员$).getChildren()',
         userid: Vue.user.id
@@ -587,33 +588,35 @@ export default {
       })
     },
     async addressCheck() {
-      let data = {
-        tablename: 't_user_address',
-        condition: `f_address_state != '作废' and f_orgid = '${Vue.user.orgid}' and f_address = '${this.show_data.f_address}' `
-      }
-      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){
-        this.$showMessage('地址已存在，请修改后提交！！！')
-        throw null
+      if (this.show_data.defname === '申请登记' || (this.show_data.f_apply_source === '微信公众号' && this.show_data.defname === '现场勘察')) {
+        let data = {
+          tablename: 't_user_address',
+          condition: `f_address_state != '作废' and f_orgid = '${Vue.user.orgid}' and f_address = '${this.show_data.f_address}' `
+        }
+        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) {
+          this.$showMessage('地址已存在，请修改后提交！！！')
+          throw null
+        }
       }
     },
   },
   events: {
-    'breakControl' () {
+    'breakControl'() {
       this.breakControl()
     },
     // 检查重复
-    'checkRepeat' (index) {
+    'checkRepeat'(index) {
       this.checkDuplicate(index)
     },
     // 选择材料
-    async materialNameChenge (index, fieldIndex) {
+    async materialNameChenge(index, fieldIndex) {
       let material = this.show_data.onetomany[index].fields[fieldIndex].value
 
       this.show_data.onetomany[index].fields.forEach(item => {
@@ -622,7 +625,7 @@ export default {
         }
       })
     },
-    'addressTypeChange' (index) {
+    'addressTypeChange'(index) {
       this.setLabelValue('街道', null)
       this.setLabelValue('小区', null)
       let f_address_type = this.show_data.fields[index].value
@@ -667,7 +670,7 @@ export default {
       }
     },
     // 区县失去焦点
-    async 'pcdChange' (index) {
+    async 'pcdChange'(index) {
       if (isEmpty(this.show_data.f_pcd)) {
         return
       }
@@ -676,7 +679,6 @@ export default {
       this.setLabelValue('小区', null)
 
 
-
       let data = {
         tablename: 't_street',
         condition: `f_filialeid = '${Vue.user.orgid}' and f_pcd = '${this.show_data.f_pcd}'`
@@ -705,7 +707,7 @@ export default {
         }
       }))
     },
-    async 'streetChange' (index) {
+    async 'streetChange'(index) {
       if (isEmpty(this.show_data.f_street)) {
         return
       }
@@ -732,7 +734,7 @@ export default {
       }))
     },
     // 搜索小区
-    async 'searchArea' (area, index) {
+    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}%'`
@@ -757,7 +759,7 @@ export default {
       }))
     },
     // 打开模态框获取材料
-    async 'getMaterialName' (index) {
+    async 'getMaterialName'(index) {
       let data = {
         condition: `1=1`
       }
@@ -781,7 +783,7 @@ export default {
       })
     },
     // 选择气价
-    'priceChange' (index) {
+    'priceChange'(index) {
       if (isEmpty(this.show_data.stairPrice)) {
         return
       }
@@ -797,7 +799,7 @@ export default {
       this.show_data.f_price_name = stairPrice.f_price_name
     },
     // 是否购买保险
-    isInsureChange (index) {
+    isInsureChange(index) {
       let f_is_insure = this.getLableValue('是否购买保险')
       for (const item of this.show_data.fields) {
         if (f_is_insure === '是') {
@@ -817,7 +819,7 @@ export default {
       }
     },
     // 通气点火初始化
-    async 'gasReadyEvent' () {
+    async 'gasReadyEvent'() {
       if (!isEmpty(this.show_data.f_price_id)) {
         let priceList = await this.getPrice(this.show_data.f_price_id)
         this.setLabelValue('气价名称', priceList[0].value)
@@ -879,7 +881,7 @@ export default {
       }
     },
     // 合同金额失去焦点
-    async 'contractMoneyChange' (index) {
+    async 'contractMoneyChange'(index) {
       let data = {
         operator: '+',
         num1: this.show_data.f_contract_money || 0,
@@ -923,7 +925,7 @@ export default {
       this.$dispatch('confirm')
     },
     // 失去焦点出触发事件
-    'onchange' (index) {
+    'onchange'(index) {
       if (this.show_data.defname === '申请登记' || (this.show_data.defname === '现场勘察' && this.show_data.f_apply_source === '微信公众号')) {
         if (
           this.show_data.fields[index].label === '片区' ||
@@ -952,18 +954,21 @@ export default {
         }
       }
     },
-    'onblur' (index) {},
-    'oninput' (index) {},
-    'initializtionView' () {},
-    async 'onchangeModal' (index, fieldIndex) {
+    'onblur'(index) {
     },
-    async 'onblurModal' (index, fieldIndex) {
+    'oninput'(index) {
+    },
+    'initializtionView'() {
+    },
+    async 'onchangeModal'(index, fieldIndex) {
+    },
+    async 'onblurModal'(index, fieldIndex) {
 
     },
-    async 'oninputModal' (index, fieldIndex) {
+    async 'oninputModal'(index, fieldIndex) {
 
     },
-    async 'onetomanydelete' (index, rowIndex) {
+    async 'onetomanydelete'(index, rowIndex) {
 
       let http = new HttpResetClass()
 
@@ -979,7 +984,7 @@ export default {
       )
       this.breakControl()
     },
-    async 'onetomanyupdate' (index, rowIndex) {
+    async 'onetomanyupdate'(index, rowIndex) {
       let data = this.show_data.onetomany[index].rows[rowIndex]
 
       this.show_data.onetomany[index].fields.forEach(item => {
@@ -995,9 +1000,9 @@ export default {
       )
       this.breakControl()
     },
-    async 'onetomanyadd' (index) {
+    async 'onetomanyadd'(index) {
       let data = {
-        f_process_id : this.show_data.f_process_id,
+        f_process_id: this.show_data.f_process_id,
         f_operator_id: Vue.user.id,
         f_operator: Vue.user.name,
         f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
@@ -1017,18 +1022,17 @@ export default {
       )
       this.breakControl()
     },
-    'onbutchange' (index) {
+    'onbutchange'(index) {
 
     },
-    'onbutblur' (index) {
+    'onbutblur'(index) {
 
     },
-    'onbutinput' (index) {
+    'onbutinput'(index) {
 
     }
   },
-  watch: {
-  }
+  watch: {}
 }
 </script>
 <style scoped>

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

@@ -473,21 +473,23 @@ export default {
       }
     },
     async addressCheck() {
-      let data = {
-        tablename: 't_user_address',
-        condition: `f_address_state != '作废' and f_orgid = '${this.$login.f.orgid}' and f_address = '${this.show_data.f_address}' `
-      }
-      let http = new HttpResetClass()
-      let res = await http.load(
-        'POST',
-        `rs/sql/singleTable`,
-        {data: data},
-        {resolveMsg: null, rejectMsg: '地址查询失败！！！'}
-      )
-      console.log("当前信息查看",res.data)
-      if (res.data.length > 0){
-        this.$showMessage('地址已存在，请修改后提交！！！')
-        throw null
+      if (this.show_data.defname === '申请登记' || (this.show_data.f_apply_source === '微信公众号' && this.show_data.defname === '现场勘察')) {
+        let data = {
+          tablename: 't_user_address',
+          condition: `f_address_state != '作废' and f_orgid = '${this.$login.f.orgid}' and f_address = '${this.show_data.f_address}' `
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '地址查询失败！！！'}
+        )
+        console.log("当前信息查看", res.data)
+        if (res.data.length > 0) {
+          this.$showMessage('地址已存在，请修改后提交！！！')
+          throw null
+        }
       }
     },
     // 施工前置