apply-clients 5.0.35-48 → 5.0.35-50

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

@@ -70,7 +70,20 @@
 <!--    <report-print id='bill-fee' top='15mm' left='5mm' width='90%' height='70%' :showbtn="false" preview="true"-->
 <!--                  v-ref:reportprint></report-print>-->
 <!--  </div>-->
-
+  <modal :show.sync="stop_show" v-ref:modal stop_show="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeback"><span>&times;</span></button>
+      <h4 class="modal-title">终止备注</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <input type="text" class="form-control" v-model="models.f_stop_remarks"/>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="stop_show" type="button" class="btn btn-default" @click='stopapplys'>确认</button>
+    </footer>
+  </modal>
 
 </template>
 <script>
@@ -134,13 +147,71 @@
           rows: [] // 购货方信息
         },
         bill: '',
-          areaall:[]
+        areaall:[],
+        stop_show:false, // 终止备注开关
+        models: {
+          f_date: Util.toStandardTimeString(),
+          f_department: this.$login.f.f_parentname,
+          f_operator: this.$login.f.name,
+          f_filiale: this.$login.f.f_fengongsi
+        }
       }
     },
     methods: {
       /*
               ============================================收费临时使用
       */
+      // 转到报建
+      async addactive(modify) {
+        this.selectdata.applyid = this.selectdata.id
+        this.$resetpost('rs/logic/stopapply', {data: this.selectdata})
+        this.$workflow_vue.start_activity = modify
+        let http = new HttpResetClass()
+        let res = await http.load('POST','rs/logic/ApplyGetProcessID',{data:{filename:this.$workflow_vue.workflow_xmlfilename,start_activity:this.$workflow_vue.start_activity}}, {resolveMsg: null, rejectMsg: '获取流程ID失败，请联系开发人员'})
+        let data = {
+          defname: this.$workflow_vue.start_activity,
+          f_process_id: res.data.f_process_id,
+          f_apply_date: Util.toStandardTimeString(),
+          f_product_id: res.data.f_product_id,
+          start_activity:this.$workflow_vue.start_activity,
+          f_user_type:this.selectdata.f_user_type,
+          f_user_name:this.selectdata.f_user_name,
+          f_phone:this.selectdata.f_phone,
+          f_area:this.selectdata.f_area,
+          f_street:this.selectdata.f_street,
+          f_residential_area:this.selectdata.f_residential_area,
+          f_building:this.selectdata.f_building,
+          f_unit:this.selectdata.f_unit,
+          f_floor:this.selectdata.f_floor,
+          f_room:this.selectdata.f_room,
+          f_address:this.selectdata.f_address,
+          user:this.$login.f
+        }
+        await http.load('POST','rs/logic/newaddApplyproduct',{data:data}, {resolveMsg: null, rejectMsg: '转发失败，请联系开发人员'})
+        this.$dispatch('close')
+      },
+      // 终止报建
+      async stopapplys () {
+        this.models = Object.assign({}, this.selectdata, this.models)
+        this.models.id = null
+        this.models.applyid = this.selectdata.id
+        this.models.f_operat_type = '终止报建'
+        this.models.f_state = '有效'
+        this.models.f_describe = this.selectdata.f_user_name + '已终止报建'
+        let data ={
+          tablename:'t_project_stop',
+          parameters:this.models
+        }
+        let http = new HttpResetClass()
+        await  http.load('POST','rs/logic/save', {data:data},{resolveMsg: null, rejectMsg: "添加失败"})
+        await  http.load('POST','rs/logic/stopapply', {data:this.models},{resolveMsg: null, rejectMsg: "终止失败"})
+        this.closeback()
+        this.$dispatch('close')
+      },
+      // 关闭终止备注弹框
+      closeback() {
+        this.stop_show = false
+      },
       closeAccept () {
         this.acceptprint = false
       },
@@ -992,6 +1063,48 @@
                   }
               }
           }
+        if(this.$refs.service_show.data.fields[index].label=="施工提交资料"){
+          for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+
+            if(this.$refs.service_show.data.fields[i].label=="施工已上传文件"){
+              //增加和删除框中的内容
+              if(this.$refs.service_show.data.fields[index].items[index2].value == false){
+                this.$refs.service_show.data.fields[i].value+=this.$refs.service_show.data.fields[index].items[index2].label+" ";
+                this.$refs.service_show.data.fields[index].items[index2].value=true;
+              }else{
+                let deleteValue = this.$refs.service_show.data.fields[index].items[index2].label;
+                let values =this.$refs.service_show.data.fields[i].value;
+                let result = values.split(" ").filter((item)=>{
+                  return item!=deleteValue;
+                }).join(" ")
+                this.$refs.service_show.data.fields[i].value =result;
+                this.$refs.service_show.data.fields[index].items[index2].value=false;
+              }
+              //}
+            }
+          }
+        }
+        if(this.$refs.service_show.data.fields[index].label=="验收提交资料"){
+          for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+
+            if(this.$refs.service_show.data.fields[i].label=="验收已上传文件"){
+              //增加和删除框中的内容
+              if(this.$refs.service_show.data.fields[index].items[index2].value == false){
+                this.$refs.service_show.data.fields[i].value+=this.$refs.service_show.data.fields[index].items[index2].label+" ";
+                this.$refs.service_show.data.fields[index].items[index2].value=true;
+              }else{
+                let deleteValue = this.$refs.service_show.data.fields[index].items[index2].label;
+                let values =this.$refs.service_show.data.fields[i].value;
+                let result = values.split(" ").filter((item)=>{
+                  return item!=deleteValue;
+                }).join(" ")
+                this.$refs.service_show.data.fields[i].value =result;
+                this.$refs.service_show.data.fields[index].items[index2].value=false;
+              }
+              //}
+            }
+          }
+        }
       },
       'get-number'(val) {
         this.number = val
@@ -1627,6 +1740,23 @@
       // 获取view层button事件/
       async 'button'(model) {
         // console.log("button事件接收参数：", model)
+        if (this.data.defname==='踏勘、建立工程编号'){
+          if (model.button.button_name === '终止'){
+            this.stop_show=true
+            return
+          }
+        }
+        if (this.data.defname==='通气转单'){
+          if (model.button.button_name === '散户报装'){
+            this.addactive('报装申请')
+            return
+          }
+        }
+        if (this.data.defname==='通气转单'){
+          if (model.button.button_name === '集体报装'){
+            this.addactive('集体报装申请')
+            return
+          }
         // 点击重置按钮就重置数据
         if (model.button.button_name === '重置') {
           this.refurbish()
@@ -1691,7 +1821,7 @@
           var flag = false
           if (this.data.defname == '合同审核') {
             flag = true
-            http = new HttpResetClass()
+            let  http = new HttpResetClass()
             let data = {
               tablename: 't_singlevalue',
               condition: `name = '合同编号' and f_filialeids = '${this.$login.f.f_orgids}'`
@@ -1772,8 +1902,7 @@
             this.$showMessage(res.data.msg)
           }
         }
-
-
+        }
 /*
       if(this.selectdata.defname =='报装申请'|| this.selectdata.defname =='现场勘查'|| this.selectdata.defname =='验收'||this.selectdata.defname =='集体报装申请'||this.selectdata.defname =='现场勘查人员分配'||this.selectdata.defname =='安装通气' ){
            console.log("defname======================================",this.selectdata.defname)
@@ -1923,4 +2052,5 @@
       }
     }
   }
+
 </script>

package/src/components/product/ServiceView.vue

@@ -507,7 +507,6 @@
       },
       // 初始化数据
       initializtion() {
-        debugger
         if(this.data.f_apply_type='集体报建' && this.data.f_user_type=='非民用' && this.data.defname=='验收'){
           for(let j=0;j< this.data.fields.length;j++) {
             this.data.fields[j].required = false