sale-client 3.6.143 → 3.6.145

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 (18) hide show
  1. package/build/dev-server.js +1 -1
  2. package/package.json +1 -1
  3. package/src/App.vue +1 -3
  4. package/src/components/charge/business/IOTMeterCenter.vue +5 -1
  5. package/src/components/revenue/cardHandManage/cardsHand.vue +1 -1
  6. package/src/components/revenue/comprehen/Bill/paper/BillList.vue +1 -1
  7. package/src/filiale/lixianV3/components/charge/CardMeterCenter.vue +955 -0
  8. package/src/filiale/lixianV3/components/charge/IOTMeterCenter.vue +866 -0
  9. package/src/filiale/lixianV3/sale.js +2 -0
  10. package/src/filiale/tongchuan/bill/EticketPrint.vue +3 -0
  11. package/src/filiale/tongchuan/bill/EticketRecordList.vue +2 -2
  12. package/src/filiale/wenxi/Userinfo.vue +280 -0
  13. package/src/filiale/wenxi/cardsHand.vue +8 -5
  14. package/src/filiale/wenxi/sale.js +2 -0
  15. package/src/filiale/zhongyi/cardsHand.vue +1008 -0
  16. package/src/filiale/zhongyi/machineHand.vue +131 -2
  17. package/src/filiale/zhongyi/sale.js +2 -0
  18. package/src/main.js +8 -0
package/build/dev-server.js CHANGED
@@ -1,5 +1,5 @@
1
1
  var path = require('path')
2
- const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080/']
2
+ const [ serverRul, localUrl ] = ['https://qnjtkf.cn:7401/', 'https://qnjtkf.cn:7401/']
3
3
  var merge = require('webpack-merge')
4
4
  var baseConfig = require('./webpack.dev.conf')
5
5
  var devConfig = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.143",
3
+ "version": "3.6.145",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/App.vue CHANGED
@@ -10,10 +10,8 @@
10
10
  </template>
11
11
 
12
12
  <script>
13
- import Vue from 'vue'
14
13
 
15
14
  export default {
16
- ready () {
17
- }
15
+ ready () {}
18
16
  }
19
17
  </script>
package/src/components/charge/business/IOTMeterCenter.vue CHANGED
@@ -629,7 +629,11 @@
629
629
  let calFee = ((this.model.f_collection - 0) + (this.row.f_balance) - (this.alldue_fee)).toFixed(4)
630
630
  // 通过收款进行划价
631
631
  let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
632
- this.model.f_pregas = parseInt(getGas.data.gas)
632
+ if (this.row.f_isdecimal === '是') {
633
+ this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
634
+ } else {
635
+ this.model.f_pregas = parseInt(getGas.data.gas)
636
+ }
633
637
  let dymoney2 = await this.$CommonService.gasCalculate(this.model, this.model.f_pregas)
634
638
  this.model.chargeprice = dymoney2.data.chargeprice
635
639
  Object.assign(this.model, this.model, dymoney2.data)
package/src/components/revenue/cardHandManage/cardsHand.vue CHANGED
@@ -607,7 +607,7 @@ export default {
607
607
  if (!row.f_tablebase || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(3) < 0) {
608
608
  return
609
609
  }
610
- if (row.f_tablebase.toString().split(".")[1].length>3) {
610
+ if (row.f_tablebase.toString().split(".").length>1 && row.f_tablebase.toString().split(".")[1].length>3) {
611
611
  Vue.set(row, 'error', '底数最多只能输入小数点后3位')
612
612
  return
613
613
  }
package/src/components/revenue/comprehen/Bill/paper/BillList.vue CHANGED
@@ -75,7 +75,7 @@
75
75
  </td>
76
76
  <td style="text-align:center">已{{row.f_bill_state}}</td>
77
77
  <td style="text-align:center">
78
- <dropdown v-if="row.f_using_number != row.f_end_number">
78
+ <dropdown>
79
79
  <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
80
80
  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
81
81
  </button>