sale-client 3.6.472 → 3.6.474
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/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/package.json +1 -1
- package/src/filiale/dexin/WatchDealWarning.vue +233 -0
- package/src/filiale/dexin/sale.js +2 -0
- package/src/plugins/CardService.js +18 -18
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/package.json
CHANGED
|
@@ -0,0 +1,233 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
|
|
3
|
+
<div style="" class="span">
|
|
4
|
+
|
|
5
|
+
<criteria-paged :model="model" v-ref:paged >
|
|
6
|
+
<criteria partial='criteria' v-ref:criteria @condition-changed='$parent.search' >
|
|
7
|
+
<div v-show="$parent.$parent.isdeal" novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
8
|
+
|
|
9
|
+
<div class="col-sm-2" style="float: left;padding-left: 8px">
|
|
10
|
+
<label class="font_normal_body">报警类型</label>
|
|
11
|
+
<v-select
|
|
12
|
+
style="width: 60%"
|
|
13
|
+
placeholder='报警类型'
|
|
14
|
+
:value.sync="model.f_meter_brand"
|
|
15
|
+
v-model="model.f_meter_brand"
|
|
16
|
+
:options='$parent.$parent.WarningType'
|
|
17
|
+
close-on-select
|
|
18
|
+
condition="f_error_type='{}'">
|
|
19
|
+
</v-select>
|
|
20
|
+
</div>
|
|
21
|
+
|
|
22
|
+
<div class="col-sm-2 ">
|
|
23
|
+
<label class="font_normal_body" style="word-break:keep-all;">起始时间</label>
|
|
24
|
+
<datepicker style="width: 60%" placeholder="起始时间"
|
|
25
|
+
:value.sync="model.f_start_date"
|
|
26
|
+
v-model="model.f_start_date"
|
|
27
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
28
|
+
condition="f_insert_date > '{}'"
|
|
29
|
+
></datepicker>
|
|
30
|
+
</div>
|
|
31
|
+
<div class="col-sm-2 " >
|
|
32
|
+
<label class="font_normal_body"> 至</label>
|
|
33
|
+
<datepicker style="width: 60%" placeholder="结束时间"
|
|
34
|
+
:value.sync="model.f_end_date"
|
|
35
|
+
v-model="model.f_end_date"
|
|
36
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
37
|
+
condition="f_insert_date < '{}'"
|
|
38
|
+
></datepicker>
|
|
39
|
+
</div>
|
|
40
|
+
<div style="float: right">
|
|
41
|
+
<button class="button_search" @click="search()" v-el:cba>查询</button>
|
|
42
|
+
</div>
|
|
43
|
+
</div>
|
|
44
|
+
|
|
45
|
+
</criteria>
|
|
46
|
+
|
|
47
|
+
<data-grid partial='list' v-ref:grid :model="model" class="list_area table_sy">
|
|
48
|
+
|
|
49
|
+
<template partial='head'>
|
|
50
|
+
<tr style="margin-top: -10px">
|
|
51
|
+
<th>序号</th>
|
|
52
|
+
<th>上报时间</th>
|
|
53
|
+
<th>上报级别</th>
|
|
54
|
+
<th>报警类型</th>
|
|
55
|
+
<th>报警详情</th>
|
|
56
|
+
<th>最后一次报警时间</th>
|
|
57
|
+
<th>操作</th>
|
|
58
|
+
</tr>
|
|
59
|
+
</template>
|
|
60
|
+
<template partial='body'>
|
|
61
|
+
<tr>
|
|
62
|
+
<td style="text-align:center">{{$index+1}}</td>
|
|
63
|
+
<td style="text-align:center;width: 170px;">{{row.f_insert_date}}</td>
|
|
64
|
+
<td style="text-align:center;">{{row.f_error_level}}</td>
|
|
65
|
+
<td style="text-align:center;">{{row.f_error_type}}</td>
|
|
66
|
+
<td style="text-align:center;">{{row.f_error_msg}}</td>
|
|
67
|
+
<td style="text-align:center;">{{row.f_last_alarm_date}}</td>
|
|
68
|
+
<td style="text-align:center;" v-if="row.f_is_read == false || row.f_is_read === 0" >
|
|
69
|
+
<span ><a href="#" @click.stop="$parent.$parent.$parent.backSend1(row.id)">添加备注</a></span>
|
|
70
|
+
</td>
|
|
71
|
+
<td style="text-align:center;" v-if="row.f_is_read === 1"><span title="备注信息:{{row.f_error_reason}}">备注信息:{{row.f_error_reason}}</span></td>
|
|
72
|
+
</tr>
|
|
73
|
+
|
|
74
|
+
</template>
|
|
75
|
+
|
|
76
|
+
</data-grid>
|
|
77
|
+
</criteria-paged>
|
|
78
|
+
<modal :show.sync="watchshow" v-ref:modal backdrop="false">
|
|
79
|
+
<header slot="modal-header" class="modal-header">
|
|
80
|
+
<button type="button" class="close" @click="tableFault()"><span>×</span></button>
|
|
81
|
+
<h4 class="modal-title">信息备注</h4>
|
|
82
|
+
</header>
|
|
83
|
+
<article slot="modal-body" class="modal-body">
|
|
84
|
+
<div class="col-sm-12">
|
|
85
|
+
<label class="font_normal_body">添加信息备注</label>
|
|
86
|
+
<textarea name="name" rows="2" style="width: 100%"
|
|
87
|
+
class="ver-textarea" class="form-control"
|
|
88
|
+
placeholder='请填写信息备注'
|
|
89
|
+
v-model='f_error_reason'></textarea>
|
|
90
|
+
</div>
|
|
91
|
+
</article>
|
|
92
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
93
|
+
<button v-show="watchshow" type="button" class="btn btn-default" @click='tableFault()'>取消</button>
|
|
94
|
+
<button v-show="watchshow" type="button" class="btn btn-danger btn-ln fr" @click='saveException()'>确认</button>
|
|
95
|
+
</footer>
|
|
96
|
+
</modal>
|
|
97
|
+
</div>
|
|
98
|
+
</template>
|
|
99
|
+
|
|
100
|
+
<script>
|
|
101
|
+
import Checkbox from 'vue-strap/src/Checkbox'
|
|
102
|
+
import { PagedList } from 'vue-client'
|
|
103
|
+
export default {
|
|
104
|
+
components: {Checkbox},
|
|
105
|
+
data () {
|
|
106
|
+
return {
|
|
107
|
+
watchshow: false,
|
|
108
|
+
cancelid: '',
|
|
109
|
+
condition: '',
|
|
110
|
+
error_condition: '',
|
|
111
|
+
f_error_reason: '',
|
|
112
|
+
searchobj: {},
|
|
113
|
+
model: new PagedList('rs/sql/singleTable_OrderBy', 20, {tablename: "'" + this.tablename + "'",
|
|
114
|
+
orderitem: "'" + this.orderitem + "'",
|
|
115
|
+
items: "'" + this.items + "'"})
|
|
116
|
+
}
|
|
117
|
+
},
|
|
118
|
+
name: 'WatchDealWarning',
|
|
119
|
+
props: {
|
|
120
|
+
searchobj: {},
|
|
121
|
+
isdeal: {},
|
|
122
|
+
tablename: {
|
|
123
|
+
type: String,
|
|
124
|
+
default: 't_exception'
|
|
125
|
+
},
|
|
126
|
+
orderitem: {
|
|
127
|
+
type: String,
|
|
128
|
+
default: 'f_insert_date desc'
|
|
129
|
+
},
|
|
130
|
+
items: {
|
|
131
|
+
type: String,
|
|
132
|
+
default: '*'
|
|
133
|
+
}
|
|
134
|
+
},
|
|
135
|
+
ready () {
|
|
136
|
+
this.$refs.paged.$refs.criteria.search()
|
|
137
|
+
},
|
|
138
|
+
methods: {
|
|
139
|
+
|
|
140
|
+
backSend1 (megrow) {
|
|
141
|
+
this.watchshow = true
|
|
142
|
+
this.cancelid = megrow
|
|
143
|
+
},
|
|
144
|
+
|
|
145
|
+
update () {
|
|
146
|
+
// 更改按钮
|
|
147
|
+
this.error_condition = `(`
|
|
148
|
+
// 拿到所有查到的对象遍历 选出已经勾选的并记录id
|
|
149
|
+
for (var row in this.$refs.paged.model.rows) {
|
|
150
|
+
if (this.$refs.paged.model.rows[row].f_is_read == true) {
|
|
151
|
+
this.error_condition = this.error_condition + this.$refs.paged.model.rows[row].id + ','
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
// 拼到条件
|
|
155
|
+
this.error_condition = this.error_condition.substring(0, this.error_condition.length - 1)
|
|
156
|
+
this.error_condition = this.error_condition + ')'
|
|
157
|
+
// 调用后台
|
|
158
|
+
this.$resetpost('rs/logic/iot_updateExceptionIsRead',
|
|
159
|
+
{data: {condition: this.error_condition}},
|
|
160
|
+
{resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
161
|
+
})
|
|
162
|
+
console.log(this.watchshow)
|
|
163
|
+
this.tableFault(this.error_condition)
|
|
164
|
+
this.search()
|
|
165
|
+
},
|
|
166
|
+
checked (e, val) {
|
|
167
|
+
val.f_is_read = e.target.checked
|
|
168
|
+
},
|
|
169
|
+
search (args) {
|
|
170
|
+
this.$refs.paged.model.rows = ''
|
|
171
|
+
if (this.isdeal) {
|
|
172
|
+
this.condition = `${args.condition} and f_is_read=1 and f_userfiles_id='${this.searchobj.f_userfiles_id}'`
|
|
173
|
+
this.model.search(this.condition, args.model)
|
|
174
|
+
} else {
|
|
175
|
+
this.condition = `f_is_read = 0 and ${args.condition} and f_userfiles_id='${this.searchobj.f_userfiles_id}'`
|
|
176
|
+
this.model.search(this.condition, args.model)
|
|
177
|
+
this.condition = '1=1'
|
|
178
|
+
}
|
|
179
|
+
},
|
|
180
|
+
tableFault (val) {
|
|
181
|
+
if (val) {
|
|
182
|
+
console.log('开启弹窗')
|
|
183
|
+
} else {
|
|
184
|
+
console.log('返回置空')
|
|
185
|
+
this.watchExce = {}
|
|
186
|
+
this.f_error_reason = ''
|
|
187
|
+
}
|
|
188
|
+
this.watchshow = !this.watchshow
|
|
189
|
+
},
|
|
190
|
+
|
|
191
|
+
saveException () {
|
|
192
|
+
let send = {
|
|
193
|
+
id: this.cancelid, // 当前记录ID
|
|
194
|
+
f_is_read: 1,
|
|
195
|
+
f_error_reason: this.f_error_reason // 备注原因
|
|
196
|
+
}
|
|
197
|
+
let param = {
|
|
198
|
+
tablename: 't_exception',
|
|
199
|
+
id: 1,
|
|
200
|
+
basedata: send
|
|
201
|
+
}
|
|
202
|
+
this.$resetpost('rs/logic/iot_saveTable', param).then(() => {
|
|
203
|
+
// this.params.rows.splice(index, 1)
|
|
204
|
+
this.watchshow = false
|
|
205
|
+
this.$refs.paged.$refs.criteria.search()
|
|
206
|
+
this.f_error_reason = ''
|
|
207
|
+
})
|
|
208
|
+
}
|
|
209
|
+
},
|
|
210
|
+
computed: {
|
|
211
|
+
WarningType () {
|
|
212
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('报警类型')]
|
|
213
|
+
}
|
|
214
|
+
},
|
|
215
|
+
watch: {
|
|
216
|
+
// 监听查询对象
|
|
217
|
+
'searchobj' (val) {
|
|
218
|
+
console.log('f_userfiles_id1:', val.f_userfiles_id)
|
|
219
|
+
if (this.searchobj != null) {
|
|
220
|
+
this.$refs.paged.$refs.criteria.search()
|
|
221
|
+
}
|
|
222
|
+
},
|
|
223
|
+
'isdeal' (val) {
|
|
224
|
+
this.$refs.paged.$refs.criteria.search()
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
</script>
|
|
230
|
+
|
|
231
|
+
<style scoped>
|
|
232
|
+
|
|
233
|
+
</style>
|
|
@@ -694,7 +694,7 @@ let sendCardSaleGasGenremanent = async function (model, row) {
|
|
|
694
694
|
let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
|
|
695
695
|
resolveMsg: null,
|
|
696
696
|
rejectMsg: '开户卡服务错误'
|
|
697
|
-
},80000)
|
|
697
|
+
}, 80000)
|
|
698
698
|
if (!cardParams || ((model.f_pregas > model.f_remanent_gas) && !result) || cardRes.data.Err || cardRes.data.Exception) {
|
|
699
699
|
// 写卡异常
|
|
700
700
|
// 数据回滚操作
|
|
@@ -801,7 +801,7 @@ let resetsendCardSaleGasGen = async function (model, row) {
|
|
|
801
801
|
let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
|
|
802
802
|
resolveMsg: null,
|
|
803
803
|
rejectMsg: '重开户卡服务错误'
|
|
804
|
-
},80000)
|
|
804
|
+
}, 80000)
|
|
805
805
|
if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
|
|
806
806
|
// 写卡异常
|
|
807
807
|
// 数据回滚操作
|
|
@@ -910,7 +910,7 @@ let sendCardSaleGasGen = async function (model, row) {
|
|
|
910
910
|
let cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
|
|
911
911
|
resolveMsg: null,
|
|
912
912
|
rejectMsg: '开户卡服务错误'
|
|
913
|
-
},80000)
|
|
913
|
+
}, 80000)
|
|
914
914
|
if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
|
|
915
915
|
// 写卡异常
|
|
916
916
|
// 数据回滚操作
|
|
@@ -1119,7 +1119,7 @@ let replaceCardGenJB = function * (model, row) {
|
|
|
1119
1119
|
let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
|
|
1120
1120
|
resolveMsg: null,
|
|
1121
1121
|
rejectMsg: '补卡卡服务错误'
|
|
1122
|
-
},80000))
|
|
1122
|
+
}, 80000))
|
|
1123
1123
|
// 卡服务写卡异常，业务逻辑回滚
|
|
1124
1124
|
if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
|
|
1125
1125
|
Vue.$showAlert('机表补卡失败!!', 'danger', 0)
|
|
@@ -1207,7 +1207,7 @@ let replaceXq = function * (model, row) {
|
|
|
1207
1207
|
let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
|
|
1208
1208
|
resolveMsg: null,
|
|
1209
1209
|
rejectMsg: '擦虚气服务错误'
|
|
1210
|
-
},80000))
|
|
1210
|
+
}, 80000))
|
|
1211
1211
|
if (cardRes.data.Err || cardRes.data.Exception) {
|
|
1212
1212
|
return {status: 1}
|
|
1213
1213
|
} else {
|
|
@@ -1293,7 +1293,7 @@ let replaceCardGen = function * (model, row, allot) {
|
|
|
1293
1293
|
let cardRes = yield co(Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params, {
|
|
1294
1294
|
resolveMsg: null,
|
|
1295
1295
|
rejectMsg: '补卡卡服务错误'
|
|
1296
|
-
},80000))
|
|
1296
|
+
}, 80000))
|
|
1297
1297
|
// 卡服务写卡异常，业务逻辑回滚
|
|
1298
1298
|
if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
|
|
1299
1299
|
Vue.$showAlert('补卡失败!!', 'danger', 0)
|
|
@@ -1427,14 +1427,14 @@ let offlineWriteGen = async function (row) {
|
|
|
1427
1427
|
param.kzt = result.data.ispick === '未过表' && result.data.lastsell_oper === '发卡售气' ? '0' : '1'
|
|
1428
1428
|
param.cs = row.cardInfo.Times + 1
|
|
1429
1429
|
param.bkcs = param.bkcs + 1
|
|
1430
|
-
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'},80000)
|
|
1430
|
+
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'}, 80000)
|
|
1431
1431
|
} else if (row.states === '换表') {
|
|
1432
1432
|
param.kzt = '0'
|
|
1433
1433
|
param.bkcs = param.bkcs + 1
|
|
1434
1434
|
param.cs = 1
|
|
1435
|
-
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'},80000)
|
|
1435
|
+
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', param, {resolveMsg: null, rejectMsg: '写卡失败'}, 80000)
|
|
1436
1436
|
} else {
|
|
1437
|
-
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', param, {resolveMsg: null, rejectMsg: '写卡失败'},80000)
|
|
1437
|
+
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', param, {resolveMsg: null, rejectMsg: '写卡失败'}, 80000)
|
|
1438
1438
|
}
|
|
1439
1439
|
if (!cardParams || cardRes.data.Err || cardRes.data.Exception) {
|
|
1440
1440
|
let sql = `update t_sellinggas set
|
|
@@ -1710,23 +1710,23 @@ let marginGen = async function (model, row) {
|
|
|
1710
1710
|
params2.kzt = result.data.ispick === '未过表' && result.data.lastsell_oper === '发卡售气' ? '0' : '1'
|
|
1711
1711
|
cardparam = JSON.stringify(params2)
|
|
1712
1712
|
cardpost = 'WriteNewCard'
|
|
1713
|
-
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
|
|
1713
|
+
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
|
|
1714
1714
|
} else if (result.data.last_oper === '换表') {
|
|
1715
1715
|
console.log('我走的是写新卡换表')
|
|
1716
1716
|
cardparam = JSON.stringify(params3)
|
|
1717
1717
|
cardpost = 'WriteNewCard'
|
|
1718
|
-
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
|
|
1718
|
+
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
|
|
1719
1719
|
} else if (result.data.last_oper === '换表补气') {
|
|
1720
1720
|
// 累购金额需要将上次购气金额加上
|
|
1721
1721
|
console.log('我走的是正常的收费', params)
|
|
1722
1722
|
cardparam = JSON.stringify(params)
|
|
1723
1723
|
cardpost = 'WriteGasCard'
|
|
1724
|
-
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
|
|
1724
|
+
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
|
|
1725
1725
|
} else {
|
|
1726
1726
|
console.log('我走的是正常的收费', params)
|
|
1727
1727
|
cardparam = JSON.stringify(params)
|
|
1728
1728
|
cardpost = 'WriteGasCard'
|
|
1729
|
-
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
|
|
1729
|
+
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
|
|
1730
1730
|
}
|
|
1731
1731
|
console.log('卡表收费返回写卡参数值', cardRes)
|
|
1732
1732
|
// 卡服务写卡异常，业务逻辑回滚
|
|
@@ -1801,7 +1801,7 @@ let sellgasGen = async function (model, row) {
|
|
|
1801
1801
|
if (JSON.parse(cardState.data).state === 1) {
|
|
1802
1802
|
// 将卡上次数写入数据库
|
|
1803
1803
|
if (!(row.f_hascard == null) && !(row.f_share_times == null) && row.f_hascard === '是' && row.f_share_times === '是') {
|
|
1804
|
-
row.cardInfo.Times = row.
|
|
1804
|
+
row.cardInfo.Times = row.f_times
|
|
1805
1805
|
model.f_times = row.f_times + 1
|
|
1806
1806
|
} else {
|
|
1807
1807
|
model.f_times = row.cardInfo.Times + 1
|
|
@@ -1907,23 +1907,23 @@ let sellgasGen = async function (model, row) {
|
|
|
1907
1907
|
params2.kzt = result.data.ispick === '未过表' && result.data.lastsell_oper === '发卡售气' ? '0' : '1'
|
|
1908
1908
|
cardparam = JSON.stringify(params2)
|
|
1909
1909
|
cardpost = 'WriteNewCard'
|
|
1910
|
-
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
|
|
1910
|
+
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params2, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
|
|
1911
1911
|
} else if (result.data.last_oper === '换表') {
|
|
1912
1912
|
console.log('我走的是写新卡换表')
|
|
1913
1913
|
cardparam = JSON.stringify(params3)
|
|
1914
1914
|
cardpost = 'WriteNewCard'
|
|
1915
|
-
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
|
|
1915
|
+
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteNewCard', params3, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
|
|
1916
1916
|
} else if (result.data.last_oper === '换表补气') {
|
|
1917
1917
|
// 累购金额需要将上次购气金额加上
|
|
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: '卡表收费失败'},80000)
|
|
1921
|
+
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
|
|
1922
1922
|
} else {
|
|
1923
1923
|
console.log('我走的是正常的收费', params)
|
|
1924
1924
|
cardparam = JSON.stringify(params)
|
|
1925
1925
|
cardpost = 'WriteGasCard'
|
|
1926
|
-
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'},80000)
|
|
1926
|
+
cardRes = await Vue.resetpost('http://127.0.0.1:8003/WriteGasCard', params, {resolveMsg: null, rejectMsg: '卡表收费失败'}, 80000)
|
|
1927
1927
|
}
|
|
1928
1928
|
console.log('卡表收费返回写卡参数值', cardRes)
|
|
1929
1929
|
// 卡服务写卡异常，业务逻辑回滚
|