apply-clients 3.1.53 → 3.1.54

package/package.json

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

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

@@ -684,9 +684,8 @@
       },
       //  根据小区名称获取合同编号
       async getContractNumber() {
-        console.log("进来了没有1")
         if (this.selectdata.defname == '申请登记') {
-
+          console.log("获取合同编号")
           for (let i = 0; i < this.show_data.fields.length; i++) {
             // console.log("进来了没有2")
             // console.log("选择框的名称：" + this.show_data.fields[i].label + "---小区名称的长度：" + this.show_data.fields[i].value.length)
@@ -874,9 +873,111 @@
 
         this.$dispatch('selfsearch')
 
+      },
+      // 获取片区
+      async getPcd () {
+        let data = {
+          tablename: 't_pcd',
+          condition: `f_filialeid = '${this.$login.f.orgid}'`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/applysingleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '片区查询失败！！！'}
+        )
+
+        let pcd =  res.data.map(item => {
+          return {
+            label: item.f_pcd,
+            value: item.f_pcd
+          }
+        })
+        for (const item of this.show_data.fields) {
+          if (item.label === '片区') {
+            item.options = pcd
+          }
+        }
+      },
+      // 获取街道
+      async getStreet (){
+        let http = new HttpResetClass()
+        let condition = "f_filialeid = " + this.$login.f.orgid
+        let res = await http.load('POST','rs/logic/apply_queryArea',{data:{condition:condition}}, {resolveMsg: null, rejectMsg: null})
+        let street = res.data.queryStreet.map(item=>{
+          return {
+            label: item.f_street,
+            value: item.f_street
+          }
+        })
+        for (const item of this.show_data.fields) {
+          if (item.label === '街道') {
+            item.options = street
+          }
+        }
       }
     },
     events: {
+      async 'updateArea' (index) {
+        if (this.show_data.fields[index].value === '新小区') {
+          console.log("测试小区",index)
+          for (const item of this.show_data.fields) {
+            if (item.label === '小区') {
+              item.value = ''
+              item.hidden = true
+            }
+            if (item.label === '小区名称') {
+              item.value = ''
+              item.hidden = false
+            }
+          }
+        } else {
+          for (const item of this.show_data.fields) {
+            if (item.label === '小区名称') {
+              item.value = ''
+              item.hidden = true
+            }
+            if (item.label === '小区') {
+              item.value = ''
+              item.hidden = false
+            }
+          }
+        }
+      },
+      'confirmBuildFiles'(index){
+        if (this.show_data.fields[index].value === '否') {
+            for (const item of this.show_data.buttons){
+              if (item.button_name === '提交') {
+                  item.disabled = true
+              }
+            }
+        }
+      },
+      'buildArea'(){
+        if(this.show_data.f_area_type === '新小区'){
+          // this.getPcd()
+          this.getStreet()
+          for (const item of this.show_data.fields) {
+            if (item.label === '县/区') {
+              item.required = true
+              item.hidden = false
+            }
+            if (item.label === '街道') {
+              item.required = true
+              item.hidden = false
+            }
+            if (item.label === '片区') {
+              item.required = true
+              item.hidden = false
+            }
+            if (item.label === '小区名称') {
+              item.required = true
+              item.hidden = false
+            }
+          }
+        }
+      },
       test(i, j){
         console.log('删除')
         console.log(i + '-----' +j)
@@ -981,6 +1082,7 @@
           this.$refs.service_show.data.fields[index].label === '县/区' ||
           this.$refs.service_show.data.fields[index].label === '街道' ||
           this.$refs.service_show.data.fields[index].label === '小区' ||
+          this.$refs.service_show.data.fields[index].label === '小区名称' ||
           this.$refs.service_show.data.fields[index].label === '楼号' ||
           this.$refs.service_show.data.fields[index].label === '单元号' ||
           this.$refs.service_show.data.fields[index].label === '楼层' ||
@@ -998,7 +1100,7 @@
             if (this.$refs.service_show.data.fields[i].label === '街道' && this.$refs.service_show.data.fields[i].value) {
               address += this.$refs.service_show.data.fields[i].value
             }
-            if (this.$refs.service_show.data.fields[i].label === '小区' && this.$refs.service_show.data.fields[i].value) {
+            if ((this.$refs.service_show.data.fields[i].label === '小区名称' || this.$refs.service_show.data.fields[i].label === '小区') && this.$refs.service_show.data.fields[i].value) {
               address += this.$refs.service_show.data.fields[i].value
             }
             if (this.$refs.service_show.data.fields[i].label === '楼号' && this.$refs.service_show.data.fields[i].value) {

package/src/components/product/ReportForm/CustomerRecordMessage.vue

@@ -1497,10 +1497,14 @@
                 this.load();
                 this.closeFile();
                 let mm = '';
-                for(var i=0;i<res.data.msg.length;i++){
+                for(let i = 0; i < res.data.msg.length; i++){
                   mm+= `${res.data.msg[i].msg}`
                 }
-                let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm}`
+                let worry = '';
+                for(let j = 0; j < res.data.worry.length; j++){
+                  worry += `${res.data.worry[j].msg}`
+                }
+                let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm},提醒：${worry}`
                 if (res.data.code == 500) {
                   this.iswork=false;
                   msg = res.data.msg

package/src/components/product/ServiceView.vue

@@ -366,6 +366,9 @@
     created () {
       // 初始化数据
       this.initializtion()
+      if (this.data.readyEvent) {
+        this.$dispatch(this.data.readyEvent)
+      }
     },
     methods: {
       // 按钮模态框确定
@@ -483,6 +486,10 @@
       check (index) {
         // 是否禁用按钮
         this.disableButton()
+        if (this.data.fields[index].onchange) {
+          console.log("当前onchange",this.data.fields[index].onchange)
+          this.$dispatch(this.data.fields[index].onchange, index)
+        }
 
         this.$dispatch('check', index)
         // 如果有错误信息提示走错误信息判断处理