sale-client 4.3.77 → 4.3.78

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://192.168.50.67:31567/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://localhost:9026']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -25,12 +25,12 @@ var devConfig = {
     //   },
     //   target: localUrl
     // },
-    //   '/api/af-revenue/logic': {
-    //     pathRewrite: {
-    //       '/api/af-revenue/logic': '/logic'
-    //     },
-    //     target: localUrl
-    //   },
+      '/api/af-revenue/logic': {
+        pathRewrite: {
+          '/api/af-revenue/logic': '/logic'
+        },
+        target: localUrl
+      },
       // '/api/af-revenue/file': {
       //   // pathRewrite: {
       //   //   '/api/af-revenue/file': '/file'
@@ -57,17 +57,17 @@ var devConfig = {
       //   target: "http://localhost:9026"
       // },
       '/api': {
-        target: localUrl,
+        target: serverRul,
         secure: false,
         changeOrigin: true,
       },
       '/resource': {
-        target: localUrl,
+        target: serverRul,
         secure: false,
         changeOrigin: true
       },
       '/rs': {
-        target: localUrl,
+        target: serverRul,
         secure: false,
         changeOrigin: true,
       }

package/package.json

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

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

@@ -294,6 +294,9 @@
       self.model.f_collection = self.config.autoCollection ? self.model.f_totalcost : 0
       self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
     }
+    if(self.row.f_deduction_gas && self.row.f_deduction_gas>0){
+      self.model.f_pregas += self.row.f_deduction_gas
+    }
     self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
     self.calText(getGas.data.chargeprice, self.model.getDeduct)
   }
@@ -307,7 +310,19 @@
     }
     if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0 || (self.model.f_pregas - 0) - (self.mingas - 0) >= 0) {
       self.model.f_meter_type = self.row.f_meter_type
-      let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
+      console.log(self.row.f_deduction_gas)
+      let getAmount
+      if (self.row.f_deduction_gas) {
+        let gas = (self.model.f_pregas - 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, self.model.f_pregas)
+      }
       self.model.getDeduct = 0
       // 计算抵扣包间费用抵扣金额
       if (self.row.f_project_money && self.row.f_project_money > 0) {
@@ -518,17 +533,17 @@
       })
     }
     // 获取优惠信息
-    if (self.config.newDiscount) {
-      let getDiscount = await self.$resetpost('api/af-revenue/logic/getDiscountInfo', {data: nowrite_param}, {
-        resolveMsg: null,
-        newly: true,
-        rejectMsg: '获取优惠信息失败！！'
-      })
-      if (getDiscount.data.leftDiscount > 0) {
-        self.disCountInfo = getDiscount.data
-        self.hasDisCount = true
-      }
-    }
+    // if (self.config.newDiscount) {
+    //   let getDiscount = await self.$resetpost('api/af-revenue/logic/getDiscountInfo', {data: nowrite_param}, {
+    //     resolveMsg: null,
+    //     newly: true,
+    //     rejectMsg: '获取优惠信息失败！！'
+    //   })
+    //   if (getDiscount.data.leftDiscount > 0) {
+    //     self.disCountInfo = getDiscount.data
+    //     self.hasDisCount = true
+    //   }
+    // }
   }
   export default {
     title: '卡表收费',
@@ -580,6 +595,7 @@
           f_privilege_gas: 0,
           f_privilege_money: 0,
           f_after_discount: 0,
+          f_deduction_gas:0,
           getDeduct: 0
         },
         calculatedetail: '',
@@ -865,6 +881,15 @@
             this.deductdetail = '未结金额计算公式:' + this.row.f_gas_type + ' x ' + this.model.f_pregas + '=' + getDeduct
           }
         }
+        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
+          }
+        }
         str = str.slice(0, str.length - 1)
         this.calculatedetail = str
         if (num > 1) {
@@ -916,24 +941,24 @@
           }
           this.privilegeCalculate()
         }
-        if (this.hasDisCount) {
-          this.calDisCount()
-        }
-      },
-      async calDisCount () {
-        // 初始化减免金额
-        this.model.f_privilege_money = 0
-        this.model.f_after_discount = this.model.f_collection
-        let param = this.disCountInfo
-        param.f_collection = this.model.f_collection
-        param.f_pregas = this.model.f_pregas
-        let privilegeData = await this.$resetpost('api/af-revenue/logic/calculateDiscount', param, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
-        // 减免金额
-        this.model.f_privilege_money = privilegeData.data.f_privilege_money
-        this.model.f_privilege_gas = privilegeData.data.f_privilege_gas
-        // 减免后收款金额
-        this.model.f_after_discount = privilegeData.data.f_collection
+        // if (this.hasDisCount) {
+        //   this.calDisCount()
+        // }
       },
+      // async calDisCount () {
+      //   // 初始化减免金额
+      //   this.model.f_privilege_money = 0
+      //   this.model.f_after_discount = this.model.f_collection
+      //   let param = this.disCountInfo
+      //   param.f_collection = this.model.f_collection
+      //   param.f_pregas = this.model.f_pregas
+      //   let privilegeData = await this.$resetpost('api/af-revenue/logic/calculateDiscount', param, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
+      //   // 减免金额
+      //   this.model.f_privilege_money = privilegeData.data.f_privilege_money
+      //   this.model.f_privilege_gas = privilegeData.data.f_privilege_gas
+      //   // 减免后收款金额
+      //   this.model.f_after_discount = privilegeData.data.f_collection
+      // },
       // 优惠计算
       async privilegeCalculate () {
         // 初始化减免金额

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

@@ -156,7 +156,8 @@
           </div>
           <div class="row" v-if="!config.notShowFormula">
             <div class="col-sm-4 col-sm-offset-8">
-              <strong>计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong>
+              <strong>计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong><br/>
+              <strong style="font-size: large" v-if="deductdetail">{{deductdetail ? deductdetail : ' 暂无'}}</strong><br/>
             </div>
           </div>
           <div class="row">
@@ -213,6 +214,9 @@
     self.model.f_preamount = calFee - (dymoney - 0)
     self.model.chargeprice = getGas.data.chargeprice
     Object.assign(self.model, self.model, getGas.data)
+    if(self.row.f_deduction_gas && self.row.f_deduction_gas>0){
+      self.model.f_pregas += self.row.f_deduction_gas
+    }
     self.model.f_totalcost = ((self.model.f_totalcost - 0) - (dymoney - 0)).toFixed(4)
     // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
     if (self.config.floor) {
@@ -230,7 +234,16 @@
     }
     if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
       self.model.f_meter_type = self.row.f_meter_type
-      let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
+      let getAmount
+      if (self.row.f_deduction_gas) {
+        let gas = (self.model.f_pregas - 0) - self.row.f_deduction_gas
+        if (gas < 0) {
+          gas = 0
+        }
+        getAmount = await self.$CommonService.gasCalculate(self.model, gas)
+      } else {
+        getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
+      }
       self.model.f_preamount = getAmount.data.chargenum
       self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(4))
       Object.assign(self.model, self.model, getAmount.data)
@@ -336,20 +349,20 @@
       }
     }
     // 获取优惠信息
-    if (self.config.newDiscount) {
-      let nowrite_param = {
-        f_userfiles_id: self.row.f_userfiles_id
-      }
-      let getDiscount = await self.$resetpost('api/af-revenue/logic/getDiscountInfo', {data: nowrite_param}, {
-        resolveMsg: null,
-        newly: true,
-        rejectMsg: '获取优惠信息失败！！'
-      })
-      if (getDiscount.data.leftDiscount > 0) {
-        self.disCountInfo = getDiscount.data
-        self.hasDisCount = true
-      }
-    }
+    // if (self.config.newDiscount) {
+    //   let nowrite_param = {
+    //     f_userfiles_id: self.row.f_userfiles_id
+    //   }
+    //   let getDiscount = await self.$resetpost('api/af-revenue/logic/getDiscountInfo', {data: nowrite_param}, {
+    //     resolveMsg: null,
+    //     newly: true,
+    //     rejectMsg: '获取优惠信息失败！！'
+    //   })
+    //   if (getDiscount.data.leftDiscount > 0) {
+    //     self.disCountInfo = getDiscount.data
+    //     self.hasDisCount = true
+    //   }
+    // }
   }
   export default {
     title: '无卡收费',
@@ -383,6 +396,7 @@
           f_privilege_gas: 0,
           f_privilege_money: 0,
           f_after_discount: 0,
+          f_deduction_gas:0,
           getDeduct: 0,
           f_collection: '',
           f_balance: 0,
@@ -391,6 +405,7 @@
           f_voucher_number: ''
         },
         calculatedetail: '',
+        deductdetail: '',
         print: false,
         billData: {
           url: 'api/af-revenue/report/card_bill',
@@ -512,24 +527,24 @@
           }
           this.privilegeCalculate()
         }
-        if (this.hasDisCount) {
-          this.calDisCount()
-        }
-      },
-      async calDisCount () {
-        // 初始化减免金额
-        this.model.f_privilege_money = 0
-        this.model.f_after_discount = this.model.f_collection
-        let param = this.disCountInfo
-        param.f_collection = this.model.f_collection
-        param.f_pregas = this.model.f_pregas
-        let privilegeData = await this.$resetpost('api/af-revenue/logic/calculateDiscount', param, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
-        // 减免金额
-        this.model.f_privilege_money = privilegeData.data.f_privilege_money
-        this.model.f_privilege_gas = privilegeData.data.f_privilege_gas
-        // 减免后收款金额
-        this.model.f_after_discount = privilegeData.data.f_collection
+        // if (this.hasDisCount) {
+        //   this.calDisCount()
+        // }
       },
+      // async calDisCount () {
+      //   // 初始化减免金额
+      //   this.model.f_privilege_money = 0
+      //   this.model.f_after_discount = this.model.f_collection
+      //   let param = this.disCountInfo
+      //   param.f_collection = this.model.f_collection
+      //   param.f_pregas = this.model.f_pregas
+      //   let privilegeData = await this.$resetpost('api/af-revenue/logic/calculateDiscount', param, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
+      //   // 减免金额
+      //   this.model.f_privilege_money = privilegeData.data.f_privilege_money
+      //   this.model.f_privilege_gas = privilegeData.data.f_privilege_gas
+      //   // 减免后收款金额
+      //   this.model.f_after_discount = privilegeData.data.f_collection
+      // },
       // 优惠计算
       async privilegeCalculate () {
         // 初始化减免金额
@@ -607,6 +622,15 @@
         }
       },
       calText (val) {
+        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
+          }
+        }
         let str = ''
         val.forEach((item) => {
           str = str + item.f_price + ' x ' + item.f_gas + '+'

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

@@ -198,6 +198,7 @@
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
           <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/>
           <strong style="font-size: 16px"
                   v-if="!config.notShowFormula && pricetext">合表气价:{{ pricetext }}</strong><br/>
           <text style="font-size: 16px;font-style: italic;" class="text-info"
@@ -317,6 +318,9 @@ let preamountGen = async function (self) {
     self.model.f_collection = Math.ceil(self.model.f_collection)
   }
   self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
+  if(self.row.f_deduction_gas && self.row.f_deduction_gas>0){
+    self.model.f_pregas += self.row.f_deduction_gas
+  }
   self.calText(getGas.data.chargeprice)
   self.pricetext = getGas.data.chargeprice[0].pricetext ? getGas.data.chargeprice[0].pricetext : null
 }
@@ -330,7 +334,18 @@ let pregasGen = async function (self) {
   }
   if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
     self.model.f_meter_type = self.row.f_meter_type
-    let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
+    let getAmount
+    if (self.row.f_deduction_gas) {
+      let gas = (self.model.f_pregas - 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, self.model.f_pregas)
+    }
     self.model.f_preamount = getAmount.data.chargenum
     self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4))
     Object.assign(self.model, self.model, getAmount.data)
@@ -474,20 +489,20 @@ let asyncShowCardSellGas = async function (self) {
     }
   }
   // 获取优惠信息
-  if (self.config.newDiscount) {
-    let nowrite_param = {
-      f_userfiles_id: self.row.f_userfiles_id
-    }
-    let getDiscount = await self.$resetpost('api/af-revenue/logic/getDiscountInfo', {data: nowrite_param}, {
-      resolveMsg: null,
-      newly: true,
-      rejectMsg: '获取优惠信息失败！！'
-    })
-    if (getDiscount.data.leftDiscount > 0) {
-      self.disCountInfo = getDiscount.data
-      self.hasDisCount = true
-    }
-  }
+  // if (self.config.newDiscount) {
+  //   let nowrite_param = {
+  //     f_userfiles_id: self.row.f_userfiles_id
+  //   }
+  //   let getDiscount = await self.$resetpost('api/af-revenue/logic/getDiscountInfo', {data: nowrite_param}, {
+  //     resolveMsg: null,
+  //     newly: true,
+  //     rejectMsg: '获取优惠信息失败！！'
+  //   })
+  //   if (getDiscount.data.leftDiscount > 0) {
+  //     self.disCountInfo = getDiscount.data
+  //     self.hasDisCount = true
+  //   }
+  // }
 }
 
 export default {
@@ -522,6 +537,7 @@ export default {
         f_collection: '',
         chargeprice: [],
         f_print: [],
+        f_deduction_gas: 0,
         f_meter_type: '',
         f_voucher_number: '',
         f_privilege_id: 0,
@@ -531,7 +547,7 @@ export default {
       },
       cardallot: null,
       calculatedetail: '',
-
+      deductdetail:'',
       billData: {
         url: 'api/af-revenue/report/sendCard_bill',
         bill: ''
@@ -810,6 +826,15 @@ export default {
       this.$dispatch('success')
     },
     calText (val) {
+      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
+        }
+      }
       let str = ''
       let num = 0
       val.forEach((item) => {
@@ -862,24 +887,24 @@ export default {
         }
         this.privilegeCalculate()
       }
-      if (this.hasDisCount) {
-        this.calDisCount()
-      }
-    },
-    async calDisCount () {
-      // 初始化减免金额
-      this.model.f_privilege_money = 0
-      this.model.f_after_discount = this.model.f_collection
-      let param = this.disCountInfo
-      param.f_collection = this.model.f_collection
-      param.f_pregas = this.model.f_pregas
-      let privilegeData = await this.$resetpost('api/af-revenue/logic/calculateDiscount', param, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
-      // 减免金额
-      this.model.f_privilege_money = privilegeData.data.f_privilege_money
-      this.model.f_privilege_gas = privilegeData.data.f_privilege_gas
-      // 减免后收款金额
-      this.model.f_after_discount = privilegeData.data.f_collection
+      // if (this.hasDisCount) {
+      //   this.calDisCount()
+      // }
     },
+    // async calDisCount () {
+    //   // 初始化减免金额
+    //   this.model.f_privilege_money = 0
+    //   this.model.f_after_discount = this.model.f_collection
+    //   let param = this.disCountInfo
+    //   param.f_collection = this.model.f_collection
+    //   param.f_pregas = this.model.f_pregas
+    //   let privilegeData = await this.$resetpost('api/af-revenue/logic/calculateDiscount', param, {resolveMsg: null, rejectMsg: '计算优惠金额出错'})
+    //   // 减免金额
+    //   this.model.f_privilege_money = privilegeData.data.f_privilege_money
+    //   this.model.f_privilege_gas = privilegeData.data.f_privilege_gas
+    //   // 减免后收款金额
+    //   this.model.f_after_discount = privilegeData.data.f_collection
+    // },
     // 优惠计算
     async privilegeCalculate () {
       // 初始化减免金额

package/src/main.js

@@ -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

@@ -52,6 +52,7 @@ let CardService = {
       f_price: f_price,
       inputprice: inputprice,
       f_userfiles_id: row.f_userfiles_id,
+      f_deduction_gas:model.f_deduction_gas?model.f_deduction_gas:0,
       f_pregas: model.f_pregas,
       f_preamount: model.f_preamount,
       f_balance: row.f_balance,
@@ -302,6 +303,7 @@ let CardService = {
       f_alias: row.f_alias,
       garbage_number: model.garbage_number,
       garbage_money: model.garbage_money,
+      f_deduction_gas:model.f_deduction_gas?model.f_deduction_gas:0,
       f_serial_id: model.f_serial_id,
       f_userinfo_id: row.f_userinfo_id,
       f_serial_number: f_serial_number,
@@ -474,6 +476,7 @@ let CardService = {
       f_pregas: model.f_pregas,
       f_write_money: model.f_write_money,
       f_balance: row.f_balance,
+      f_deduction_gas:model.f_deduction_gas?model.f_deduction_gas:0,
       // 优惠金额
       f_privilege_money: model.f_privilege_money,
       f_privilege_gas: f_privilege_gas,