sale-client 3.5.19 → 3.5.20
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.
- package/build/dev-server.js +2 -2
- package/package.json +1 -1
- package/src/filiale/guangxi/CardService.js +17 -0
- package/src/filiale/qianneng/eticket/EticketPrint.vue +369 -369
- package/src/filiale/tongchuan/common/userinfo_detail/iot_detail/WatchCollection.vue +4 -4
- package/src/main.js +22 -22
- package/src/sale.js +0 -400
package/build/dev-server.js
CHANGED
|
@@ -10,9 +10,9 @@ var compiler = webpack(config)
|
|
|
10
10
|
|
|
11
11
|
// Define HTTP proxies to your custom API backend
|
|
12
12
|
// https://github.com/chimurai/http-proxy-middleware
|
|
13
|
-
var bendi = 'http://127.0.0.1:8080
|
|
13
|
+
var bendi = 'http://127.0.0.1:8080', bendi1 = 'http://121.36.106.17:8400/'
|
|
14
14
|
// 公司测试服务
|
|
15
|
-
var fuwu = 'http://192.168.50.4:8400
|
|
15
|
+
var fuwu = 'http://192.168.50.4:8400'
|
|
16
16
|
// var fuwu = 'http://121.36.106.17:8400/'
|
|
17
17
|
// 铜川正式
|
|
18
18
|
// var fuwu = 'http://61.134.55.234:9999/'
|
package/package.json
CHANGED
|
@@ -293,6 +293,8 @@ let cardAndGasCancelGen = async function (model, xmodel, row) {
|
|
|
293
293
|
if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
|
|
294
294
|
await rollbackGen(result, model, row)
|
|
295
295
|
} else {
|
|
296
|
+
// 更新 上次写卡气量
|
|
297
|
+
await modify(row.f_userfiles_id, params.ql, '2')
|
|
296
298
|
Vue.showAlert('撤销成功', 'success', 2000)
|
|
297
299
|
return result
|
|
298
300
|
}
|
|
@@ -532,6 +534,8 @@ let offlineWriteGen = async function (row) {
|
|
|
532
534
|
|
|
533
535
|
throw new Error(`卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`)
|
|
534
536
|
} else {
|
|
537
|
+
// 更新 上次写卡气量
|
|
538
|
+
await getParamGen(row.f_userfiles_id, param.ql)
|
|
535
539
|
// 写卡成功 更新收费记录
|
|
536
540
|
let update = {
|
|
537
541
|
id: row.unWriteSell[0].id,
|
|
@@ -668,6 +672,8 @@ let sendCardSaleGasGen = async function (model, row) {
|
|
|
668
672
|
// 数据回滚操作
|
|
669
673
|
throw `卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`
|
|
670
674
|
} else {
|
|
675
|
+
// 更新 上次写卡气量
|
|
676
|
+
await modify(row.f_userfiles_id, params.ql)
|
|
671
677
|
// 写卡成功
|
|
672
678
|
// 更新卡密码
|
|
673
679
|
await Vue.CommonService.updatePassword(row, cardRes)
|
|
@@ -845,6 +851,8 @@ let sellgasGen = async function (model, row) {
|
|
|
845
851
|
if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
|
|
846
852
|
throw `卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`
|
|
847
853
|
} else {
|
|
854
|
+
// 更新 上次写卡气量
|
|
855
|
+
await modify(row.f_userfiles_id, params.ql)
|
|
848
856
|
// 更新卡密码
|
|
849
857
|
await Vue.CommonService.updatePassword(row, cardRes)
|
|
850
858
|
Vue.showAlert('售气成功', 'success', 2000)
|
|
@@ -909,6 +917,15 @@ let getParamGen = async function (cardid, alias, f_user_id, f_userfiles_id) {
|
|
|
909
917
|
return Vue.resetpost('rs/logic/stairCard', {data: data}, {resolveMsg: null, rejectMsg: '获取写卡参数失败'})
|
|
910
918
|
}
|
|
911
919
|
|
|
920
|
+
let modify = async function (userfilesID, gas, type = '1') {
|
|
921
|
+
let data = {
|
|
922
|
+
f_gas: gas,
|
|
923
|
+
f_userfiles_id: userfilesID,
|
|
924
|
+
type
|
|
925
|
+
}
|
|
926
|
+
return Vue.resetpost('rs/logic/modifySCGas', {data: data}, {resolveMsg: null, rejectMsg: '获取写卡参数失败'})
|
|
927
|
+
}
|
|
928
|
+
|
|
912
929
|
let sendCardSaleGasGenremanent = async function (model, row) {
|
|
913
930
|
// 1.存库 2.写卡
|
|
914
931
|
let result = null
|