sale-client 3.6.138 → 3.6.140

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 (7) hide show
  1. package/package.json +1 -1
  2. package/src/components/charge/business/IOTMeterCenter.vue +1 -1
  3. package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackRecordQuery.vue +1 -3
  4. package/src/filiale/guangxi/CardService.js +8 -3
  5. package/src/filiale/liaoyuan/PriceChangeCompensation/SurplusRecordDetail.vue +6 -4
  6. package/src/filiale/wenxi/CardService.js +7 -3
  7. package/src/plugins/CardService.js +6 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.138",
3
+ "version": "3.6.140",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/charge/business/IOTMeterCenter.vue CHANGED
@@ -619,7 +619,7 @@
619
619
  // 根据收款金额计算划价信息
620
620
  // 需要配置 calculatePreByCollection = true
621
621
  async calculatePreByCollection () {
622
- if (this.alldue_fee > this.model.f_collection) {
622
+ if (this.alldue_fee > ((this.model.f_collection - 0) + (this.row.f_balance - 0))) {
623
623
  this.$showAlert('收款不能小于旧表机表欠费，请重新输入', 'danger', 5000)
624
624
  this.model.f_collection = undefined
625
625
  return
package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackRecordQuery.vue CHANGED
@@ -137,9 +137,7 @@
137
137
  data () {
138
138
  return {
139
139
  initres: {
140
- org: [this.$login.f.orgid],
141
- dep: [],
142
- user: []
140
+ org: [this.$login.f.orgid]
143
141
  },
144
142
  criteriaShow: false,
145
143
  model: new PagedList('rs/sql/sale_blackRecordQuery', 20),
package/src/filiale/guangxi/CardService.js CHANGED
@@ -983,12 +983,17 @@ let sendCardSaleGasGenremanent = async function (model, row) {
983
983
  dqdm: row.f_area_code, // 精益工业地区代码
984
984
  klx: row.f_coding
985
985
  }
986
+ // 判断是否是累购表
987
+
988
+ params = Object.assign({}, Vue.CommonService.writeCardParams(cardParams), params)
989
+
986
990
  // 判断是否是累购表
987
991
  if (row.f_support_purchase === '是') {
988
- params.ljgql = (row.f_write_totalgas - 0) + (model.f_pregas - 0) + (model.f_fill_gas - 0)
989
- params.ljgqje = (row.f_write_totalfee - 0) + (model.f_preamount - 0) + (model.f_fill_money - 0)
992
+ params.ljgql = (row.f_write_totalgas - 0) + (model.f_pregas - 0)
993
+ params.ljgqje = (row.f_write_totalfee - 0) + (model.f_preamount - 0)
994
+ params.totalmoney = (row.f_write_totalfee - 0) + (model.f_preamount - 0)
990
995
  }
991
- params = Object.assign({}, Vue.CommonService.writeCardParams(cardParams), params)
996
+
992
997
  console.log('换表发卡写卡参数', params)
993
998
  let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
994
999
  resolveMsg: null,
package/src/filiale/liaoyuan/PriceChangeCompensation/SurplusRecordDetail.vue CHANGED
@@ -4,8 +4,9 @@
4
4
  <template partial='head' >
5
5
  <tr>
6
6
  <th style="text-align: center"><nobr>序号</nobr></th>
7
- <th style="text-align: center"><nobr>旧气价</nobr></th>
8
- <th style="text-align: center"><nobr>新气价</nobr></th>
7
+ <th style="text-align: center"><nobr>一阶补差单价</nobr></th>
8
+ <th style="text-align: center"><nobr>二阶补差单价</nobr></th>
9
+ <th style="text-align: center"><nobr>三阶补差单价</nobr></th>
9
10
  <th style="text-align: center"><nobr>补差气量</nobr></th>
10
11
  <th style="text-align: center"><nobr>补差金额</nobr></th>
11
12
 
@@ -19,8 +20,9 @@
19
20
  <template partial='body' >
20
21
  <tr >
21
22
  <td style="text-align: center;">{{$index + 1}}</td>
22
- <td style="text-align: center;">{{row.f_old_price}}</td>
23
- <td style="text-align: center;">{{row.f_new_price}}</td>
23
+ <td style="text-align: center;">{{row.f_change_price1}}</td>
24
+ <td style="text-align: center;">{{row.f_change_price2}}</td>
25
+ <td style="text-align: center;">{{row.f_change_price3}}</td>
24
26
  <td style="text-align: center;">{{row.f_real_amount}}</td>
25
27
  <td style="text-align: center;">{{row.f_surplus_fee}}</td>
26
28
 
package/src/filiale/wenxi/CardService.js CHANGED
@@ -655,8 +655,8 @@ let sendCardSaleGasGenremanent = async function (model, row) {
655
655
  csql: '0', // 上次购气量，新开户为0
656
656
  ccsql: '0', // 上上次购气量，新开户为0
657
657
  cs: '1', // 求购气次数，先开户为1
658
- ljgql: (row.f_total_gas - 0) + (model.f_pregas - 0), // 当前累计购气量
659
- ljgqje: (row.f_total_fee - 0) + (model.f_preamount - 0), // 累计购气金额
658
+ ljgql: (row.f_write_totalgas - 0) + (model.f_pregas - 0), // 当前累计购气量
659
+ ljgqje: (row.f_write_totalfee - 0) + (model.f_preamount - 0), // 累计购气金额
660
660
  bkcs: '0', // 新开户卡，为0
661
661
  ljyql: '0', // 累积用气量，有些表要累加原来用气量,新开户卡，为0
662
662
  bjql: row.f_police_gas, // 报警气量,t_gasbrand表中
@@ -668,12 +668,16 @@ let sendCardSaleGasGenremanent = async function (model, row) {
668
668
  dqdm: row.f_area_code, // 精益工业地区代码
669
669
  klx: row.f_coding
670
670
  }
671
+
672
+ params = Object.assign({}, Vue.CommonService.writeCardParams(cardParams), params)
673
+
671
674
  // 判断是否是累购表
672
675
  if (row.f_support_purchase === '是') {
673
676
  params.ljgql = (row.f_write_totalgas - 0) + (model.f_pregas - 0)
674
677
  params.ljgqje = (row.f_write_totalfee - 0) + (model.f_preamount - 0)
678
+ params.totalmoney = (row.f_write_totalfee - 0) + (model.f_preamount - 0)
675
679
  }
676
- params = Object.assign({}, Vue.CommonService.writeCardParams(cardParams), params)
680
+
677
681
  console.log('换表发卡写卡参数', params)
678
682
  let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
679
683
  resolveMsg: null,
package/src/plugins/CardService.js CHANGED
@@ -665,8 +665,8 @@ let sendCardSaleGasGenremanent = async function (model, row) {
665
665
  csql: '0', // 上次购气量，新开户为0
666
666
  ccsql: '0', // 上上次购气量，新开户为0
667
667
  cs: '1', // 求购气次数，先开户为1
668
- ljgql: (row.f_total_gas - 0) + (model.f_pregas - 0), // 当前累计购气量
669
- ljgqje: (row.f_total_fee - 0) + (model.f_preamount - 0), // 累计购气金额
668
+ ljgql: (row.f_write_totalgas - 0) + (model.f_pregas - 0), // 当前累计购气量
669
+ ljgqje: (row.f_write_totalfee - 0) + (model.f_preamount - 0), // 累计购气金额
670
670
  bkcs: '0', // 新开户卡，为0
671
671
  ljyql: '0', // 累积用气量，有些表要累加原来用气量,新开户卡，为0
672
672
  bjql: row.f_police_gas, // 报警气量,t_gasbrand表中
@@ -678,12 +678,15 @@ let sendCardSaleGasGenremanent = async function (model, row) {
678
678
  dqdm: row.f_area_code, // 精益工业地区代码
679
679
  klx: row.f_coding
680
680
  }
681
+
682
+ params = Object.assign({}, Vue.CommonService.writeCardParams(cardParams), params)
683
+
681
684
  // 判断是否是累购表
682
685
  if (row.f_support_purchase === '是') {
683
686
  params.ljgql = (row.f_write_totalgas - 0) + (model.f_pregas - 0)
684
687
  params.ljgqje = (row.f_write_totalfee - 0) + (model.f_preamount - 0)
688
+ params.totalmoney = (row.f_write_totalfee - 0) + (model.f_preamount - 0)
685
689
  }
686
- params = Object.assign({}, Vue.CommonService.writeCardParams(cardParams), params)
687
690
  console.log('换表发卡写卡参数', params)
688
691
  let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
689
692
  resolveMsg: null,