sale-client 3.6.149 → 3.6.150

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/filiale/lixianV3/components/charge/IOTMeterCenter.vue +5 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.149",
3
+ "version": "3.6.150",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/filiale/lixianV3/components/charge/IOTMeterCenter.vue CHANGED
@@ -638,7 +638,11 @@
638
638
  let calFee = ((this.model.f_collection - 0) + (this.row.f_balance) - (this.alldue_fee)).toFixed(4)
639
639
  // 通过收款进行划价
640
640
  let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
641
- this.model.f_pregas = parseInt(getGas.data.gas)
641
+ if (this.row.f_isdecimal === '是') {
642
+ this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
643
+ } else {
644
+ this.model.f_pregas = parseInt(getGas.data.gas)
645
+ }
642
646
  let dymoney2 = await this.$CommonService.gasCalculate(this.model, this.model.f_pregas)
643
647
  this.model.chargeprice = dymoney2.data.chargeprice
644
648
  Object.assign(this.model, this.model, dymoney2.data)