apply-clients 5.0.35-ezhou-3 → 5.0.35-ezhou-4

package/src/components/product/Function/functions/InstallFee.vue

@@ -64,6 +64,9 @@
                     <th>
                       <nobr>地址</nobr>
                     </th>
+                    <th>
+                      <nobr>缴费状态</nobr>
+                    </th>
                     <th>
                       <nobr>操作</nobr>
                     </th>
@@ -74,8 +77,9 @@
                   <td style="text-align: center">{{row.f_user_name}}</td>
                   <td style="text-align: center">{{row.f_user_phone}}</td>
                   <td style="text-align: center">{{row.address}}</td>
+                  <td style="text-align: center">{{row.f_charging_status=='有效'?'已缴':'未缴'}}</td>
                   <button type="button" name="button" class="btn btn-link"
-                          @click.stop="$parent.$parent.$parent.getUserinfo($index)">收费
+                          @click.stop="$parent.$parent.$parent.getUserinfo($index)">{{row.f_charging_status=='有效'?'已收':'收费'}}
                   </button>
                 </template>
               </data-grid>
@@ -180,9 +184,9 @@
                 <div class="form-input-group col-sm-12">
                   <div class="form-input-group col-sm-3">
                     <label for="f_charge_item" class="control-label col-sm-2">
-                      <button class="glyphicon glyphicon-minus btn-danger" v-if="$index>0"
+                      <button class="glyphicon glyphicon-minus btn-danger"  type="button" v-if="$index>0"
                               @click.stop="delItems($index)"></button>&nbsp;&nbsp;&nbsp;
-                      <button class="glyphicon glyphicon-plus btn-success" @click.stop="addItems()"></button>
+                      <button class="glyphicon glyphicon-plus btn-success" type="button" @click.stop="addItems()"></button>
                     </label>
                     <div class="col-sm-2">
                       <v-select id="f_charge_item" +$index
@@ -230,10 +234,15 @@
                                    @validate-bill="validateBill"></apply-validate-bill>
               <printbill :show="print" :data='model' :selfclean="selfclean" :bill-config='config' :bill-data='billData'
                          v-on:toggle="close" :selfsearch="load" @printok="printok" v-ref:printbill></printbill>
+              <printbill :show="printat" :data='model' :selfclean="selfclean" :bill-config='config' :bill-data='billDataantai'
+                         v-on:toggle="close" :selfsearch="load" @printok="printok" v-ref:printbill></printbill>
               <bjpaper-ticket-bill :show="paperticket" :data='ids' @toggle="closeticket"></bjpaper-ticket-bill>
               <printbill :show="delprint" :data='model' :selfclean="selfclean" :bill-config='config2'
                          :bill-data='billData' v-on:toggle="close" :selfsearch="load" @printok="printok"
                          v-ref:printbill></printbill>
+              <printbill :show="delprintat" :data='model' :selfclean="selfclean" :bill-config='config2'
+                         :bill-data='billDataantai' v-on:toggle="close" :selfsearch="load" @printok="printok"
+                         v-ref:printbill></printbill>
               <div class="row" style="text-align:right;">
                 <button :readonly="!validateOk" type="button" class="btn btn-success" style="" @click='confirm'>确认
                 </button>
@@ -252,11 +261,11 @@
 
       <validator name='v'>
         <form class="form-horizontal  select-overspread">
-          <div class="row" style="display: flex;justify-content: center;" id='normal-bill'>
+          <div class="row" style="display: flex;justify-content: center;" id='normal-bill2'>
             <div class="form-group col-sm-6">
               <label class=" col-sm-2 control-label">购买方名称:</label>
               <input type="text" class="form-control" v-model="paperinfo.f_buy_name" style="width:60%"
-                    :value.sync="paperinfo.f_buy_name" placeholder="购买方名称"
+                    :value.sync="model.f_user_name" placeholder="购买方名称"
               >
             </div>
             <div class="form-group col-sm-6">
@@ -270,7 +279,7 @@
             <div class="form-group col-sm-6">
               <label class=" col-sm-2 control-label">购买方地址电话:</label>
               <input type="text" class="form-control" v-model="paperinfo.f_buy_address" style="width:60%"
-                     placeholder="购买方地址" :value.sync="paperinfo.f_buy_address"
+                     placeholder="购买方地址" :value.sync="model.adressphone"
               >
             </div>
             <div class="form-group col-sm-6">
@@ -342,6 +351,7 @@
           rows: [] // 购货方信息
         },
         model: {
+          adressphone:'',
           f_isone: ['否'],
           chargeid: '',
           f_print: ['普通收据'],
@@ -389,12 +399,18 @@
         paymenttypes: this.$appdata.getParam('付款方式'),
         printstyle: this.$appdata.getParam('打印格式'),
         print: false,
+        printat: false,
         delprint: false,
+        delprintat:false,
         taxprint: false,
         billData: {
           url: 'rs/report/applyCharge_bill',
           bill: ''
         },
+        billDataantai: {
+          url: 'rs/report/applyChargeAT_bill',
+          bill: ''
+        },
         config: {
           hasPrint: true,  //默认打票
           hasBillManage: true,  //默认不启用发票管理
@@ -420,17 +436,19 @@
           f_charge_collectors: this.$login.f.name,
           f_charge_date: '',
           f_charge_remarks: '',
-          f_filiale: this.$login.f.f_fengongsi,
+          f_filiale: '',
           f_process_id: '',
           f_apply_num: '',
           f_payment_method: '',
           f_charging_status: '有效',
           f_is_correct: '否',
-          f_bill_style: ''
+          f_bill_style: '',
+          f_charge_user: '',
+          f_charge_address: ''
         },
         charges: [{f_project_item: '合同总额', f_amount: 0, f_price: 0, f_money: 0}],
         // 启用发票管理需要对票号进行验证
-        hasValidateBill: true,
+        hasValidateBill: false,
         validateOk: false,
         userinfoRow: {
           rows: []
@@ -524,6 +542,7 @@
           this.$dispatch('success')
         }
         this.$showMessage('是否冲正此条记录?', ['confirm', 'cancel']).then((res) => {
+          debugger
           if (res === 'confirm') {
             let param = {
               row: this.model.rows[index]
@@ -542,6 +561,7 @@
         console.log(index)
         console.log("a")
         this.model.f_user_name = this.userinfoRow.rows[index].f_user_name;
+        this.model.f_process_id = this.userinfoRow.rows[index].f_process_id;
         this.model.f_phone = this.userinfoRow.rows[index].f_user_phone;
         this.model.f_address = this.userinfoRow.rows[index].address;
         this.model.f_userinfo_id = this.userinfoRow.rows[index].f_userinfo_id;
@@ -584,12 +604,14 @@
           f_charge_collectors: this.$login.f.name,
           f_charge_date: '',
           f_charge_remarks: '',
-          f_filiale: this.$login.f.f_fengongsi,
+          f_filiale: '',
           f_process_id: '',
           f_apply_num: '',
           f_charging_status: '有效',
           f_is_correct: '否',
-          f_bill_style: ''
+          f_bill_style: '',
+          f_charge_user: '',
+          f_charge_address: ''
         }
 
         // this.$dispatch('refresh', this.model)
@@ -598,7 +620,9 @@
         console.log("关闭打印框")
         this.taxprint = false
         this.print = false
+        this.printat = false
         this.delprint = false
+        this.delprintat = false
         this.clean()
       },
       printok() {
@@ -608,6 +632,7 @@
       validateBill(val) {
         this.validateOk = !val.isOk
         this.billData.bill = val.bill
+        this.billDataantai.bill = val.bill
       },
 
       confirmbuyerinfo(args) {
@@ -731,7 +756,14 @@
           this.addItem.f_charge_collectors = this.$login.f.name
           this.addItem.f_charge_date = this.model.f_charge_date
           this.addItem.f_charge_remarks = this.model.f_charge_remarks
-          this.addItem.f_filiale = this.$login.f.f_fengongsi
+          if(this.model.f_payment_account==='安泰'){
+            this.addItem.f_filiale ='燃气公司.安泰天然气'
+          } else if(this.model.f_payment_account==='欣泰'){
+            this.addItem.f_filiale ='欣泰工程公司'
+          }else{
+            this.addItem.f_filiale='迪泰公司'
+          }
+          // this.addItem.f_filiale = this.model.f_payment_account =='安泰' ? '燃气公司.安泰天然气' : '欣泰工程公司'
           this.addItem.f_process_id = this.infee.f_process_id
           this.addItem.f_apply_num = this.infee.f_apply_num
           this.model.rows.push(this.addItem)
@@ -794,12 +826,25 @@
 
                 this.model.f_bill_type = this.model.f_print[0]
                 this.model.f_bill_style = this.model.f_print[0]
-                this.print = true
+                debugger
+                console.log('打印this.model.f_print[0]',this.model.f_print[0])
+                debugger
+                if(this.model.f_payment_account==='欣泰'){
+                  this.print = true
+                }else{
+                  this.printat = true
+                }
+
 
                 console.log('f_bill_style' + this.model.f_bill_style)
 
               } else {
-                this.print = true
+                debugger
+                if(this.model.f_payment_account==='欣泰'){
+                  this.print = true
+                }else{
+                  this.printat = true
+                }
               }
             } else if (this.model.f_print[0] === '纸质普票') {
               this.param.f_print = this.model.f_print[0],
@@ -869,12 +914,25 @@
               this.model.chargeid = res.data.charge_id;
               if (val.f_bill_style === '增值税电子发票') {
                 this.$showAlert('申请增值税电子发票冲正成功,请稍后到报建功能中【报建收费】中查看电子发票', 'success', 5000)
-                this.delprint = true;
+                if(this.model.f_payment_account==='欣泰'){
+                  this.delprint = true;
+                }else{
+                  this.delprintat = true
+                }
+
               } else {
                 this.$showAlert('冲正成功', 'success', 2000)
+                if(this.model.f_payment_account==='欣泰'){
+                  this.delprint = true;
+                }else{
+                  this.delprintat = true
+                }
+              }
+              if(this.model.f_payment_account==='欣泰'){
                 this.delprint = true;
+              }else{
+                this.delprintat = true
               }
-              this.delprint = true;
               this.load()
             } else {
               this.$showAlert('冲正失败', 'warning', 5000)
@@ -981,7 +1039,7 @@
         this.model.rows = res.data
         this.model.f_cumulative_money = 0;
         for (let i = 0; i < res.data.length; i++) {
-          this.model.f_cumulative_money = this.model.f_cumulative_money + parseInt(res.data[i].f_charge_money);
+          this.model.f_cumulative_money =parseFloat(parseFloat(this.model.f_cumulative_money) + parseFloat(res.data[i].f_charge_money)).toFixed(2) ;
         }
 
 
@@ -1007,7 +1065,10 @@
         this.oldInfo.f_phone = this.model.f_phone;
         this.oldInfo.f_address = this.model.f_address;
         this.model.f_isone = ['否'];
+        this.model.adressphone = this.model.f_address + '   ' + this.model.f_phone;
         this.charges = [{f_project_item: '合同总额', f_amount: 0, f_price: 0, f_money: 0}];
+        this.hasValidateBill=true
+        console.log('load被重新调用222')
       }
     },
     computed: {

package/src/components/product/Function/functions/InstallFeeInfo.vue

@@ -26,6 +26,10 @@
             <label class = "col-sm-5 control-label">用户类型:</label>
             <span class = "col-sm-7">{{model.f_user_type}}</span>
           </div>
+          <div class="row">
+            <label class = "col-sm-5 control-label">支付账户:</label>
+            <span class = "col-sm-7">{{model.f_payment_account}}</span>
+          </div>
           <div class="row">
             <label class = "col-sm-5 control-label">申请户数:</label>
             <span class = "col-sm-7">{{model.f_user_type}}</span>
@@ -96,7 +100,8 @@
           f_user_type: '无',
           f_house_type: '无',
           f_residential_area: '无',
-          f_apply_remarks: '无'
+          f_apply_remarks: '无',
+          f_payment_account: '无'
         }
       }
     },

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

@@ -113,10 +113,19 @@
                 </div>
               </div>
 
+              <!-- <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="$parent.$parent.alloption"
+                            condition="f_apply_source = '{}'" placeholder='报装来源'
+                            v-model="model.f_apply_source" :value.sync="model.f_apply_source" close-on-select>
+                  </v-select>
+                </div>
+              </div> -->
               <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:'微信'},{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>
@@ -124,7 +133,6 @@
               </div>
 
 
-
             </div>
             <div class="col-sm-12 " style="margin-top:5px">
               <div class="col-sm-2">
@@ -160,6 +168,9 @@
               <th>
                 <nobr>当前状态</nobr>
               </th>
+              <th>
+                <nobr>工程编号</nobr>
+              </th>
               <th>
                 <nobr>报建编号</nobr>
               </th>
@@ -212,6 +223,9 @@
               <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]"   style="text-align: center;">
                 <nobr><font>{{row.f_sub_state!='完工' ? '未完工' :'完工'}}</font></nobr>
               </td>
+              <td :class="[ row.isover ==='过期' ? 'p1' :  row.isbeforeover === '预期提醒'? 'p':''  ]"   style="text-align: center;">
+                <nobr><font>{{row.f_project_number}}</font></nobr>
+              </td>
               <td :class="[ row.isover ==='过期' ? 'p1' :  row.isbeforeover === '预期提醒'? 'p':''  ]"   style="text-align: center;">
                 <nobr><font>{{row.f_apply_num}}</font></nobr>
               </td>
@@ -316,7 +330,8 @@
         model: new PagedList('rs/sql/checkuser', 20, {
           data: {
             id: this.$login.f.id,
-            fengongsi: this.$login.f.f_fengongsi
+            fengongsi: this.$login.f.f_fengongsi,
+            f_product_id: 0
           }
         }),
         fapplytype: this.$appdata.getParam('用户类型'),
@@ -328,6 +343,7 @@
         select: '',
         alloptions:[],
         showFile:false,
+        alloption:[],
         button_name:"查询",
         showstopinfoflag:false,
         stopremarks:"",
@@ -342,6 +358,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()
@@ -352,7 +369,6 @@
       let self = this
       //判断用户是否有权限
       this.checkUserOperator();
-
     },
     methods: {
       //清空 查询条件项
@@ -388,11 +404,9 @@
         param.push({label:"全部",value:""})
         str.activitys.forEach(function(item){
           let title = item.title;
-          console.log(title)
           param.push({label:title,value:title});
         })
         this.alloptions = param;
-
       },
       generateUUID() {
         var d = new Date().getTime()
@@ -426,18 +440,35 @@
 
       },
       async addactive(modify) {
+        // 动态获取报装来源
+        // let ces = [];
+        // http.load('POST', 'rs/sql/findParameter').then((res) => {
+        //       console.log("这是报装来源:" + res.name)
+        // res.forEach(function(res){
+        //   ces.push({label:res.name,value:res.name});
+        //     })
+        //     this.alloption = ces;
+        // })
         this.button_name ="返回"
+        var workflow_xmlfilename='鄂州报建流程'
+        if(this.$login.f.filialenames === '迪泰天然气' && modify==='集体报装申请'){
+         workflow_xmlfilename = '鄂州报建流程迪泰'
+        }else{
+          workflow_xmlfilename = '鄂州报建流程'
+        }
         //await this.getConfig()
         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 res = await http.load('POST','rs/logic/ApplyGetProcessID',{data:{filename:workflow_xmlfilename,start_activity:this.$workflow_vue.start_activity}}, {resolveMsg: null, rejectMsg: '获取流程ID失败，请联系开发人员'})
         this.$refs.cp.pager = false
+        debugger
         let val = {
           defname: this.$workflow_vue.start_activity,
           f_process_id: res.data.f_process_id,
           f_apply_date: Util.toStandardTimeString(),
           f_apply_num: this.generateUUID(),
-          f_apply_operator_telephone: this.$login.f.f_fgsdianhua
+          f_apply_operator_telephone: this.$login.f.f_fgsdianhua,
+          f_product_id: res.data.f_product_id
         }
         // // 如果是改装,将modify装入val
         // if(modify){
@@ -594,10 +625,12 @@
         }
         if(hourfals!=0){
           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+'条数据被督办')