apply-clients 5.0.35-99 → 5.0.35-ezhou-2

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

@@ -64,9 +64,6 @@
                     <th>
                       <nobr>地址</nobr>
                     </th>
-                    <th>
-                      <nobr>缴费状态</nobr>
-                    </th>
                     <th>
                       <nobr>操作</nobr>
                     </th>
@@ -77,9 +74,8 @@
                   <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)">{{row.f_charging_status=='有效'?'已收':'收费'}}
+                          @click.stop="$parent.$parent.$parent.getUserinfo($index)">收费
                   </button>
                 </template>
               </data-grid>
@@ -184,9 +180,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"  type="button" v-if="$index>0"
+                      <button class="glyphicon glyphicon-minus btn-danger" v-if="$index>0"
                               @click.stop="delItems($index)"></button>&nbsp;&nbsp;&nbsp;
-                      <button class="glyphicon glyphicon-plus btn-success" type="button" @click.stop="addItems()"></button>
+                      <button class="glyphicon glyphicon-plus btn-success" @click.stop="addItems()"></button>
                     </label>
                     <div class="col-sm-2">
                       <v-select id="f_charge_item" +$index
@@ -234,15 +230,10 @@
                                    @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>
@@ -261,11 +252,11 @@
 
       <validator name='v'>
         <form class="form-horizontal  select-overspread">
-          <div class="row" style="display: flex;justify-content: center;" id='normal-bill2'>
+          <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="paperinfo.f_buy_name" style="width:60%"
-                    :value.sync="model.f_user_name" placeholder="购买方名称"
+                    :value.sync="paperinfo.f_buy_name" placeholder="购买方名称"
               >
             </div>
             <div class="form-group col-sm-6">
@@ -279,7 +270,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="model.adressphone"
+                     placeholder="购买方地址" :value.sync="paperinfo.f_buy_address"
               >
             </div>
             <div class="form-group col-sm-6">
@@ -351,7 +342,6 @@
           rows: [] // 购货方信息
         },
         model: {
-          adressphone:'',
           f_isone: ['否'],
           chargeid: '',
           f_print: ['普通收据'],
@@ -399,18 +389,12 @@
         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,  //默认不启用发票管理
@@ -436,19 +420,17 @@
           f_charge_collectors: this.$login.f.name,
           f_charge_date: '',
           f_charge_remarks: '',
-          f_filiale: '',
+          f_filiale: this.$login.f.f_fengongsi,
           f_process_id: '',
           f_apply_num: '',
           f_payment_method: '',
           f_charging_status: '有效',
           f_is_correct: '否',
-          f_bill_style: '',
-          f_charge_user: '',
-          f_charge_address: ''
+          f_bill_style: ''
         },
         charges: [{f_project_item: '合同总额', f_amount: 0, f_price: 0, f_money: 0}],
         // 启用发票管理需要对票号进行验证
-        hasValidateBill: false,
+        hasValidateBill: true,
         validateOk: false,
         userinfoRow: {
           rows: []
@@ -538,7 +520,6 @@
           this.$dispatch('success')
         }
         this.$showMessage('是否冲正此条记录?', ['confirm', 'cancel']).then((res) => {
-          debugger
           if (res === 'confirm') {
             let param = {
               row: this.model.rows[index]
@@ -557,7 +538,6 @@
         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;
@@ -600,14 +580,12 @@
           f_charge_collectors: this.$login.f.name,
           f_charge_date: '',
           f_charge_remarks: '',
-          f_filiale: '',
+          f_filiale: this.$login.f.f_fengongsi,
           f_process_id: '',
           f_apply_num: '',
           f_charging_status: '有效',
           f_is_correct: '否',
-          f_bill_style: '',
-          f_charge_user: '',
-          f_charge_address: ''
+          f_bill_style: ''
         }
 
         // this.$dispatch('refresh', this.model)
@@ -616,9 +594,7 @@
         console.log("关闭打印框")
         this.taxprint = false
         this.print = false
-        this.printat = false
         this.delprint = false
-        this.delprintat = false
         this.clean()
       },
       printok() {
@@ -628,7 +604,6 @@
       validateBill(val) {
         this.validateOk = !val.isOk
         this.billData.bill = val.bill
-        this.billDataantai.bill = val.bill
       },
 
       confirmbuyerinfo(args) {
@@ -721,9 +696,8 @@
           this.model.f_charge_money = 0
           this.model.f_amount_words = ''
         } else {
-          debugger
           //获取购货方信息
-         let http = new HttpResetClass()
+          http = new HttpResetClass()
           data = {
             tablename: 't_buyer_info',
             condition: `f_process_id = '${this.infee.f_process_id}' and f_apply_num = '${this.infee.f_apply_num}' `
@@ -744,7 +718,7 @@
           let flag2 = this.accSub(Number(this.model.f_unaccounts_money), Number(this.model.f_charge_money))
 
 
-          http = new HttpResetClass()
+          let http = new HttpResetClass()
           console.log('f_charge_money' + Number(this.model.f_charge_money))
           console.log('f_unaccounts_money' + Number(this.model.f_unaccounts_money))
           this.addItem.f_charge_money = this.model.f_charge_money
@@ -754,14 +728,7 @@
           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
-          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_filiale = this.$login.f.f_fengongsi
           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)
@@ -790,7 +757,6 @@
             parameters: this.addItem
           }
           // 生成收费记录的id
-          debugger
           let sellid = ''
           let ret = await http.load('POST', 'rs/logic/saveentity', {data: data})
           this.model.chargeid = ret.data.id
@@ -800,8 +766,7 @@
             f_unaccounts_money: flag2,
             f_apply_num: this.infee.f_apply_num
           }
-          //开始收费 正
-          debugger
+          //开始收费
           for (let i = 0; i < this.charges.length; i++) {
             let saveen = this.charges[i]
             saveen.f_project_item = this.charges[i].f_project_item[0]
@@ -813,20 +778,6 @@
               }
             }, {resolveMsg: null, rejectMsg: "失败"})
           }
-      // debugger
-      //     for (let i = 0; i < this.charges.length; i++) {
-      //       let saveen = this.charges[i]
-      //       debugger
-      //       saveen.f_money= 0 - saveen.f_money
-      //       saveen.f_project_item = this.charges[i].f_project_item[0]
-      //       saveen.f_charge_record_id = parseFloat(ret.data.id);
-      //       await http.load('POST', 'rs/logic/saveentity', {
-      //         data: {
-      //           tablename: 't_charge_record_item',
-      //           parameters: saveen
-      //         }
-      //       }, {resolveMsg: null, rejectMsg: "失败"})
-      //     }
 
           await http.load('POST', 'rs/logic/updatechargemoney', {data: data}, {resolveMsg: null, rejectMsg: "添加累计金额失败"})
             .then((res) => {
@@ -840,25 +791,12 @@
 
                 this.model.f_bill_type = this.model.f_print[0]
                 this.model.f_bill_style = this.model.f_print[0]
-                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
-                }
-
+                this.print = true
 
                 console.log('f_bill_style' + this.model.f_bill_style)
 
               } else {
-                debugger
-                if(this.model.f_payment_account==='欣泰'){
-                  this.print = true
-                }else{
-                  this.printat = true
-                }
+                this.print = true
               }
             } else if (this.model.f_print[0] === '纸质普票') {
               this.param.f_print = this.model.f_print[0],
@@ -902,18 +840,17 @@
         this.showview = false
       },
       async tovoid(index) {
-        debugger
         console.log(index)
         console.log(JSON.stringify(this.model.rows))
         this.model.rows[index].f_amount_words = "负" + this.model.rows[index].f_amount_words;
         this.model.rows[index].f_charge_money = -this.model.rows[index].f_charge_money;
         var val = this.model.rows[index];
         this.model.chargeid = val.id;
+
         this.delprint = false;
         this.charges = [{f_project_item: '合同总额', f_amount: 0, f_price: 0, f_money: 0}],
           console.log(JSON.stringify(val))
         // this.charges =[{f_project_item:'合同总额', f_amount: 0, f_price: 0,f_money:0}],
-        debugger
         if (val.f_is_correct === '是' || val.f_charging_status !== '有效' || val.f_is_correct === '冲正中') {
           this.$showMessage('已冲正或正在冲正，不能操作！')
         } else {
@@ -929,25 +866,12 @@
               this.model.chargeid = res.data.charge_id;
               if (val.f_bill_style === '增值税电子发票') {
                 this.$showAlert('申请增值税电子发票冲正成功,请稍后到报建功能中【报建收费】中查看电子发票', 'success', 5000)
-                if(this.model.f_payment_account==='欣泰'){
-                  this.delprint = true;
-                }else{
-                  this.delprintat = true
-                }
-
+                this.delprint = 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)
@@ -1028,7 +952,7 @@
 
       // 获取数据
       async load() {
-        console.log('load被重新调用111')
+
         this.refresh = !this.refresh
         console.log("刷新validate，重新加载" + this.refresh)
         // this.ifsearch = !this.ifsearch
@@ -1054,7 +978,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 =parseFloat(parseFloat(this.model.f_cumulative_money) + parseFloat(res.data[i].f_charge_money)).toFixed(2) ;
+          this.model.f_cumulative_money = this.model.f_cumulative_money + parseInt(res.data[i].f_charge_money);
         }
 
 
@@ -1074,18 +998,13 @@
           resolveMsg: null,
           rejectMsg: '获取用户信息失败！'
         })
-        console.dir(userinfores.data)
         this.userinfoRow.rows = userinfores.data;
 
-
         this.oldInfo.f_user_name = this.model.f_user_name;
         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,10 +26,6 @@
             <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>
@@ -100,8 +96,7 @@
           f_user_type: '无',
           f_house_type: '无',
           f_residential_area: '无',
-          f_apply_remarks: '无',
-          f_payment_account: '无'
+          f_apply_remarks: '无'
         }
       }
     },