sale-client 3.6.126 → 3.6.127

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080/']
+const [serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.126",
+  "version": "3.6.127",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/charge/business/IOTMeterCenter.vue

@@ -24,6 +24,7 @@
               <label for="f_pregas" class=" font_normal_body">预购气量</label>
               <input class="input_search" style="width:60%" type="number" id="pregasFocue"
                      @blur="pregas()" v-model="model.f_pregas"
+                     :disabled="config.calculatePreByCollection"
                      v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
                      v-next-el='sk' >
             </div>
@@ -37,6 +38,7 @@
               <label for="f_preamount" class=" font_normal_body">预购金额</label>
               <input class="input_search" style="width:60%" @blur="preamount()" type="number" v-model="model.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>
@@ -107,7 +109,8 @@
             <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"
-                     v-el:sk v-scale="[model.f_collection, row.f_fee_decimal||4]" disabled>
+                     @blur="config.calculatePreByCollection && calculatePreByCollection()"
+                     v-el:sk v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="!config.calculatePreByCollection">
             </div>
             <div class="col-sm-1 form-group">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
@@ -474,7 +477,8 @@
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
           payment: '',
           hasArrearsChange: false, // 是否可以有欠费换表 收费时用来判断是否查询旧表欠费
-          overdraftBalance: false // 是否支持系统余额透支
+          overdraftBalance: false, // 是否支持系统余额透支
+          calculatePreByCollection: false // 可以更具收款来反向计算预购
         },
         model: {
           f_purchase: 0,
@@ -612,6 +616,31 @@
       }
     },
     methods: {
+      // 根据收款金额计算划价信息
+      // 需要配置 calculatePreByCollection = true
+      async calculatePreByCollection () {
+        if (this.alldue_fee > this.model.f_collection) {
+          this.$showAlert('收款不能小于旧表机表欠费，请重新输入', 'danger', 5000)
+          this.model.f_collection = undefined
+          return
+        }
+        try {
+          this.model.f_collection = (this.model.f_collection - 0)
+          let calFee = ((this.model.f_collection - 0) + (this.row.f_balance) - (this.alldue_fee)).toFixed(4)
+          // 通过收款进行划价
+          let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
+          this.model.f_pregas = parseInt(getGas.data.gas)
+          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
+          this.model.f_preamount = dymoney2.data.chargenum
+          this.calText(dymoney2.data.chargeprice)
+        } catch (error) {
+          this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+          this.$dispatch('error', '发卡售气', this.model, error)
+        }
+      },
       getRandomId () {
         this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
           let res = Math.random() * 16 | 0