sale-client 4.2.75 → 4.2.77

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.
@@ -92,4 +92,6 @@ export default function () {
92
92
  Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
93
93
  // 售气收费 --弹出框
94
94
  Vue.component('charge-modal', (resolve) => { require(['./ChargeModal'], resolve) })
95
+ // 物联网表收费
96
+ Vue.component('iot-meter-center', (resolve) => { require(['./IOTMeterCenter'], resolve) })
95
97
  }
@@ -694,7 +694,7 @@
694
694
  // 通过收款进行划价
695
695
  let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
696
696
  if (this.row.f_isdecimal === '是') {
697
- this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
697
+ this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
698
698
  } else {
699
699
  this.model.f_pregas = parseInt(getGas.data.gas)
700
700
  }
@@ -635,7 +635,7 @@
635
635
  // 通过收款进行划价
636
636
  let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
637
637
  if (this.row.f_isdecimal === '是') {
638
- this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
638
+ this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
639
639
  } else {
640
640
  this.model.f_pregas = parseInt(getGas.data.gas)
641
641
  }
@@ -638,7 +638,7 @@
638
638
  // 通过收款进行划价
639
639
  let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
640
640
  if (this.row.f_isdecimal === '是') {
641
- this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
641
+ this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
642
642
  } else {
643
643
  this.model.f_pregas = parseInt(getGas.data.gas)
644
644
  }
@@ -634,7 +634,7 @@
634
634
  // 通过收款进行划价
635
635
  let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
636
636
  if (this.row.f_isdecimal === '是') {
637
- this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
637
+ this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
638
638
  } else {
639
639
  this.model.f_pregas = parseInt(getGas.data.gas)
640
640
  }
@@ -636,7 +636,7 @@ export default {
636
636
  // 通过收款进行划价
637
637
  let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
638
638
  if (this.row.f_isdecimal === '是') {
639
- this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
639
+ this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
640
640
  } else {
641
641
  this.model.f_pregas = parseInt(getGas.data.gas)
642
642
  }
@@ -706,7 +706,7 @@
706
706
  // 通过收款进行划价
707
707
  let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
708
708
  if (this.row.f_isdecimal === '是') {
709
- this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
709
+ this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
710
710
  } else {
711
711
  this.model.f_pregas = parseInt(getGas.data.gas)
712
712
  }
@@ -655,7 +655,7 @@
655
655
  // 通过收款进行划价
656
656
  let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
657
657
  if (this.row.f_isdecimal === '是') {
658
- this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
658
+ this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
659
659
  } else {
660
660
  this.model.f_pregas = parseInt(getGas.data.gas)
661
661
  }
@@ -644,7 +644,7 @@
644
644
  // 通过收款进行划价
645
645
  let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
646
646
  if (this.row.f_isdecimal === '是') {
647
- this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
647
+ this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
648
648
  } else {
649
649
  this.model.f_pregas = parseInt(getGas.data.gas)
650
650
  }
@@ -634,7 +634,7 @@ export default {
634
634
  // 通过收款进行划价
635
635
  let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
636
636
  if (this.row.f_isdecimal === '是') {
637
- this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
637
+ this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
638
638
  } else {
639
639
  this.model.f_pregas = parseInt(getGas.data.gas)
640
640
  }
@@ -634,7 +634,7 @@
634
634
  // 通过收款进行划价
635
635
  let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
636
636
  if (this.row.f_isdecimal === '是') {
637
- this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
637
+ this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
638
638
  } else {
639
639
  this.model.f_pregas = parseInt(getGas.data.gas)
640
640
  }
package/src/main.js CHANGED
@@ -2,7 +2,7 @@ import Vue from 'vue'
2
2
  import all from 'vue-client/src/all'
3
3
  import App from './App'
4
4
  import system from 'system-clients/src/system'
5
- import FilialeSale from './filiale/ruihua/sale'
5
+ // import FilialeSale from './filiale/jinhong/sale'
6
6
  import sale from './sale'
7
7
  import address from 'address-client/src/address'
8
8
  import ldap from 'ldap-clients/src/ldap'
@@ -24,7 +24,7 @@ system(false)
24
24
  sale()
25
25
  address()
26
26
  ldap()
27
- FilialeSale()
27
+ // FilialeSale()
28
28
  require('system-clients/src/styles/less/bootstrap.less')
29
29
 
30
30
  new Vue({