apply-clients 3.4.73 → 3.4.74

package/package.json

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

package/src/filiale/hongda/pc.js

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 
 let specialComp = {
-  'exploration-select': (resolve) => { require(['./pc/ServiceView'], resolve) },
+  'service-view': (resolve) => { require(['./pc/ServiceView'], resolve) },
 }
 exports.specialComp = specialComp

package/src/filiale/linzhou/pc/ServiceControl.vue

@@ -301,6 +301,14 @@
         let temp = JSON.parse(JSON.stringify(this.selectdata))
         console.log('打印下temp',temp)
         this.show_data = temp
+        for (const item of this.show_data.fields) {
+          if(item.label==='气价名称'){
+            item.value=this.show_data.f_price_name
+          }
+          if(item.label==='安装合同编号'&& this.show_data.f_whether_underground == '无'){
+            item.required=false
+          }
+        }
         this.$nextTick(() => {
           this.showview = true
         })
@@ -742,7 +750,7 @@
       },
       async getDesignerPeople () {
         let data = {
-          source: 'this.getParentByType($organization$).getChildByName($设计部报装$).getChildren()',
+          source: 'this.getParentByType($organization$).getChildByName($施工部报装$).getChildren()',
           userid: this.$login.f.id
         }
 
@@ -751,7 +759,7 @@
           'POST',
           `rs/search`,
           {data: data},
-          {resolveMsg: null, rejectMsg: '设计人员查询失败！！！'}
+          {resolveMsg: null, rejectMsg: '施工人员查询失败！！！'}
         )
 
         return res.data.map(item => {
@@ -763,9 +771,6 @@
       },
       async surveyStopApply () {
         console.log('终止报建！！！！！')
-
-        this.show_data.f_stop_reason = '现场勘察不符合报装条件'
-
         let data = {
           data: this.show_data,
           user: this.$login.f
@@ -1669,23 +1674,13 @@
           && (this.show_data.defname === '报装申请') && this.show_data.button.button_name === '提交'){
           await this.contract_number()
         }
-        // if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '合同签订' && (this.show_data.button.button_name === '保存'||this.show_data.button.button_name === '提交')){
-        //   let dataz = {
-        //     condition: `u.id = ${this.show_data.id}`,
-        //     data: {
-        //       id: this.$login.f.id,
-        //       orgid: this.$login.f.orgid
-        //     }
-        //   }
-        //   let http = new HttpResetClass()
-        //   let restpz = await http.load(
-        //     'POST',
-        //     `rs/sql/checkuser`,
-        //     {data: dataz},
-        //     {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
-        //   )
-        //   this.show_data.actid=restpz.data[0].actid
-        // }
+        if (this.show_data.defname === '验收送气' && this.show_data.f_air_tightness === '不合格' && this.show_data.button.button_name === '提交'){
+          this.show_data.button.button_name = '维修'
+        }
+        if (this.show_data.defname === '踏勘设计' && this.show_data.f_is_have === '否' && this.show_data.button.button_name === '提交'){
+           this.surveyStopApply()
+          return
+        }
         let res = await this.$resetpost(
           `rs/logic/ApplyProductService`,
           {data: this.show_data},
@@ -1841,6 +1836,16 @@
             this.setLabelValue("地址", f_address)
           }
         }
+        if (this.show_data.defname === '踏勘设计' && this.show_data.f_is_have === '否'){
+          if (this.show_data.fields[index+1].label == '不具备安装原因'){
+            this.show_data.fields[index+1].hidden = false
+            this.show_data.fields[index+1].required = true
+          }
+        }
+        if (this.show_data.defname === '工程派工' && this.show_data.f_start_build && this.show_data.f_end_build){
+          this.show_data.f_build_days = (new Date(this.show_data.f_end_build) - new Date(this.show_data.f_start_build))/1000/60/60/24
+          this.setLabelValue("预计施工天数", this.show_data.f_build_days)
+        }
       },
       selectSearch (val, index) {},
       'onblur' (index) {},