sale-client 3.6.215 → 3.6.216

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 (3) hide show
  1. package/package.json +1 -1
  2. package/src/filiale/tongchuan/bill/EticketPrint.vue +1 -1
  3. package/src/plugins/CardService.js +77 -77
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.215",
3
+ "version": "3.6.216",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/filiale/tongchuan/bill/EticketPrint.vue CHANGED
@@ -124,7 +124,7 @@ export default {
124
124
  }
125
125
  // TODO 组织开票数据并保存
126
126
  const res = await this.$resetpost('/invoice/rs/logic/getInvoice', model, {resolveMsg: null, rejectMsg: '开票请求失败'})
127
- if (res.data.code == '0000') {
127
+ if (res.data.code === 200 && res.data.data.code == '0000') {
128
128
  this.return_msg = '发票开具成功，请稍后到发票管理页面查看或打印'
129
129
  } else {
130
130
  this.return_msg = '发票开具失败，请稍后到发票管理页面补打或重开'
package/src/plugins/CardService.js CHANGED
@@ -691,7 +691,7 @@ let sendCardSaleGasGenremanent = async function (model, row) {
691
691
  let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
692
692
  resolveMsg: null,
693
693
  rejectMsg: '开户卡服务错误'
694
- })
694
+ },80000)
695
695
  if (!cardParams || ((model.f_pregas > model.f_remanent_gas) && !result) || cardRes.data.Err || cardRes.data.Exception) {
696
696
  // 写卡异常
697
697
  // 数据回滚操作
@@ -798,7 +798,7 @@ let resetsendCardSaleGasGen = async function (model, row) {
798
798
  let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
799
799
  resolveMsg: null,
800
800
  rejectMsg: '重开户卡服务错误'
801
- })
801
+ },80000)
802
802
  if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
803
803
  // 写卡异常
804
804
  // 数据回滚操作
@@ -907,7 +907,7 @@ let sendCardSaleGasGen = async function (model, row) {
907
907
  let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
908
908
  resolveMsg: null,
909
909
  rejectMsg: '开户卡服务错误'
910
- })
910
+ },80000)
911
911
  if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
912
912
  // 写卡异常
913
913
  // 数据回滚操作
@@ -1116,7 +1116,7 @@ let replaceCardGenJB = function * (model, row) {
1116
1116
  let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
1117
1117
  resolveMsg: null,
1118
1118
  rejectMsg: '补卡卡服务错误'
1119
- }))
1119
+ },80000))
1120
1120
  // 卡服务写卡异常，业务逻辑回滚
1121
1121
  if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
1122
1122
  Vue.$showAlert('机表补卡失败!!', 'danger', 0)
@@ -1204,7 +1204,7 @@ let replaceXq = function * (model, row) {
1204
1204
  let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
1205
1205
  resolveMsg: null,
1206
1206
  rejectMsg: '擦虚气服务错误'
1207
- }))
1207
+ },80000))
1208
1208
  if (cardRes.data.Err || cardRes.data.Exception) {
1209
1209
  return {status: 1}
1210
1210
  } else {
@@ -1290,7 +1290,7 @@ let replaceCardGen = function * (model, row, allot) {
1290
1290
  let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
1291
1291
  resolveMsg: null,
1292
1292
  rejectMsg: '补卡卡服务错误'
1293
- }))
1293
+ },80000))
1294
1294
  // 卡服务写卡异常，业务逻辑回滚
1295
1295
  if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
1296
1296
  Vue.$showAlert('补卡失败!!', 'danger', 0)
@@ -1424,14 +1424,14 @@ let offlineWriteGen = async function (row) {
1424
1424
  param.kzt = result.data.ispick === '未过表' && result.data.lastsell_oper === '发卡售气' ? '0' : '1'
1425
1425
  param.cs = row.cardInfo.Times + 1
1426
1426
  param.bkcs = param.bkcs + 1
1427
- cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'})
1427
+ cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'},80000)
1428
1428
  } else if (row.states === '换表') {
1429
1429
  param.kzt = '0'
1430
1430
  param.bkcs = param.bkcs + 1
1431
1431
  param.cs = 1
1432
- cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'})
1432
+ cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'},80000)
1433
1433
  } else {
1434
- cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', param, {resolveMsg: null, rejectMsg: '写卡失败'})
1434
+ cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', param, {resolveMsg: null, rejectMsg: '写卡失败'},80000)
1435
1435
  }
1436
1436
  if (!cardParams || cardRes.data.Err || cardRes.data.Exception) {
1437
1437
  let sql = `update t_sellinggas set
@@ -1706,27 +1706,57 @@ let marginGen = async function (model, row) {
1706
1706
  params2.kzt = result.data.ispick === '未过表' && result.data.lastsell_oper === '发卡售气' ? '0' : '1'
1707
1707
  cardparam = JSON.stringify(params2)
1708
1708
  cardpost = 'WriteNewCard'
1709
- cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'})
1709
+ cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
1710
1710
  } else if (result.data.last_oper === '换表') {
1711
1711
  console.log('我走的是写新卡换表')
1712
1712
  cardparam = JSON.stringify(params3)
1713
1713
  cardpost = 'WriteNewCard'
1714
- cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'})
1714
+ cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
1715
1715
  } else if (result.data.last_oper === '换表补气') {
1716
1716
  // 累购金额需要将上次购气金额加上
1717
1717
  console.log('我走的是正常的收费', params)
1718
1718
  cardparam = JSON.stringify(params)
1719
1719
  cardpost = 'WriteGasCard'
1720
- cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'})
1720
+ cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
1721
1721
  } else {
1722
1722
  console.log('我走的是正常的收费', params)
1723
1723
  cardparam = JSON.stringify(params)
1724
1724
  cardpost = 'WriteGasCard'
1725
- cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'})
1725
+ cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
1726
1726
  }
1727
1727
  console.log('卡表收费返回写卡参数值', cardRes)
1728
1728
  // 卡服务写卡异常，业务逻辑回滚
1729
1729
  if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
1730
+ if (result) {
1731
+ let data = {
1732
+ cardparam: cardparam,
1733
+ cardpost: cardpost,
1734
+ id: result.data.id,
1735
+ userinfo: {
1736
+ f_userinfo_id: row.f_userinfo_id,
1737
+ version: row.userinfo_version + 1,
1738
+ f_balance: row.f_balance,
1739
+ userfiles: {
1740
+ f_user_id: model.f_user_id,
1741
+ f_userfiles_id: row.f_userfiles_id,
1742
+ f_total_gas: row.f_total_gas,
1743
+ f_write_totalgas: row.f_write_totalgas,
1744
+ f_write_totalfee: row.f_write_totalfee,
1745
+ f_total_fee: row.f_total_fee,
1746
+ f_card_id: row.f_card_id,
1747
+ f_times: row.cardInfo.Times,
1748
+ version: row.version + 1
1749
+ }
1750
+ }
1751
+ }
1752
+ if (row.f_tag) {
1753
+ data.userinfo.userfiles.f_tag = row.f_tag
1754
+ }
1755
+ if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_meter_type === '物联网表' && row.f_hascard === '是' && row.f_share_times === '是') {
1756
+ data.userinfo.userfiles.f_times = row.f_times
1757
+ }
1758
+ await Vue.resetpost('rs/logic/cardChargeRollback', {data: data}, {resolveMsg: '卡表收费失败', rejectMsg: '卡表收费失败'})
1759
+ }
1730
1760
  throw `卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`
1731
1761
  } else {
1732
1762
  // 调用读卡进行校验
@@ -1754,36 +1784,6 @@ let marginGen = async function (model, row) {
1754
1784
  throw new Error(`请检查卡是否插好！！`)
1755
1785
  }
1756
1786
  } catch (error) {
1757
- if (result) {
1758
- let data = {
1759
- cardparam: cardparam,
1760
- cardpost: cardpost,
1761
- id: result.data.id,
1762
- userinfo: {
1763
- f_userinfo_id: row.f_userinfo_id,
1764
- version: row.userinfo_version + 1,
1765
- f_balance: row.f_balance,
1766
- userfiles: {
1767
- f_user_id: model.f_user_id,
1768
- f_userfiles_id: row.f_userfiles_id,
1769
- f_total_gas: row.f_total_gas,
1770
- f_write_totalgas: row.f_write_totalgas,
1771
- f_write_totalfee: row.f_write_totalfee,
1772
- f_total_fee: row.f_total_fee,
1773
- f_card_id: row.f_card_id,
1774
- f_times: row.cardInfo.Times,
1775
- version: row.version + 1
1776
- }
1777
- }
1778
- }
1779
- if (row.f_tag) {
1780
- data.userinfo.userfiles.f_tag = row.f_tag
1781
- }
1782
- if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_meter_type === '物联网表' && row.f_hascard === '是' && row.f_share_times === '是') {
1783
- data.userinfo.userfiles.f_times = row.f_times
1784
- }
1785
- await Vue.resetpost('rs/logic/cardChargeRollback', {data: data}, {resolveMsg: '卡表收费失败', rejectMsg: '卡表收费失败'})
1786
- }
1787
1787
  throw error
1788
1788
  }
1789
1789
  }
@@ -1902,27 +1902,57 @@ let sellgasGen = async function (model, row) {
1902
1902
  params2.kzt = result.data.ispick === '未过表' && result.data.lastsell_oper === '发卡售气' ? '0' : '1'
1903
1903
  cardparam = JSON.stringify(params2)
1904
1904
  cardpost = 'WriteNewCard'
1905
- cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'})
1905
+ cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
1906
1906
  } else if (result.data.last_oper === '换表') {
1907
1907
  console.log('我走的是写新卡换表')
1908
1908
  cardparam = JSON.stringify(params3)
1909
1909
  cardpost = 'WriteNewCard'
1910
- cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'})
1910
+ cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
1911
1911
  } else if (result.data.last_oper === '换表补气') {
1912
1912
  // 累购金额需要将上次购气金额加上
1913
1913
  console.log('我走的是正常的收费', params)
1914
1914
  cardparam = JSON.stringify(params)
1915
1915
  cardpost = 'WriteGasCard'
1916
- cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'})
1916
+ cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
1917
1917
  } else {
1918
1918
  console.log('我走的是正常的收费', params)
1919
1919
  cardparam = JSON.stringify(params)
1920
1920
  cardpost = 'WriteGasCard'
1921
- cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'})
1921
+ cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
1922
1922
  }
1923
1923
  console.log('卡表收费返回写卡参数值', cardRes)
1924
1924
  // 卡服务写卡异常，业务逻辑回滚
1925
1925
  if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
1926
+ if (result) {
1927
+ let data = {
1928
+ cardparam: cardparam,
1929
+ cardpost: cardpost,
1930
+ id: result.data.id,
1931
+ userinfo: {
1932
+ f_userinfo_id: row.f_userinfo_id,
1933
+ version: row.userinfo_version + 1,
1934
+ f_balance: row.f_balance,
1935
+ userfiles: {
1936
+ f_user_id: model.f_user_id,
1937
+ f_userfiles_id: row.f_userfiles_id,
1938
+ f_total_gas: row.f_total_gas,
1939
+ f_write_totalgas: row.f_write_totalgas,
1940
+ f_write_totalfee: row.f_write_totalfee,
1941
+ f_total_fee: row.f_total_fee,
1942
+ f_card_id: row.f_card_id,
1943
+ f_times: row.cardInfo.Times,
1944
+ version: row.version + 1
1945
+ }
1946
+ }
1947
+ }
1948
+ if (row.f_tag) {
1949
+ data.userinfo.userfiles.f_tag = row.f_tag
1950
+ }
1951
+ if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_meter_type === '物联网表' && row.f_hascard === '是' && row.f_share_times === '是') {
1952
+ data.userinfo.userfiles.f_times = row.f_times
1953
+ }
1954
+ await Vue.resetpost('rs/logic/cardChargeRollback', {data: data}, {resolveMsg: '卡表收费失败', rejectMsg: '卡表收费失败'})
1955
+ }
1926
1956
  throw `卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`
1927
1957
  } else {
1928
1958
  // 调用读卡进行校验
@@ -1950,36 +1980,6 @@ let sellgasGen = async function (model, row) {
1950
1980
  throw new Error(`请检查卡是否插好！！`)
1951
1981
  }
1952
1982
  } catch (error) {
1953
- if (result) {
1954
- let data = {
1955
- cardparam: cardparam,
1956
- cardpost: cardpost,
1957
- id: result.data.id,
1958
- userinfo: {
1959
- f_userinfo_id: row.f_userinfo_id,
1960
- version: row.userinfo_version + 1,
1961
- f_balance: row.f_balance,
1962
- userfiles: {
1963
- f_user_id: model.f_user_id,
1964
- f_userfiles_id: row.f_userfiles_id,
1965
- f_total_gas: row.f_total_gas,
1966
- f_write_totalgas: row.f_write_totalgas,
1967
- f_write_totalfee: row.f_write_totalfee,
1968
- f_total_fee: row.f_total_fee,
1969
- f_card_id: row.f_card_id,
1970
- f_times: row.cardInfo.Times,
1971
- version: row.version + 1
1972
- }
1973
- }
1974
- }
1975
- if (row.f_tag) {
1976
- data.userinfo.userfiles.f_tag = row.f_tag
1977
- }
1978
- if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_meter_type === '物联网表' && row.f_hascard === '是' && row.f_share_times === '是') {
1979
- data.userinfo.userfiles.f_times = row.f_times
1980
- }
1981
- await Vue.resetpost('rs/logic/cardChargeRollback', {data: data}, {resolveMsg: '卡表收费失败', rejectMsg: '卡表收费失败'})
1982
- }
1983
1983
  throw error
1984
1984
  }
1985
1985
  }