apply-clients 5.0.35-6 → 5.0.35-60

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>
@@ -117,6 +130,8 @@
         contract: null, // 单值表合同编号记录
         technologist: [], // 技术人员 角色下的人
         price: 0,
+        xiangmu:'',
+        xia:'',
         cost: 0,
         number: 0,
         pgd: '',
@@ -132,13 +147,72 @@
           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,
+          f_idnumber:this.selectdata.f_social_credit_code,
+          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
       },
@@ -449,7 +523,7 @@
             } else {
               data = {
                 tablename: this.data.onetomany[index].tables[0],
-                condition: `f_apply_num = '${this.selectdata.f_apply_num}'  and f_process_id='${this.selectdata.f_process_id}'`
+                condition: `f_process_id='${this.selectdata.f_process_id}'`
               }
             }
             let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
@@ -914,6 +988,40 @@
            }
          }
         }
+        if (this.show_data.defname === '施工') {
+          let http = new HttpResetClass()
+          let data = {
+            f_process_id: this.show_data.f_process_id,
+            defname: this.show_data.defname
+          }
+          let res = await http.load('POST', 'rs/sql/getFileNames', {data:data},
+            {resolveMsg: null, rejectMsg: null})
+
+          // for (let i = 0; i < res.length; i++){
+          //   this.data.f_project_material += res.data.fusetype + ','
+          // }
+          res.data.forEach(item =>{
+            this.show_data.f_project_material += item.fusetype + ','
+          })
+        }
+        // if (this.show_data.defname === '施工验收') {
+        //   let http = new HttpResetClass()
+        //   let data = {
+        //     f_process_id: this.show_data.f_process_id,
+        //     defname: this.show_data.defname
+        //   }
+        //   let res = await http.load('POST', 'rs/sql/getFileNames', {data:data},
+        //     {resolveMsg: null, rejectMsg: null})
+        //   this.show_data.f_iscomplete_information = ''
+        //   res.data.forEach(item =>{
+        //     this.show_data.f_iscomplete_information += item.fusetype + ','
+        //   })
+        //   for (j = 0; j < this.show_data.fields.length; j++) {
+        //     if (this.show_data.fields[j].label === '验收已上传文件') {
+        //       this.show_data.fields[j].value = this.show_data.f_iscomplete_information
+        //     }
+        //   }
+        // }
         // 显示组件
         // this.showview = false
         // debugger
@@ -956,6 +1064,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
@@ -970,8 +1120,11 @@
       ,
       // 任意select选中时触发事件，关联性操作
       async 'select_cascade'(index) {
-
-
+        for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+          if (this.$refs.service_show.data.fields[i].label === '工程盈利') {
+            this.$refs.service_show.data.fields[i].value = c
+          }
+        }
 
 
         if (this.$refs.service_show.data.fields[index].label == '施工单位' ||
@@ -1412,21 +1565,33 @@
             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) {
+              address += '栋'
+            }
             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) {
+              address += '单元'
+            }
             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) {
+              address += '层'
+            }
             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) {
+              address += '室'
+            }
 
           }
           console.log('获取到的address=>' + address)
           // 数据获取完毕时放入地址text
           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[i].label === '地址' || this.$refs.service_show.data.fields[i].label === '报装地址') {
               this.$refs.service_show.data.fields[i].value = address
               console.log('修改fields[i].value后的值=>' + this.$refs.service_show.data.fields[i].value)
             }
@@ -1439,31 +1604,34 @@
           this.$refs.service_show.data.fields[index].label === '人工费'
         ) {
           console.log('即将合成价格')
+          let a1 = 0
+          let b1 = 0
+          let c1 = 0
           let fee = 0
           for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
             // 控制设置级联
             // 源select所选的值 this.$refs.service_show.data.activitys.fields[index].value
             // xxx xx xxx
             if (this.$refs.service_show.data.fields[i].label === '工程安装费' && this.$refs.service_show.data.fields[i].value) {
-              fee += parseInt(this.$refs.service_show.data.fields[i].value)
+              a1 = 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) {
-              fee += parseInt(this.$refs.service_show.data.fields[i].value)
+               b1= 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) {
-              fee += parseInt(this.$refs.service_show.data.fields[i].value)
+              c1 = this.$refs.service_show.data.fields[i].value
             }
+            fee=parseFloat(parseFloat(a1) + parseFloat(b1)+parseFloat(c1)).toFixed(2)
             // 数据获取完毕时放入地址text
             for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
               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 = fee
+                this.$refs.service_show.data.fields[i].value =fee
                 console.log('修改fields[i].value后的值=>' + this.$refs.service_show.data.fields[i].value)
               }
             }
           }
         }
         if (this.$refs.service_show.data.fields[index].label == '用户类型'){
-          debugger
           if(this.$refs.service_show.data.fields[index].value == '非民用'){
             for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
               if (this.$refs.service_show.data.fields[i].label === '小区名称') {
@@ -1478,6 +1646,60 @@
             }
           }
         }
+
+        if (this.$refs.service_show.data.fields[index].label === '施工是否完成') {
+          let temp = this.$refs.service_show.data.fields[index].value
+          console.log('==============================施工是否完成：' + temp)
+          if (temp === '是') {
+            let f_project_material = ''
+            if (this.$refs.service_show.data.defname === '施工') {
+              let http = new HttpResetClass()
+              let data = {
+                f_process_id: this.$refs.service_show.data.f_process_id,
+                defname: this.$refs.service_show.data.defname
+              }
+              let res = await http.load('POST', 'rs/sql/getFileNames', {data:data},
+                {resolveMsg: null, rejectMsg: null})
+              res.data.forEach(item =>{
+                f_project_material += item.fusetype + ','
+              })
+            }
+
+            for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+              if (this.$refs.service_show.data.fields[i].label === '施工已上传文件') {
+                this.$refs.service_show.data.fields[i].value = f_project_material
+              }
+            }
+          }
+        }
+
+        if (this.$refs.service_show.data.fields[index].label === '验收是否完成') {
+          let temp = this.$refs.service_show.data.fields[index].value
+          console.log('==============================验收是否完成：' + temp)
+          if (temp === '是') {
+            let f_iscomplete_information = ''
+            if (this.$refs.service_show.data.defname === '施工验收') {
+              let http = new HttpResetClass()
+              let data = {
+                f_process_id: this.$refs.service_show.data.f_process_id,
+                defname: this.$refs.service_show.data.defname
+              }
+              let res = await http.load('POST', 'rs/sql/getFileNames', {data:data},
+                {resolveMsg: null, rejectMsg: null})
+              res.data.forEach(item =>{
+                f_iscomplete_information += item.fusetype + ','
+              })
+            }
+
+            for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+              if (this.$refs.service_show.data.fields[i].label === '验收已上传文件') {
+                this.$refs.service_show.data.fields[i].value = f_iscomplete_information
+              }
+            }
+          }
+        }
+
+
       },
       // onetomany模态框监听事件
       async 'select_cascade_modal'(i,j){
@@ -1518,7 +1740,26 @@
       ,
       // 获取view层button事件/
       async 'button'(model) {
-        // console.log("button事件接收参数：", model)
+        debugger
+        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('报装申请')
+          }
+          if (model.button.button_name === '集体报装'){
+            this.addactive('集体报装申请')
+          }
+          setTimeout(() => {
+
+          }, 200)
+        }
+
         // 点击重置按钮就重置数据
         if (model.button.button_name === '重置') {
           this.refurbish()
@@ -1567,10 +1808,23 @@
 
         }
         if (model.button.button_name === '提交') {
+          // for (let i = 0; i < this.show_data.fields.length; i++) {
+          //   if (this.show_data.fields[i].label === '收费项目') {
+          //     let yuanXiang = this.show_data.fields[i].value
+          //     if (yuanXiang != '' && yuanXiang != null) {
+          //       for (let i = 0; i < yuanXiang.length; i++) {
+          //         this.xia += yuanXiang[i] + '-'
+          //       }
+          //       let idx = this.xia.lastIndexOf("-");
+          //       this.xiangmu = this.xia.substring(0,idx)
+          //     }
+          //    model.f_charge_items = this.xiangmu
+          //   }
+          // }
           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}'`
@@ -1611,7 +1865,7 @@
           if(requestData.model.f_stair_price_name === ''|| requestData.model.f_stair_price_name === null|| requestData.model.f_stair_price_name === undefined){
             requestData.model.f_stair_price_name = this.selectdata.f_stair_price_name
           }
-          console.log(requestData.model.f_stair_price_name)
+          console.log("流程下一步",requestData.model.f_stair_price_name)
           // 下发，提交，保存，退回通用业务后台处理logic
           url = 'rs/logic/ApplyProductService'
           requestData = {
@@ -1651,8 +1905,6 @@
             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)
@@ -1696,9 +1948,6 @@
           await http1.load('POST', 'rs/logic/getPost', {data:data2})
         }
 */
-
-
-
        }
       ,
       async 'onetomanydelete'(i, j) {
@@ -1805,4 +2054,5 @@
       }
     }
   }
+
 </script>

package/src/components/product/ServiceView.vue

@@ -10,13 +10,13 @@
     <!--</div>-->
     <validator name="v">
       <form class="form-horizontal">
-        <div class="col-sm-12 form-group">
+        <div class="col-sm-12 form-group form-group1">
           <div v-for="(index,item) in data.fields">
             <!--input-->
-            <div :style="item.style? item.style+';height: 34px;':'height: 34px;'"
+            <div :style="item.style+';height: 34px;'"
                  v-if="item.type==='input' || item.type==='number'||item.type === 'tel'||item.type === 'email'"
                  v-show="!item.hidden"
-                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
+                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group form-group1']">
               <label :style="item.label_style? item.label_style:''+';width:85px;'"
                      :class="item.label_bootstraped?item.label_bootstraped+' control-label-justify control-label':item.label_style?'':'control-label-justify control-label col-sm-6'">{{item.label}}</label>
               <div :style="item.value_style? item.value_style:''"
@@ -36,7 +36,7 @@
             <!--时间datepicker-->
             <div :style="item.style? item.style+';height: 34px;':'height: 34px;'" v-if="item.type==='datepicker'"
                  v-show="!item.hidden"
-                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
+                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group form-group1']">
               <label style="width:85px"
                 :class="item.label_bootstraped?item.label_bootstraped+' control-label-justify control-label':'control-label control-label-justify col-sm-6'">{{item.label}}</label>
               <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
@@ -94,7 +94,7 @@
 
             <!--select-->
             <div style="height: 34px" v-if="item.type==='select'" v-show="!item.hidden"
-                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
+                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group ':'col-sm-4 form-group']">
               <label style="width:85px;"
                 :class="item.label_bootstraped?item.label_bootstraped+' control-label control-label-justify':'control-label-justify control-label col-sm-6'">{{item.label}}</label>
               <input-select :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'" @blur="check_disable"
@@ -106,6 +106,7 @@
 
             </div>
 
+
             <!--checkbox-->
             <div v-if="item.type==='checkbox'"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-12 form-group']">
@@ -122,7 +123,7 @@
           </div>
           <!-- onetomany -->
           <div class="col-sm-12" v-for="(i,datagrid) in data.onetomany">
-            <table v-show="!datagrid.hidden" class="table table-bordered table-striped table-hover">
+            <table v-show="!datagrid.hidden" class="table table-bordered table-striped table-hover" style="margin-top: 80px">
               <tr style="background-color: #00A3F0">
                 <th style="text-align: center;border-color: #00A3F0"><font color="white">序号</font></th>
                 <th v-for="labels in datagrid.fields" style="text-align: center;border-color: #00A3F0">
@@ -506,6 +507,12 @@
       },
       // 初始化数据
       initializtion() {
+        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
+          }
+        }
+
         let fields = this.data.fields
         let flag = false
         for (let i = 0; i < fields.length; i++) {
@@ -797,4 +804,7 @@
   tr {
     height: 34px;
   }
+  .form-group{
+    margin-top:20px;
+  }
 </style>

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -20,6 +20,7 @@
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
+  import Vue from "vue";
   export default {
     title: '报建监控控制层',
     props: ['selectdata'],
@@ -36,6 +37,45 @@
       },
       // json配置数据处理 比如下拉框的options
       async initializtion() {
+        // onetomany 数据获取
+        if (this.data.onetomany) {
+          console.log('判断是onetomany,this.data.onetomany的数据为=>' + JSON.stringify(this.data.onetomany))
+          for (let index = 0; index < this.data.onetomany.length; index++) {
+            let http = new HttpResetClass()
+            let data = {}
+            if (this.data.onetomany[index].tables[0] == 't_charge_record') {
+              data = {
+                tablename: this.data.onetomany[index].tables[0],
+                condition: `f_apply_num = '${this.selectdata.f_apply_num}'  and f_process_id='${this.selectdata.f_process_id}' and f_charging_status != '作废'`
+              }
+            } else {
+              data = {
+                tablename: this.data.onetomany[index].tables[0],
+                condition: `f_process_id='${this.selectdata.f_process_id}'`
+              }
+            }
+            let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+              resolveMsg: null,
+              rejectMsg: 'onetomany查询失败'
+            })
+            // 初始化 onetomany
+            let rows = []
+            console.log('查询返回结果res.data=>' + JSON.stringify(res.data))
+            this.data.onetomany[index].rows = res.data
+            // console.log(JSON.stringify('this.data.onetomany[index].rows=>' + JSON.stringify(this.data.onetomany[index].rows)))
+
+            // 初始化onetomany中的fields
+            for (let j = 0; j < this.data.onetomany[index].fields.length; j++) {
+              // 如果配置类型为select,优先从参数列表获取options
+              if (this.data.onetomany[index].fields[j].type === 'select') {
+                let temp = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
+                if (temp && temp.length > 0) {
+                  this.data.onetomany[index].fields[j].options = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
+                }
+              }
+            }
+          }
+        }
         // selectdata 填充 data
         if (this.selectdata.f_survey_name) {
           let buyerinfos = []
@@ -133,11 +173,6 @@
             }
           ]
         }
-        // 完成时间和完成人,部门，分公司
-        this.data.filiale = this.selectdata.f_filiale
-        this.data.f_parentname = this.selectdata.f_parentname
-        this.data.operate_date = this.selectdata.finishtime
-        this.data.operator = this.selectdata.sender
       }
     },
     events:{
@@ -393,7 +428,19 @@
         if (sum == 1) {
           this.data = jsonData
           this.initializtion()
-          this.showview = true
+          // 完成时间和完成人,部门，分公司
+          if(this.selectdata.defname =='完工'){ this.data.filiale = this.selectdata.f_filiale
+            this.data.f_parentname = this.selectdata.f_parentname
+            this.data.operate_date = this.selectdata.sendtime
+            this.data.operator = this.selectdata.sender
+            this.showview = true
+          }else{
+            this.data.f_parentname = this.selectdata.f_parentname
+            this.data.operate_date = this.selectdata.finishtime
+            this.data.operator = this.selectdata.person
+            this.showview = true
+          }
+
         } else if (sum == 0) {
           this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
         } else {

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -113,7 +113,7 @@
               <div class="col-sm-2" style="float: left">
                 <label class="col-sm-4 control-label">报装来源</label>
                 <div class="col-sm-8">
-                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="[{label:'全部',value:''},{label:'燃气系统',value:'燃气系统'},{label:'微信',value:'微信'}]"
+                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="[{label:'全部',value:''},{label:'燃气系统',value:'燃气系统'},{label:'微信',value:'微信'},{label:'住建局',value:'住建局'}]"
                             condition="f_apply_source = '{}'" placeholder='报装来源'
                             v-model="model.f_apply_source" :value.sync="model.f_apply_source" close-on-select>
                   </v-select>
@@ -246,7 +246,8 @@
         model: new PagedList('rs/sql/supervisory', 20, {
           data: {
             id: `${this.$login.f.name}`,
-            fengongsi: `${this.$login.f.f_fengongsi}`
+            fengongsi: `${this.$login.f.f_fengongsi}`,
+            f_product_id :0
           }
         }),
         condition: '',