sale-client 4.1.230 → 4.2.1-ronghao

package/src/filiale/jinhong/CardMeterCenterInner.vue

@@ -62,17 +62,17 @@
             </div>
             <div class="col-sm-4 " v-if="hasLimit&&limitgas">
               <label class="font_normal_body">&ensp;购气上限</label>
-              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxgas"
+              <input class="input_search" style="width:60%" type="number" v-model="maxgas"
                      v-scale="[maxgas, 4]" placeholder='限购余气' disabled>
             </div>
             <div class="col-sm-4 form-group" v-if="hasLimit&&limitmoney">
               <label class="font_normal_body">金额上限</label>
-              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxmoney"
+              <input class="input_search" style="width:60%" type="number" v-model="maxmoney"
                      v-scale="[maxmoney, 2]" placeholder='限购金额' disabled>
             </div>
             <div class="col-sm-4" v-if="mingas > 0 ">
               <label class="font_normal_body">&ensp;购气下限</label>
-              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="mingas"
+              <input class="input_search" style="width:60%" type="number" v-model="mingas"
                      v-scale="[mingas, 4]" placeholder='最低购气量' disabled>
             </div>
 
@@ -102,15 +102,15 @@
 
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && !config.calculatePreByCollection"
                  :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">
-              <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="model.f_collection"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_totalcost, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''"/>
+                     v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''"/>
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && config.calculatePreByCollection"
                  :class="[$v.f_collection.required ? 'has-error' : 'has-success']">
-              <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="model.f_collection"
                      v-validate:f_collection='{required: true }'
                      @blur="calculatePreByCollection()"
@@ -119,20 +119,20 @@
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气' && row.f_meter_type.includes('卡表')"
                  :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">
-              <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
+              <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">燃气收款</font></label>
               <input id="f_collection" class="input_search" style="width:60%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按金额' && row.f_meter_type.includes('卡表')">
-              <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
+              <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">燃气收款</font></label>
               <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-4" v-if="!row.f_meter_type.includes('卡表')">
               <label for="f_collection" class=" font_normal_body"><font size="4px"
-                                                                        style="font-weight:bold">*收&emsp;款</font></label>
+                                                                        style="font-weight:bold">燃气收款</font></label>
               <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;"
                      type="number" v-model="model.f_collection"
                      v-el:fcollection
@@ -200,7 +200,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>
 
@@ -352,7 +352,7 @@
       self.model.payments = self.paymentModel
       // 加入扫码盒付款码支付流水号
       self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
-      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
@@ -361,8 +361,20 @@
         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_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_idnumber = self.row.f_idnumber
+        insurance.f_user_phone = self.row.f_user_phone
+        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_payment = self.model.f_payment.toString()
         insurance.f_state = '有效'
         insurance.f_operat_type = '保险'
@@ -398,10 +410,9 @@
           param: param,
           f_blobid: writeid
         }
-
         await self.$resetpost('api/af-revenue/logic/updatefiles', data)
       }
-      console.log(self.config, self.config.hasPrint && !self.$login.r.includes('不打印发票'))
+      console.log(self.config, self.config.hasPrint, self.$login.r.includes('不打印发票'), self.config.hasPrint && !self.$login.r.includes('不打印发票'))
       // 开始打票
       if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
         if (self.printInvoiceType.indexOf(self.model.f_print) === -1) {
@@ -593,6 +604,8 @@
           f_after_discount: 0,
           getDeduct: 0
         },
+        sumCollection: 0,
+        calculateCollectionFlag: false,
         calculatedetail: '',
         deductdetail: '',
 
@@ -625,7 +638,7 @@
         dymoney: 0
       }
     },
-    props: ['row', 'cardData','garbagelist', 'garbagefee', 'insurance'],
+    props: ['row', 'cardData', 'garbagelist', 'garbagefee', 'insurance'],
     async ready () {
       if (this.authArr.includes('余额写卡限定')) {
         this.paytype = [{label: '余额写卡', value: '余额写卡'}]
@@ -637,6 +650,7 @@
           })
         }
       }
+      this.sumCollection = (this.model.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
       // this.getPurchase()
       this.model.f_price_id = this.row.f_price_id
       this.model.f_user_id = this.row.f_user_id
@@ -652,13 +666,15 @@
       asyncCardMeterCenter(this)
     },
     watch: {
-      'insurance.f_money_all'(){
+      'insurance.f_money_all' () {
         // 获取计算优惠
         this.getPrivilegeList()
+        this.sumCollection = (this.model.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
       },
-      'garbagefee'(){
+      '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)
@@ -701,8 +717,10 @@
         // }
       },
       'model.f_collection' (val) {
+        console.log('===============>', val)
         // 获取计算优惠
         this.getPrivilegeList()
+        this.sumCollection = (this.model.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
       }
     },
     events: {
@@ -717,6 +735,21 @@
       }
     },
     methods: {
+      calculateCollection () {
+        console.log(this.sumCollection)
+        if (!isNaN(this.sumCollection) && this.sumCollection > 0) {
+          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.model.f_collection = tempFee
+          this.calculateCollectionFlag = true
+          this.calculatePreByCollection()
+        }
+      },
       getRandomId () {
         this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
           let res = Math.random() * 16 | 0
@@ -736,16 +769,22 @@
           let dymoney2 = await this.$CommonService.gasCalculate(this.model, this.model.f_pregas)
           this.model.chargeprice = dymoney2.data.chargeprice
           Object.assign(this.model, this.model, dymoney2.data)
-          this.model.f_totalcost = dymoney2.data.chargenum
+          if (this.calculateCollectionFlag && !this.config.calculatePreByCollection) {
+            this.model.f_totalcost = (dymoney2.data.chargenum - 0) - (this.row.f_balance - 0)
+          } else {
+            this.model.f_totalcost = dymoney2.data.chargenum
+          }
           this.model.f_preamount = dymoney2.data.chargenum
           this.model.getDeduct = 0
           if (this.row.f_project_money && this.row.f_project_money > 0) {
             this.model.getDeduct = (this.$CommonService.getDeduct(this.row, this.model.f_pregas) - 0)
-            this.model.f_totalcost = (this.model.f_totalcost - 0 ) + (this.model.getDeduct- 0 )
-            this.model.f_collection = (this.model.f_collection - 0 ) + (this.model.getDeduct- 0 )
+            this.model.f_totalcost = (this.model.f_totalcost - 0) + (this.model.getDeduct - 0)
+            this.model.f_collection = (this.model.f_collection - 0) + (this.model.getDeduct - 0)
           }
+          console.log('this.model.f_collection', this.model.f_collection)
           this.calText(dymoney2.data.chargeprice, this.model.getDeduct)
         } catch (error) {
+          console.log('=============>', error)
           this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
           this.$dispatch('error', '发卡售气', this.model, error)
         }
@@ -979,9 +1018,9 @@
       }
     },
     computed: {
-      sumCollection () {
-        return (this.model.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
-      },
+      // sumCollection () {
+      //   return (this.model.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
+      // },
       authArr () {
         return this.$login.r ? this.$login.r : []
       },

package/src/filiale/jinhong/GarbageCharge.vue

@@ -139,7 +139,7 @@ export default {
         f_orgname: this.$login.f.orgs,
         f_depid: this.$login.f.depids,
         f_depname: this.$login.f.deps,
-        f_payment: this.model.f_payment[0]
+        f_payment: this.model.f_payment
       }
       console.log('垃圾费收费', param)
       let res = await this.$resetpost('api/af-revenue/logic/savegarbageFee', {data: param}, {warnMsg: `确定要对用户${this.row.f_user_name}进行垃圾费收费吗？`, resolveMsg: '收费成功！！', rejectMsg: '收费失败！！请重试！！'})