apply-clients 5.0.35-4 → 5.0.35-42

package/src/components/product/Process/ExplorationSelect.vue

@@ -94,7 +94,7 @@
                 <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:'集体报建'}]"
-                            condition="f_apply_type = '{}'" placeholder='报建类型'
+                            condition="f_apply_type = '{}'" placeholder='报建类型' :search="true"
                             v-model="model.f_apply_type" :value.sync="model.f_apply_type" close-on-select>
                   </v-select>
                 </div>
@@ -112,7 +112,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>
@@ -319,6 +319,7 @@
       console.log("开始判断")
     },
     async ready() {
+      this.eachFind();
       this.$refs.cp.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
       this.$refs.cp.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
       await this.getConfig()
@@ -329,7 +330,6 @@
       let self = this
       //判断用户是否有权限
       this.checkUserOperator();
-
     },
     methods: {
       //清空 查询条件项
@@ -541,6 +541,7 @@
       },
 
       eachFind() {
+        debugger
         let arr = this.$refs.cp.$refs.grid.model.rows
         let overNumString1=''
         let flagNum1=1
@@ -569,12 +570,16 @@
             }
           }
         }
+        debugger
         if(hourfals!=0){
+          debugger
           this.speckText('请注意：第：'+overNumString1+'数据一小时后过期')
+          this.$showMessage("请注意：第:" + overNumString1 + "数据一小时后过期")
         }
         if (flagNum1!=1){
           console.log(overNumString1);
           this.speckText('请注意：第：'+overNumString1+'数据即将过期')
+          this.$showMessage("请注意：第:" + overNumString1 + "数据即将过期")
         }
         if(dbflag !=1){
           this.speckText('请注意: 您有'+dbflag-1+'条数据被督办')

package/src/components/product/Process/Processes/CustomerRecordMessage.vue

@@ -598,21 +598,18 @@
         if (!this.selectdata)
           return
         let data = {
-          tablename: 't_userinfo',
+          tablename: 't_userinfo u   left join t_user_address ua on u.f_userinfo_id=ua.f_userinfo_id',
           condition: 'f_process_id=' + '\'' + this.selectdata.f_process_id + '\''
         }
         let self = this
         let http = new HttpResetClass()
-        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+        let res = await http.load('POST', 'rs/sql/singleTableUserInfo', {data: data}, {
           resolveMsg: null,
           rejectMsg: '获取户档案信息失败'
         })
         self.model.rows = []
-
           self.model.rows = res.data
           self.params = res.data
-
-
       },
       impexcel() {
         this.importtype='1'

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

@@ -103,6 +103,25 @@
                 </div>
                 </div>
 
+              <div class="form-group col-sm-2">
+                <label class="col-sm-4 control-label linehhh">报装类型</label>
+                <div class="col-sm-8">
+                  <v-select :value.sync="model.f_work_type" v-model="model.f_work_type"
+                            :options='$parent.$parent.worktype'  width="100%"
+                            close-on-select condition="a.f_work_type = '{}'">
+                  </v-select>
+                </div>
+              </div>
+
+              <div class="form-group col-sm-2">
+                <label class="col-sm-4 control-label linehhh">用户类型</label>
+                <div class="col-sm-8">
+                  <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
+                            :options='$parent.$parent.usertype'  width="100%"
+                            close-on-select condition="a.f_user_type = '{}'">
+                  </v-select>
+                </div>
+              </div>
 
               <div class="form-group">
                 <button class="btn btn-primary" @click="search(),$parent.$parent.showpager()">
@@ -130,7 +149,7 @@
                 <th><nobr>总应缴金额</nobr></th>
                 <th><nobr>已交金额</nobr></th>
                 <th><nobr>未交金额</nobr></th>
-<!--                <th><nobr>发票冲正</nobr></th>-->
+                <th><nobr>操作</nobr></th>
               </tr>
             </template>
             <template partial='body'>
@@ -151,7 +170,9 @@
               <td style="text-align: center;">{{row.f_total_cost}}</td>
               <td style="text-align: center;">{{row.app_f_cumulative_money}}</td>
               <td style="text-align: center;">{{row.f_unaccounts_money}}</td>
-<!--              <td style="text-align: center;">{{row.f_is_correct}}</td>-->
+              <td style="text-align: center;">
+                <button class="btn-primary btn btn-sm" @click.prevent="$parent.$parent.$parent.update_way(row)">修改</button>
+              </td>
             </template>
           </data-grid>
         </criteria-paged>
@@ -159,19 +180,44 @@
       <div  class="flex" style="height: 10%">
         <div novalidate class="form-inline auto" partial>
           <p class="bg-info text-center" style="padding: 8px;font-size: 20px">合计收费记录共
-            <span style="color: red">{{modeluse.rows.length}}</span>笔，合计金额<span style="color: red">{{price.rows[0].f_charge_money}}</span>元
+            <span style="color: red">{{modeluse.rows.length}}</span>笔，合计收费金额<span style="color: red">{{price.rows[0].f_charge_money}}</span>元，
+            合计应缴总金额<span style="color: red">{{price.rows[0].f_total_cost}}</span>元，
+            已缴<span style="color: red">{{price.rows[0].f_cumulative_money}}</span>元，未缴<span  style="color: red">{{price.rows[0].f_unaccounts_money}}</span>元
           </p>
         </div>
       </div>
     </div>
+    <!--修改弹出框-->
+    <modal :show.sync="updateControl" v-ref:modal backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeUpdate()"><span>&times;</span></button>
+        <h4 class="modal-title">修改</h4>
+      </header>
+      <article slot="modal-body" class="modal-body" >
+        <div class="from-group"  style="width: 100%">
+          <label  style="width: 15%;float: left">票据类型</label>
+          <v-select :value.sync="selectItem.f_bill_style" v-model="selectItem.f_bill_style"
+                    :options='billstyle' placeholder='请选择' style="width: 80%;float: left"
+                    close-on-select >
+          </v-select>
+        </div>
+      </article>
+
 
+      <footer slot="modal-footer" class="modal-footer">
+        <div class="from-group" style="width: 100%;float: left">
+          <button v-show="updateControl" type="button" class="btn btn-default" @click='closeUpdate'>取消</button>
+          <button v-show="updateControl" type="button" class="btn btn-success" @click='confirm'>确认</button>
+        </div>
+      </footer>
+    </modal>
   </div>
 </template>
 <script>
   import * as Util from '../../../../Util'
 
   import { PagedList } from 'vue-client'
-
+  import {HttpResetClass} from 'vue-client'
   Date.prototype.Format = function (fmt) {
     var o = {
       "M+": this.getMonth() + 1, //月份
@@ -196,57 +242,99 @@
         filialeNameStr: null,
         filialeCodeStr: this.$login.f.f_orgids,
         userid: this.$login.f.id,
-        source:`tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
        // f_operate_start_date:new Date().Format('yyyy-MM-dd HH:mm:ss'),
        // f_operate_end_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
-        model: new PagedList('rs/sql/getApplyCharge', 30, { orderitem: '`id`'}),
-        modeluse: new PagedList('rs/sql/getApplyCharge', 999999, { orderitem: '`id`'}),
-        price: new PagedList('rs/sql/getChargeAll', 999999, { orderitem: '`f_charge_money`'}),
-        human:[],
-        filiale:[],
-        method:[],
-        correct:[
+        model: new PagedList('rs/sql/getApplyCharge', 30, {orderitem: '`id`'}),
+        modeluse: new PagedList('rs/sql/getApplyCharge', 999999, {orderitem: '`id`'}),
+        price: new PagedList('rs/sql/getChargeAll', 999999, {orderitem: '`f_charge_money`'}),
+        human: [],
+        filiale: [],
+        method: this.$appdata.getParam('付款方式'),
+        usertype:[
+          {label: '民用', value: '民用'},
+          {label: '非民用', value: '非民用'}
+        ],
+        worktype:[
+          {label: '新报装', value: '新报装'},
+          {label: '改管', value: '改管'}
+        ],
+        correct: [
           {label: '是', value: '是'},
-          {label:'否', value: '否'}
+          {label: '否', value: '否'}
         ],
-        state:[
+        state: [
           {label: '有效', value: '有效'},
-          {label:'无效', value: '无效'}
-        ]
+          {label: '无效', value: '无效'}
+        ],
+        selectItem: {},
+        billstyle: this.$appdata.getParam('发票类型'),
+        updateControl: false,
+        billID: 0
       }
     },
     ready () {
-      this.$refs.cp.$refs.cri.model.f_operate_start_date = Util.toStandardDateString() + ' 00:00:00'
-      this.$refs.cp.$refs.cri.model.f_operate_end_date = Util.toStandardDateString() + ' 23:59:59'
+      this.$refs.paged.$refs.criteria.model.f_operate_start_date = Util.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.f_operate_end_date = Util.toStandardDateString() + ' 23:59:59'
       this.search()
       this.gethuman()
     },
     methods: {
-      clear(){
-        this.$refs.cp.$refs.cri.model = {}
+      clear () {
+        this.$refs.paged.$refs.criteria.model = {}
       },
-      getRes(obj) {
+      getRes (obj) {
         this.filialeNameStr = obj.res
         this.filialeCodeStr = obj.resids
         console.log(this.filialeNameStr)
         console.log(this.filialeCodeStr)
       },
-      showpager() {
+      showpager () {
         // this.$refs.cp.pager = true
         this.$dispatch('hiddenbtn')
       },
-      search () {
-        let condition = "1=1 and r.f_filiale like '%"+this.$login.f.f_fengongsi+"%'"
+       search () {
+         let condition = "1=1 and r.f_filiale like '%" + this.$login.f.f_fengongsi + "%'"
+        //  debugger
+        // let condition =  args.condition
+      debugger
         this.model.search(condition)
         this.modeluse.search(condition)
-        this.price.search(condition)
+        let condition1 = condition
+        this.price.search(condition1)
       },
-
-      selfSearch(args) {
-        args.condition = args.condition + ` and tbd.f_orgstr like '%${this.filialeCodeStr}%'`
+      update_way (row) {
+        console.log('进入修改方法')
+        this.selectItem = {}
+        this.billID = row.id
+        this.updateControl = true
+      },
+      closeUpdate () {
+        this.updateControl = false
+      },
+      confirm () {
+        let data = {
+          f_bill_style: this.selectItem.f_bill_style[0],
+          id: this.billID
+        }
+        console.log('数据：' + JSON.stringify(this.selectItem))
+        this.$resetpost('rs/entity/t_charge_record', data).then((res) => {
+          console.log('返回值：' + JSON.stringify(res.data))
+          if (res.data.id > 0) {
+            // this.$showMessage('修改成功!')
+            this.closeUpdate()
+            this.search()
+          }
+        })
+      },
+      selfSearch (args) {
+        args.condition = args.condition + ` and a.f_filialeids like '%${this.filialeCodeStr}%'`
+        console.log('condition:', args.condition)
         this.model.search(args.condition, args.model)
+        this.modeluse.search(args.condition, args.model)
+        this.price.search(args.condition, args.model)
       },
-      cleaner() {
+      cleaner () {
         Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
           this.$refs.paged.$refs.criteria.model[key] = ''
         })
@@ -256,19 +344,19 @@
         this.modeluse.search(this.$refs.paged.$refs.criteria.condition)
         this.price.search(this.$refs.paged.$refs.criteria.condition)
       },
-      gethuman(){
+      gethuman () {
         console.log('获取人员')
         this.$resetpost('rs/logic/getChargeList', {data: {condition: `1=1`}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           // this.params.rows.splice(index, 1)
-          console.log('获取成功',res)
+          console.log('获取成功', res)
           let house = []
-          for (let row of res.data.human){
-            house.push({label: row.f_charge_collectors,value: row.f_charge_collectors})
+          for (let row of res.data.human) {
+            house.push({label: row.f_charge_collectors, value: row.f_charge_collectors})
           }
           this.human = house
           let house2 = []
           for (let row of res.data.f){
-            house2.push({label: row.f_filiale,value: row.f_filiale})
+            house2.push({label: row.r.f_filiale,value: row.r.f_filiale})
           }
           this.filiale = house2
           let house3 = []
@@ -277,9 +365,7 @@
           }
           this.method = house3
         })
-
-      },
-
+      }
     },
     computed: {
 

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

@@ -0,0 +1,85 @@
+<template>
+  <div class="auto form-horizontal" >
+    <modal :show.sync="show"  v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title">发票号</h3>
+      </header>
+      <article slot="modal-body" class="modal-body">
+
+        <validator name='v'>
+          <form class="form-horizontal  select-overspread">
+            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' >
+              <div  class="form-group col-sm-6">
+                <label class=" col-sm-2 control-label">发票代码:</label>
+                <input  type="text" class="form-control" v-model="model.f_bill_code" style="width:60%"
+                        placeholder="发票代码" disabled
+                >
+              </div>
+              <div  class="form-group col-sm-6">
+                <label class=" col-sm-2 control-label">发票号码:</label>
+                <input  type="text" class="form-control" v-model="model.f_bill_number" style="width:60%"
+                        placeholder="发票号码" disabled
+                >
+              </div>
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default"  @click='cancel()' >取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  import { DataModel } from 'vue-client'
+  let getBillData = async function(self) {
+    if(self.data.eticketid){
+      let res=await self.$resetpost("rs/sql/applysingleTable",{data:{tablename:"t_eticket",condition:` id= ${self.data.eticketid}`}})
+      console.log("看看res",res)
+      self.model.f_bill_code=res.data[0].f_bill_code
+      self.model.f_bill_number=res.data[0].f_bill_number
+    }else{
+      let res=await self.$resetpost("rs/sql/applysingleTable",{data:{tablename:"t_eticket",condition:`  f_sell_id=${self.data.id}`}})
+      console.log("看看res",res)
+      self.model.f_bill_code=res.data[0].f_bill_code
+      self.model.f_bill_number=res.data[0].f_bill_number
+    }
+  }
+
+  export default {
+    title: '收费发票',
+    data () {
+      return {
+        model:{
+          f_bill_code:'',
+          f_bill_number:''
+        }
+      }
+    },
+    props: ['show', 'data'],
+    ready () {
+    },
+    methods: {
+      cancel  () {
+        this.$dispatch('toggle')
+      },
+    },
+    watch: {
+      'show' (val) {
+        if (val) {
+          getBillData(this, val).then(() => {
+            this.$emit('ready')
+          }).catch((error) => {
+            this.$emit('error', error)
+          })
+        }
+      }
+    },
+    events: {
+    }
+  }
+
+</script>
+<style >
+</style>

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

@@ -117,6 +117,8 @@
         contract: null, // 单值表合同编号记录
         technologist: [], // 技术人员 角色下的人
         price: 0,
+        xiangmu:'',
+        xia:'',
         cost: 0,
         number: 0,
         pgd: '',
@@ -449,7 +451,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}, {
@@ -1439,24 +1441,28 @@
           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)
               }
             }
@@ -1567,6 +1573,19 @@
 
         }
         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

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">
@@ -797,4 +798,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,7 @@
             }
           ]
         }
-        // 完成时间和完成人,部门，分公司
-        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 +429,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>