sale-client 4.3.82 → 4.3.83

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://localhost:9026']
+const [ serverRul, localUrl ] = ['http://219.151.186.185:31467/', 'http://localhost:9026']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

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

@@ -163,6 +163,7 @@
                     :data='row' @printok="printok" v-ref:printbill></print-bill>
         <div style="text-align:right; height: 25%;">
           <strong style="font-size: large" v-if="!config.notShowFormula">计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong><br/>
+          <strong style="font-size: large" v-if="deductdetail">{{deductdetail ? deductdetail : ' 暂无'}}</strong><br/>
           <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm"
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
@@ -209,8 +210,11 @@
       Object.assign(self.model, self.model, getAmount.data)
       self.model.f_collection = self.model.f_totalcost
 
-      if(self.config.floor){
-        self.model.f_collection=Math.ceil(self.model.f_collection)
+      if (self.config.floor) {
+        self.model.f_collection = Math.ceil(self.model.f_collection)
+      }
+      if (self.row.f_deduction_gas && self.row.f_deduction_gas > 0) {
+        self.model.f_pregas += self.row.f_deduction_gas
       }
       self.calText(getAmount.data.chargeprice)
     } else {
@@ -233,7 +237,18 @@
       if ((self.model.f_fill_gas - 0) < (self.model.f_pregas - 0)) {
         // 超出【补气气量不符】部分走划价
         let gas = self.model.f_pregas - self.model.f_fill_gas
-        let getAmount = await self.$CommonService.gasCalculate(self.model, gas)
+        let getAmount
+        if (self.row.f_deduction_gas) {
+          gas = (gas - 0) - self.row.f_deduction_gas
+          if (gas < 0) {
+            gas = 0
+          }
+          console.log(gas)
+          getAmount = await self.$CommonService.gasCalculate(self.model, gas)
+          console.log(getAmount)
+        } else {
+          getAmount = await self.$CommonService.gasCalculate(self.model, gas)
+        }
         console.log('划价返回', getAmount, self.openFee, self.row.f_balance)
         self.model.f_preamount = getAmount.data.chargenum
         // 计算气费和其他费用(暂时只有开卡费，之后有其他费在加)
@@ -390,11 +405,13 @@
           f_collection: '',
           chargeprice: [],
           f_print: [],
+          f_deduction_gas:0,
           f_meter_type: '',
           f_voucher_number: ''
         },
         cardallot: null,
         calculatedetail: '',
+        deductdetail:'',
         blodid: '',
         billData: {
           url: 'api/af-revenue/report/card_gas_bill',
@@ -603,6 +620,15 @@
       },
       calText (val) {
         let str = ''
+        if (this.row.f_deduction_gas) {
+          if ((this.row.f_deduction_gas-0) >= (this.model.f_pregas-0)) {
+            this.deductdetail = '本期优惠方量' + this.model.f_pregas
+            this.model.f_deduction_gas = this.model.f_pregas
+          } else {
+            this.deductdetail = '本期优惠方量' + this.row.f_deduction_gas
+            this.model.f_deduction_gas = this.row.f_deduction_gas
+          }
+        }
         val.forEach((item) => {
           str = str + item.f_price + ' x ' + item.f_gas + '+'
         })

package/src/filiale/liaoyuan/ChangeMeter.vue

@@ -307,8 +307,8 @@ export default {
   },
   methods: {
     async getAuditor () {
-      await this.$GetSaleParam.initinputtor()
-      this.auditor = this.$GetSaleParam.getAudit(this.$login.f.orgid)
+      let auditor =  await this.$resetpost('api/af-revenue/logic/getAuditPerson',{orgId: this.$login.f.orgid})
+      this.auditor = auditor.data
     },
     getPricenames () {
       console.log('气价。，。。', this.newinfo.pricetype)

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/yangchun/sale'
+import FilialeSale from './filiale/liaoyuan/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
@@ -24,7 +24,7 @@ system(false)
 sale()
 address()
 ldap()
-// FilialeSale()
+FilialeSale()
 require('system-clients/src/styles/less/bootstrap.less')
 
 new Vue({

package/src/plugins/CardService.js

@@ -157,6 +157,7 @@ let CardService = {
       f_serial_id: model.f_serial_id,
       f_userinfo_id: row.f_userinfo_id,
       f_user_id: row.f_user_id,
+      f_deduction_gas:model.f_deduction_gas?model.f_deduction_gas:0,
       // 补气量
       f_fill_gas: model.f_fill_gas,
       f_fill_money: model.f_fill_money,