sale-client 4.1.230 → 4.2.1-ronghao

package/src/filiale/jinhong/IOTMeterCenterInner.vue

@@ -95,23 +95,31 @@
 
 <!--            <div class="col-sm-3 form-group" v-if="row.f_collection_type === '按气量'  && model.f_payment!='赠气'"-->
 <!--                 :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">-->
-<!--              <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>-->
+<!--              <label for="f_collection" class=" font_normal_body">燃气收款</label>-->
 <!--              <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"-->
 <!--                     v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'-->
 <!--                     v-el:sk v-scale="[model.f_totalcost, 2]" :disabled="$refs.givechange.promptText != ''">-->
 <!--            </div>-->
 <!--            <div class="col-sm-3 form-group" v-if="row.f_collection_type === '按气量'  && model.f_payment=='赠气'"-->
 <!--                 :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">-->
-<!--              <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>-->
+<!--              <label for="f_collection" class=" font_normal_body">燃气收款</label>-->
 <!--              <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"-->
 <!--                     v-el:sk v-scale="[model.f_totalcost, 2]" :disabled="$refs.givechange.promptText != ''">-->
 <!--            </div>-->
-            <div class="col-sm-3 form-group">
-              <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
-              <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
-                     @blur="config.calculatePreByCollection && calculatePreByCollection()"
-                     @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-el:sk v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="!config.calculatePreByCollection ">
+<!--            <div class="col-sm-3 form-group">-->
+<!--              <label for="f_collection" class=" font_normal_body">燃气收款</label>-->
+<!--              <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"-->
+<!--                     @blur="config.calculatePreByCollection && calculatePreByCollection()"-->
+<!--                     @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"-->
+<!--                     v-el:sk v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="!config.calculatePreByCollection ">-->
+<!--            </div>-->
+            <div class="col-sm-4 form-group"
+                 :class="[$v.f_preamount.required || $v.f_preamount.dctest? 'has-error' : 'has-success']">
+              <label for="f_preamount" class=" font_normal_body">燃气收款</label>
+              <input class="input_search" style="width:60%" @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm)),preamount()" @blur="preamount()" type="number" v-model="model.f_preamount" id="f_preamount"
+                     v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ] }'
+                     :disabled="config.calculatePreByCollection"
+                     v-scale="[model.f_preamount, row.f_fee_decimal||4]" placeholder="燃气收款" >
             </div>
             <div class="col-sm-1 form-group">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
@@ -168,7 +176,7 @@
             </div>
             <div class="col-sm-4">
               <label for="f_comments" class="font_normal_body">合计金额</label>
-              <input class="input_search" style="width:77%" v-model="sumCollection" rows="1" placeholder="合计">
+              <input class="input_search" style="width:77%" v-model="sumCollection" @blur="calculateCollection" rows="1" placeholder="合计">
             </div>
           </div>
 
@@ -323,10 +331,15 @@ import {HttpResetClass} from 'vue-client'
         self.model.f_expiration_date = self.insurance.f_expiration_date
         self.model.f_salecount = self.insurance.f_salecount
         self.model.f_money = self.insurance.f_money_all
+        self.model.f_insurance_company = self.insurance.f_insurance_company
+        self.model.f_insurance_number = self.insurance.f_insurance_number
         param.insurance = Object.assign({}, {}, self.model)
         param.insurance.f_payment = self.model.f_payment[0]
         param.insurance.f_userinfo_code = self.row.f_userinfo_code
+        param.insurance.f_idnumber = self.row.f_idnumber
+        param.insurance.f_user_phone = self.row.f_user_phone
         param.insurance.f_state = '有效'
+        param.insurance.f_receivable = self.insurance.f_money_all
         param.insurance.f_user_name = self.row.f_user_name
         param.insurance.f_opreator = self.$login.f.name
         // await self.$resetpost('api/af-revenue/logic/saveInsInfo', {data: self.model})
@@ -528,6 +541,7 @@ import {HttpResetClass} from 'vue-client'
         invoice_is_pax: '不征税',
         is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
 
+        sumCollection: 0,
         calculatedetail: '',
         // 启用发票管理需要对票号进行验证
         hasValidateBill: false,
@@ -573,6 +587,7 @@ import {HttpResetClass} from 'vue-client'
         })
       }
       // this.getPurchase()
+      this.sumCollection = (this.model.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
       this.model.f_price_id = this.row.f_price_id
       this.model.f_user_id = this.row.f_user_id
       this.model.f_userfiles_id = this.row.f_userfiles_id
@@ -588,10 +603,12 @@ import {HttpResetClass} from 'vue-client'
       'insurance.f_money_all'(){
         // 获取计算优惠
         this.getPrivilegeList()
+        this.sumCollection = (this.model.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
       },
       'garbagefee'(){
         // 获取计算优惠
         this.getPrivilegeList()
+        this.sumCollection = (this.model.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
       },
       'model.f_payment.length' (val) {
         console.log('付款方式多选。。', val)
@@ -617,6 +634,7 @@ import {HttpResetClass} from 'vue-client'
       'model.f_collection' (val) {
         // 获取计算优惠
         this.getPrivilegeList()
+        this.sumCollection = (this.model.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
       },
       'model.f_payment' (val) {
         let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
@@ -651,6 +669,19 @@ import {HttpResetClass} from 'vue-client'
       }
     },
     methods: {
+      calculateCollection () {
+        if (!isNaN(this.sumCollection) && this.sumCollection > 0) {
+          let tempFee = this.sumCollection
+          if ((this.garbagefee - 0) > 0) {
+            tempFee = (tempFee - 0) - (this.garbagefee - 0)
+          }
+          if ((this.insurance.f_money_all - 0) > 0) {
+            tempFee = (tempFee - 0) - (this.insurance.f_money_all - 0)
+          }
+          this.model.f_collection = tempFee
+          this.calculatePreByCollection()
+        }
+      },
       // 根据收款金额计算划价信息
       // 需要配置 calculatePreByCollection = true
       async calculatePreByCollection () {
@@ -665,7 +696,7 @@ import {HttpResetClass} from 'vue-client'
           // 通过收款进行划价
           let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
           if (this.row.f_isdecimal === '是') {
-            this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
+            this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
           } else {
             this.model.f_pregas = parseInt(getGas.data.gas)
           }
@@ -873,9 +904,6 @@ import {HttpResetClass} from 'vue-client'
       }
     },
     computed: {
-      sumCollection () {
-        return (this.model.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
-      },
       authArr () {
         return this.$login.r ? this.$login.r : []
       },
@@ -884,7 +912,7 @@ import {HttpResetClass} from 'vue-client'
           return this.row.f_balance
         }
         if (this.model.f_preamount) {
-          return ((this.model.f_collection - 0) - (this.model.f_preamount - 0) + (this.row.f_balance - 0) - this.alldue_fee).toFixed(2) - 0
+          return ((this.model.f_collection - 0) - (this.model.f_preamount - 0) + (this.row.f_balance - 0) - this.alldue_fee).toFixed(this.row.f_gas_decimal || 4) - 0
         } else {
           return 0
         }

package/src/filiale/jinhong/InsuranceAdd.vue

@@ -59,7 +59,7 @@
             <datepicker id="f_ins_start_date" placeholder="本次保费开始日期" style="width:60%"
                         v-model="model.f_ins_start_date"
                         :value.sync="model.f_ins_start_date"
-                        :format="'yyyy-MM-dd'"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true">
             </datepicker>
           </div>
@@ -113,6 +113,22 @@
               v-ref:f_insurance_type>
             </v-select>
           </div>
+          <div class="col-sm-6 form-group" >
+            <label class="font_normal_body" title="参数:保险公司">&emsp;&emsp;&emsp;&emsp;保险公司</label>
+            <input v-show="false" v-model="$refs.f_insurance_company.selectedItems"
+                   type="text">
+            <v-select
+              v-model="model.f_insurance_company"
+              v-ref:f_insurance_company
+              :options='insurancecompany'
+              :value-single="true"
+              :value.sync="model.f_insurance_company"
+              close-on-select
+              placeholder='保险公司'
+              style="width:60%"
+            >
+            </v-select>
+          </div>
           <div class="col-sm-6  form-group" :class="[$v.f_state.required ? 'has-error' : '']">
             <label class="font_normal_body" title="参数:保险状态">&emsp;&emsp;&emsp;&emsp;保险状态</label>
             <input type="text" v-show="false" v-model="$refs.f_state.selectedItems"
@@ -152,7 +168,7 @@
           </div>
           <div class="col-sm-6  form-group">
             <label class="font_normal_body">&emsp;&emsp;&emsp;&emsp;保险单号</label>
-            <input type="text" v-model="model.f_ins_number"  style="width: 60%"
+            <input type="text" v-model="model.f_insurance_number"  style="width: 60%"
                    class="input_search">
           </div>
           <div class="col-sm-6 form-group"  v-show="false">
@@ -210,6 +226,7 @@
         paytype: [],
         insurancetype: this.$appdata.getParam('险种'),
         insurancestate: this.$appdata.getParam('保险状态'),
+        insurancecompany: this.$appdata.getParam('保险公司'),
         f_salecount: {
           dctest: true
         },
@@ -263,19 +280,24 @@
         if (JSON.stringify(this.row) != '{}') {
           this.model = {
             f_userinfo_id: this.row.f_userinfo_id,
+            f_userfiles_id: this.row.f_userfiles_id,
             f_ins_stop_date: this.row.f_ins_stop_date,
             f_user_name: this.row.f_user_name,
             f_idnumber: this.row.f_idnumber,
             f_user_phone: this.row.f_user_phone,
             f_salecount: this.row.f_saleCount,
             f_userinfo_code: this.row.f_userinfo_code,
+            f_ins_start_date:Util.toStandardTimeString(),
             f_last_insexpiration_date: this.row.f_ins_stop_date
           }
         }
       }
-      this.model.f_buy_date = this.$login.toStandardTimeString()
-      this.$set('model.f_ins_start_date', Util.toStandardDateString())
-      this.model.f_ins_start_date = Util.toStandardDateString()
+      this.model.f_buy_date = Util.toStandardTimeString()
+      if(this.model.f_ins_stop_date && this.model.f_ins_stop_date>Util.toStandardTimeString()){
+        this.$set('model.f_ins_start_date',this.model.f_ins_stop_date)
+      }else{
+        this.$set('model.f_ins_start_date',Util.toStandardTimeString())
+      }
       this.model.f_salecount = 1
       this.configMerge()
     },

package/src/filiale/jinhong/InsuranceChargesDetails.vue

@@ -97,9 +97,9 @@
                 </div>
                 <div class="col-sm-2  form-group">
                   <label class="font_normal_body" for="f_user_name">保险单号</label>
-                  <input id="f_ins_number" type="text" class="input_search" style="width: 60%"
-                         v-model="model.f_ins_number"
-                         condition="f_ins_number like '%{}%'" placeholder='请输入要查询的保险单号'>
+                  <input id="f_insurance_number" type="text" class="input_search" style="width: 60%"
+                         v-model="model.f_insurance_number"
+                         condition="f_insurance_number like '%{}%'" placeholder='请输入要查询的保险单号'>
                 </div>
                 <div class="col-sm-2  form-group">
                   <label class="font_normal_body" for="f_user_name">备注信息</label>
@@ -219,6 +219,9 @@
                 <th>
                   <nobr>缴费时间</nobr>
                 </th>
+                <th style="text-align: center">
+                  <nobr> 保险公司</nobr>
+                </th>
                 <th>
                   <nobr>保险单号</nobr>
                 </th>
@@ -294,7 +297,10 @@
                 <nobr>{{ row.f_operate_date }}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{ row.f_ins_number }}</nobr>
+                <nobr>{{ row.f_insurance_company }}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_insurance_number }}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{ row.f_insurance_type }}</nobr>
@@ -416,7 +422,7 @@ export default {
         'f_payment': '收款方式',
         'f_state': '状态',
         'f_operate_date': '缴费时间',
-        'f_ins_number': '保险单号',
+        'f_insurance_number': '保险单号',
         'f_insurance_type': '险种',
         'f_salecount': '购买年限',
         'f_operator': '操作人',

package/src/filiale/jinhong/InsuranceRecord.vue

@@ -98,7 +98,7 @@
       <header slot="modal-header" class="modal-header" style="text-align: center">
         <h4 class="modal-title">保险撤销</h4>
       </header>
-      <article slot="modal-body" class="modal-body" style="height: 950px">
+      <article slot="modal-body" class="modal-body" style="height: 450px">
         <validator name='v'>
           <form class="form-horizontal select-overspread">
             <!--            <div class="form-group" :class="[$v.payment.required ? 'has-error' : '']" v-if="paymentShow && (!config.hasAudit || isTodayResult)">-->
@@ -159,10 +159,9 @@
               </div>
             </div>
           </form>
-          <div class="form-group" style="padding-top: 20px;padding-left: 20px">
-            <upload v-if="config.showupload && (config.hasAudit && !isTodayResult)" :blodid="obj.f_userinfo_id"
-                    :businessid="model.randomBusinessId" isremark="true" fusetype="保险冲正"></upload>
-          </div>
+          <upload v-if="config.showupload && (config.hasAudit && !isTodayResult)" :blodid="obj.f_userinfo_id"
+                    :businessid="model.randomBusinessId" isremark="true" fusetype="保险冲正">
+          </upload>
         </validator>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/filiale/jinhong/InsuranceTemp.vue

@@ -43,6 +43,27 @@
           <label class="font_normal_body">结束日期</label>
           <input v-model="model.f_expiration_date"  style="width: 60%" placeholder="保险到期时间"  :value.sync='model.f_expiration_date'       class="input_search" type="text"  >
         </div>
+        <div class="col-sm-4 form-group" >
+          <label class="font_normal_body" title="参数:保险公司">保险公司</label>
+          <input v-show="false" v-model="$refs.f_insurance_company.selectedItems"
+                 type="text">
+          <v-select
+            v-model="model.f_insurance_company"
+            v-ref:f_insurance_company
+            :options='insurancecompany'
+            :value-single="true"
+            :value.sync="model.f_insurance_company"
+            close-on-select
+            placeholder='保险公司'
+            style="width:60%"
+          >
+          </v-select>
+        </div>
+        <div class="col-sm-4 form-group" >
+          <label class="font_normal_body">保险单号</label>
+          <input v-model="model.f_insurance_number" class="input_search" placeholder="保险单号" style="width:60%"
+                 type="number">
+        </div>
         <div class="col-sm-4 form-group" >
           <label class="font_normal_body">保费总额</label>
           <input v-model="model.f_money_all" class="input_search" placeholder="保费总额" style="width:60%"
@@ -63,12 +84,15 @@ export default {
         f_insurance_type: '',
         f_money: null,
         f_ins_start_date: '',
+        f_insurance_company: '',
+        f_insurance_number: '',
         f_expiration_date: '',
         f_salecount: null,
         f_money_all: null
       },
       paytype: [],
       insurancetype: this.$appdata.getParam('险种'),
+      insurancecompany: this.$appdata.getParam('保险公司'),
       f_salecount: {
         dctest: true
       }
@@ -78,7 +102,11 @@ export default {
     row: Object
   },
   ready () {
-    this.model.f_ins_start_date = Util.toStandardTimeString()
+    if(this.row.f_ins_stop_date && this.row.f_ins_stop_date>Util.toStandardTimeString()){
+      this.model.f_ins_start_date = this.row.f_ins_stop_date
+    } else {
+      this.model.f_ins_start_date = Util.toStandardTimeString()
+    }
   },
   watch: {
     'model.f_ins_start_date' (val) {
@@ -166,12 +194,12 @@ export default {
       if (saveState) {
         this.model.f_total_ins_charge = this.model.f_total_ins_charge == null ? 0 : this.model.f_total_ins_charge
         this.model.f_operat_type = '保险'
-        this.model.f_operator = this.operatorname[0]
-        this.model.f_operatorid = this.f_operatorid[0]
+        this.model.f_operator = this.$login.f.name
+        this.model.f_operatorid = this.$login.f.id
         this.model.f_orgid = this.$login.f.orgid
         this.model.f_orgname = this.$login.f.orgs
-        this.model.f_depid = this.f_depid[0]
-        this.model.f_depname = this.depname[0]
+        this.model.f_depid = this.$login.f.depids
+        this.model.f_depname = this.$login.f.deps
         this.model.f_fee_type = '保险收费'
         this.model.f_last_insexpiration_date = this.model.f_ins_stop_date
         await

package/src/filiale/jinhong/MachineChargeService.js

@@ -46,6 +46,14 @@ let MachineChargeService = {
       f_after_discount: model.f_after_discount,
       isBreakOverdue: model.isBreakOverdue,
       floor: floor,
+      f_operator: model.f_operator ? model.f_operator : Vue.$login.f.name,
+      f_operatorid: Vue.$login.f.id,
+      f_orgid: Vue.$login.f.orgid,
+      f_orgname: Vue.$login.f.orgs,
+      f_depid: Vue.$login.f.depids,
+      f_depname: Vue.$login.f.deps,
+      f_zoneid: Vue.$login.f.zoneid,
+      f_zones: Vue.$login.f.zones,
       operInfo: {
         f_operator: model.f_operator ? model.f_operator : Vue.$login.f.name,
         f_operatorid: Vue.$login.f.id,

package/src/filiale/jinhong/MachineMeterCenter.vue

@@ -71,13 +71,13 @@
             <input class="input_search" style="width:60%"  type="number" v-model="curbalance" disabled>
           </div>
           <div  class="col-sm-3 form-group" v-if="config.hasfindaReail" :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error select-error' : '']">
-            <label for="f_collection" class="font_normal_body">收&emsp;&emsp;款</label>
+            <label for="f_collection" class="font_normal_body">燃气收款</label>
             <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="data.f_collection"
                    v-validate:f_collection='{required: true, dctest: [0, ">=" ]}'  v-scale = "[data.f_collection, 2]"
                    @mousewheel.native.prevent @keyup.enter="confirm()" :disabled="$refs.givechange.promptText != ''">
           </div>
           <div  class="col-sm-4 form-group" v-if="!config.hasfindaReail" :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error select-error' : '']">
-            <label for="f_collection" class="font_normal_body">收&emsp;&emsp;款</label>
+            <label for="f_collection" class="font_normal_body">燃气收款</label>
             <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="data.f_collection"
                    v-validate:f_collection='{required: true, dctest: [0, ">=" ]}'  v-scale = "[data.f_collection, 2]"
                    @mousewheel.native.prevent @keyup.enter="confirm()" :disabled="$refs.givechange.promptText != ''">
@@ -132,7 +132,7 @@
           </div>
           <div class="col-sm-4">
             <label for="f_comments" class="font_normal_body">合计金额</label>
-            <input class="input_search" style="width:77%" v-model="sumCollection" rows="1" placeholder="合计">
+            <input class="input_search" style="width:77%" v-model="sumCollection" @blur="calculateCollection" rows="1" placeholder="合计">
           </div>
         </div>
       </form>
@@ -208,7 +208,7 @@ let asyncMachineMeterCenter = async function (self) {
       // 加入扫码盒付款码支付流水号
       self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
       console.log('查看传过来的数据=====================>', self)
-      if (self.insurance && self.insurance.f_money_all>0) {
+      if (self.insurance && self.insurance.f_money_all > 0) {
         self.model.f_total_ins_charge = self.model.f_total_ins_charge == null ? 0 : self.model.f_total_ins_charge
         self.model.f_fee_type = '保险收费'
         self.model.f_last_insexpiration_date = self.model.f_ins_stop_date
@@ -217,13 +217,24 @@ let asyncMachineMeterCenter = async function (self) {
         self.model.f_expiration_date = self.insurance.f_expiration_date
         self.model.f_salecount = self.insurance.f_salecount
         self.model.f_money = self.insurance.f_money_all
+        self.model.f_insurance_company = self.insurance.f_insurance_company
+        self.model.f_insurance_number = self.insurance.f_insurance_number
         let insurance = Object.assign({}, {}, self.model)
         insurance.f_userinfo_code = self.row.f_userinfo_code
         insurance.f_state = '有效'
         insurance.f_operat_type = '保险'
         insurance.f_user_name = self.row.f_user_name
+        insurance.f_idnumber = self.row.f_idnumber
+        insurance.f_user_phone = self.row.f_user_phone
         insurance.f_payment = self.data.f_payment.toString()
-        insurance.f_opreator = self.$login.f.name
+        insurance.f_userfiles_id = self.row.f_userfiles_id
+        insurance.f_operator = self.$login.f.name
+        insurance.f_operatorid = self.$login.f.id
+        insurance.f_orgid = self.$login.f.orgid
+        insurance.f_orgname = self.$login.f.orgs
+        insurance.f_depid = self.$login.f.depids
+        insurance.f_depname = self.$login.f.deps
+        insurance.f_receivable = self.insurance.f_money_all
         insurance.f_userinfo_id = self.row.f_userinfo_id
         self.model.insurance = insurance
         // await self.$resetpost('api/af-revenue/logic/saveInsInfo', {data: self.model})
@@ -348,6 +359,7 @@ let asyncMachineMeterCenter = async function (self) {
           f_old_overdue: 0,
           f_new_overdue: ''
         },
+        sumCollection: 0,
         newOverdue: 0,
         isBreakOverdue: false,
         breakOverdue: {},
@@ -377,7 +389,7 @@ let asyncMachineMeterCenter = async function (self) {
         serialShow: false
       }
     },
-    props: ['data', 'row', 'floor', 'ceil', 'charge','garbagelist', 'garbagefee', 'insurance'],
+    props: ['data', 'row', 'floor', 'ceil', 'charge', 'garbagelist', 'garbagefee', 'insurance'],
     ready () {
       this.paytype = this.$appdata.getParam('付款方式') ? this.$appdata.getParam('付款方式') : []
       if (!this.$login.r.includes('免交充值付款')) {
@@ -385,6 +397,7 @@ let asyncMachineMeterCenter = async function (self) {
           return item.label != '免交'
         })
       }
+      this.sumCollection = (this.data.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
       // this.calOverdue()
       this.newOverdue = this.overdueModal.f_old_overdue = this.data.f_overdue
       if (this.floor) {
@@ -410,6 +423,20 @@ let asyncMachineMeterCenter = async function (self) {
       this.showOverdueModal = true
     },
     methods: {
+      calculateCollection () {
+        console.log(this.sumCollection)
+        if (!isNaN(this.sumCollection) && this.sumCollection > 0) {
+          console.log('adawdafacfcacacascascassca')
+          let tempFee = this.sumCollection
+          if ((this.garbagefee - 0) > 0) {
+            tempFee = tempFee - (this.garbagefee - 0)
+          }
+          if ((this.insurance.f_money_all - 0) > 0) {
+            tempFee = tempFee - (this.insurance.f_money_all - 0)
+          }
+          this.data.f_collection = tempFee
+        }
+      },
       getRandomId () {
         this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
           let res = Math.random() * 16 | 0
@@ -661,13 +688,15 @@ let asyncMachineMeterCenter = async function (self) {
         // this.data.f_last_overdue = this.newOverdue
         this.newOverdue = val
       },
-      'garbagefee'(){
+      'garbagefee' () {
         // 获取计算优惠
         this.getPrivilegeList()
+        this.sumCollection = (this.data.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
       },
-      'insurance.f_money_all'(){
+      'insurance.f_money_all' () {
         // 获取计算优惠
         this.getPrivilegeList()
+        this.sumCollection = (this.data.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
       },
       'splitAll' (val) {
         this.data.f_pregas = this.data.f_pregas - val
@@ -709,12 +738,10 @@ let asyncMachineMeterCenter = async function (self) {
         this.data.f_after_discount = this.data.f_collection
         // 获取计算优惠
         this.getPrivilegeList()
+        this.sumCollection = (this.data.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
       }
     },
     computed: {
-      sumCollection () {
-        return (this.data.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
-      },
       authArr () {
         return this.$login.r ? this.$login.r : []
       },