sale-client 4.2.1 → 4.2.2-ronghao
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 +1 -1
- package/package.json +1 -1
- package/src/filiale/ronghao/ChangeMeterService.js +1 -1
- package/src/filiale/ronghao/machineRefund.vue +41 -23
- package/src/filiale/yangchun/plugins/LogicService.js +17 -16
- 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 +0 -2
- package/.gradle/vcs-1/gc.properties +0 -0
package/build/dev-server.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var path = require('path')
|
|
2
2
|
var checkVersion = require('./versionCheck.js')
|
|
3
3
|
checkVersion()
|
|
4
|
-
const [ serverRul, localUrl ] = ['http://
|
|
4
|
+
const [ serverRul, localUrl ] = ['http://218.93.226.210:31467/', 'http://218.93.226.210:31467/']
|
|
5
5
|
var merge = require('webpack-merge')
|
|
6
6
|
var baseConfig = require('./webpack.dev.conf')
|
|
7
7
|
var devConfig = {
|
package/package.json
CHANGED
|
@@ -628,7 +628,7 @@ let ChangeMeterService = {
|
|
|
628
628
|
f_preamount: model.f_preamount,
|
|
629
629
|
f_pregas: model.f_pregas,
|
|
630
630
|
f_totalcost: model.f_totalcost,
|
|
631
|
-
f_add_gas: model.
|
|
631
|
+
f_add_gas: model.addtotal === '是' ? '计入' : '不计入',
|
|
632
632
|
f_total_gas: model.addtotal === '是' ? (row.f_total_gas - 0) + (model.f_pregas - 0) : (row.f_total_gas - 0),
|
|
633
633
|
f_total_fee: model.addtotal === '是' ? (row.f_total_fee - 0) + (model.f_preamount - 0) : (row.f_total_fee - 0),
|
|
634
634
|
f_payment: model.f_payment.toString(),
|
|
@@ -36,21 +36,21 @@
|
|
|
36
36
|
style="width:60%"
|
|
37
37
|
close-on-select></v-select>
|
|
38
38
|
</div>
|
|
39
|
-
<!-- <div class="col-sm-4 form-group">-->
|
|
40
|
-
<!-- <label class="font_normal_body">剩余金额</label>-->
|
|
41
|
-
<!-- <input class="input_search" style="width:60%" type="number" v-model="data.f_balance" readonly>-->
|
|
42
|
-
<!-- </div>-->
|
|
43
39
|
</div>
|
|
44
|
-
|
|
45
40
|
<div class="row">
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
<
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
41
|
+
<div class="col-sm-4 form-group" >
|
|
42
|
+
<label class="font_normal_body">账户余额</label>
|
|
43
|
+
<input class="input_search" style="width:60%" type="number" v-model="data.f_balance"
|
|
44
|
+
placeholder="账户余额" disabled>
|
|
45
|
+
</div>
|
|
46
|
+
</div>
|
|
47
|
+
<div class="row">
|
|
48
|
+
<div class="col-sm-8">
|
|
49
|
+
<label for="f_paper_account" class="font_normal_body "> 备 注 </label>
|
|
50
|
+
<input class="input_search" style="width:80%" v-model="model.f_comments">
|
|
51
|
+
</div>
|
|
52
52
|
<div v-if="config.hasAudit" class="col-sm-4 form-group">
|
|
53
|
-
<label class="font_normal_body" :class="[$v.f_audit_person.required ? 'has-error' : 'has-success']"
|
|
53
|
+
<label class="font_normal_body" :class="[$v.f_audit_person.required ? 'has-error' : 'has-success']">审核人员</label>
|
|
54
54
|
<input v-show="false" v-model="model.f_audit_person"
|
|
55
55
|
v-validate:f_audit_person='{required: true}'>
|
|
56
56
|
<v-select :value.sync="model.f_audit_person"
|
|
@@ -66,20 +66,26 @@
|
|
|
66
66
|
<input class="input_search" style="width:60%" type="number" v-model="model.f_refund_gas"
|
|
67
67
|
placeholder="应退气量">
|
|
68
68
|
</div>
|
|
69
|
-
|
|
70
|
-
<div class="col-sm-4 form-group" v-if="!config.overBalance"
|
|
71
|
-
:class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
|
|
72
|
-
<label class="font_normal_body">退费金额</label>
|
|
73
|
-
<input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
|
|
74
|
-
v-validate:f_refund_fee='{required: true, dctest: [data.f_balance, "<=" ]}' placeholder="退费金额">
|
|
75
|
-
</div>
|
|
76
|
-
<div class="col-sm-4 form-group" v-if="config.overBalance"
|
|
69
|
+
<div class="col-sm-4 form-group"
|
|
77
70
|
:class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
|
|
78
71
|
<label class="font_normal_body">退费金额</label>
|
|
79
72
|
<input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
|
|
80
73
|
v-validate:f_refund_fee='{required: true, dctest: [0, ">=" ]}' placeholder="退费金额">
|
|
81
74
|
</div>
|
|
82
|
-
|
|
75
|
+
<div class="col-sm-4 form-group"
|
|
76
|
+
:class="[$v.f_balance_fee.required || $v.f_balance_fee.dctest ? 'has-error' : 'has-success']" title="余额退费金额不能大于账户余额">
|
|
77
|
+
<label class="font_normal_body">余额退费</label>
|
|
78
|
+
<input class="input_search" style="width:60%" type="number" v-model="model.f_balance_fee"
|
|
79
|
+
v-validate:f_balance_fee='{required: true, dctest: [data.f_balance, "<=" ]}' placeholder="余额退费">
|
|
80
|
+
</div>
|
|
81
|
+
</div>
|
|
82
|
+
<div class="row">
|
|
83
|
+
<div class="col-sm-4 form-group" >
|
|
84
|
+
<label class="font_normal_body">合计退费</label>
|
|
85
|
+
<input class="input_search" style="width:60%" type="number" v-model="f_refund_total"
|
|
86
|
+
placeholder="合计退款" disabled>
|
|
87
|
+
</div>
|
|
88
|
+
</div>
|
|
83
89
|
</form>
|
|
84
90
|
<div style="text-align:right;">
|
|
85
91
|
<button class="button_search btn-gn" v-if="config.hasAudit" @click="auditConfirm()" :disabled='!$v.valid'>提交审核</button>
|
|
@@ -127,8 +133,10 @@
|
|
|
127
133
|
payment: '现金缴费',
|
|
128
134
|
billType: '燃气费'
|
|
129
135
|
},
|
|
136
|
+
f_refund_total: 0,
|
|
130
137
|
model: {
|
|
131
138
|
f_operat_type: `${this.data.f_meter_type}退费`,
|
|
139
|
+
f_balance_fee: 0,
|
|
132
140
|
f_refund_fee: '',
|
|
133
141
|
f_add_gas: '计入',
|
|
134
142
|
f_comments: '',
|
|
@@ -202,6 +210,7 @@
|
|
|
202
210
|
f_print: this.model.f_print[0],
|
|
203
211
|
f_price_id: this.data.f_price_id,
|
|
204
212
|
f_add_gas: this.model.f_add_gas,
|
|
213
|
+
f_balance_fee: this.model.f_balance_fee,
|
|
205
214
|
f_total_fee: parseFloat(this.data.f_total_fee) - parseFloat(this.model.f_refund_fee),
|
|
206
215
|
f_total_gas: parseFloat(this.data.f_total_gas) - parseFloat(this.model.f_refund_gas),
|
|
207
216
|
f_stairprice_id: this.data.f_stairprice_id,
|
|
@@ -246,8 +255,10 @@
|
|
|
246
255
|
param.f_total_fee = this.data.f_total_fee
|
|
247
256
|
param.f_total_gas = this.data.f_total_gas
|
|
248
257
|
}
|
|
258
|
+
|
|
259
|
+
let warnMsg = `本次退费,余额退费金额${this.model.f_balance_fee}元，退费金额${this.model.f_refund_fee}元，合计退费${this.f_refund_total}元，确定要对用户${this.data.f_user_name}进行${this.model.f_operat_type}吗？`
|
|
249
260
|
this.$resetpost('api/af-revenue/logic/commonAuditLogic', param, {
|
|
250
|
-
warnMsg:
|
|
261
|
+
warnMsg: warnMsg,
|
|
251
262
|
resolveMsg: `提交审核完成！！`,
|
|
252
263
|
rejectMsg: `提交审核失败！！请重试！！`
|
|
253
264
|
}).then((res) => {
|
|
@@ -273,6 +284,7 @@
|
|
|
273
284
|
f_print: this.model.f_print[0],
|
|
274
285
|
f_price_id: this.data.f_price_id,
|
|
275
286
|
f_add_gas: this.model.f_add_gas,
|
|
287
|
+
f_balance_fee: this.model.f_balance_fee,
|
|
276
288
|
f_total_fee: parseFloat(this.data.f_total_fee) - parseFloat(this.model.f_refund_fee),
|
|
277
289
|
f_total_gas: parseFloat(this.data.f_total_gas) - parseFloat(this.model.f_refund_gas),
|
|
278
290
|
f_stairprice_id: this.data.f_stairprice_id,
|
|
@@ -289,7 +301,8 @@
|
|
|
289
301
|
param.f_total_fee = this.data.f_total_fee
|
|
290
302
|
param.f_total_gas = this.data.f_total_gas
|
|
291
303
|
}
|
|
292
|
-
let res = await this.$resetpost('api/af-revenue/logic/machineRefund', {data: param},
|
|
304
|
+
let res = await this.$resetpost('api/af-revenue/logic/machineRefund', {data: param},
|
|
305
|
+
{warnMsg: `本次退费,余额退费金额${this.model.f_balance_fee}元，退费金额${this.model.f_refund_fee}元，合计退费${this.f_refund_total}元，确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
|
|
293
306
|
console.log('机表退费返回的数据==========>', res)
|
|
294
307
|
let param1 = []
|
|
295
308
|
for (let row of this.resid) {
|
|
@@ -334,6 +347,11 @@
|
|
|
334
347
|
this.validateOk = !val.isOk
|
|
335
348
|
this.billData.bill = val.bill
|
|
336
349
|
}
|
|
350
|
+
},
|
|
351
|
+
computed: {
|
|
352
|
+
'f_refund_total' () {
|
|
353
|
+
return ((this.model.f_refund_fee - 0) + (this.model.f_balance_fee - 0)).toFixed(2) - 0
|
|
354
|
+
}
|
|
337
355
|
}
|
|
338
356
|
}
|
|
339
357
|
</script>
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import Vue from 'vue'
|
|
2
2
|
import co from 'co'
|
|
3
3
|
|
|
4
|
-
let disableGen = function
|
|
5
|
-
let owe =
|
|
4
|
+
let disableGen = async function (data) {
|
|
5
|
+
let owe = await Vue.resetpost('api/af-revenue/sql/getOverdue', {data: {f_userfiles_id: data.f_userfile_id + ''}}, {resolveMsg: null, rejectMsg: null})
|
|
6
6
|
console.log('表具停用看是否有欠费', owe.data)
|
|
7
|
-
let hasHandplan =
|
|
7
|
+
let hasHandplan = await Vue.resetpost('api/af-revenue/sql/saleSingleTable', {data: {tablename: 't_handplan', condition: `f_meter_state = '未抄表' and f_userfiles_id = '${data.f_userfile_id + ''}'`}}, {resolveMsg: null, rejectMsg: null})
|
|
8
8
|
console.log('是否有未抄表数据', hasHandplan.data)
|
|
9
9
|
if (owe.data.length > 0 && hasHandplan.data.length > 0) {
|
|
10
10
|
Vue.showAlert('该表具还有欠费或者未抄表数据，不能停用！！', 'danger', 0)
|
|
11
11
|
} else {
|
|
12
|
-
|
|
12
|
+
return Vue.resetpost('api/af-revenue/entity/save/t_disable', data, {resolveMsg: '表具停用成功', rejectMsg: '表具停用失败'})
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
|
|
@@ -32,11 +32,12 @@ let LogicService = {
|
|
|
32
32
|
// 表具启用
|
|
33
33
|
meterEnable (model, row) {
|
|
34
34
|
let data = {
|
|
35
|
-
f_userfiles_id: {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
},
|
|
35
|
+
// f_userfiles_id: {
|
|
36
|
+
// f_userfiles_id: row.f_userfiles_id,
|
|
37
|
+
// f_table_state: '正常',
|
|
38
|
+
// version: row.version
|
|
39
|
+
// },
|
|
40
|
+
f_userfiles_id: row.f_userfiles_id,
|
|
40
41
|
f_userfile_id: row.f_userfiles_id,
|
|
41
42
|
f_user_id: row.f_user_id,
|
|
42
43
|
record_userinfo: row.f_userinfo_id,
|
|
@@ -62,11 +63,12 @@ let LogicService = {
|
|
|
62
63
|
// 表具停用
|
|
63
64
|
meterDisable (model, row) {
|
|
64
65
|
let data = {
|
|
65
|
-
f_userfiles_id: {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
},
|
|
66
|
+
// f_userfiles_id: {
|
|
67
|
+
// f_userfiles_id: row.f_userfiles_id,
|
|
68
|
+
// f_table_state: '停用',
|
|
69
|
+
// version: row.version
|
|
70
|
+
// },
|
|
71
|
+
f_userfiles_id: row.f_userfiles_id,
|
|
70
72
|
f_userfile_id: row.f_userfiles_id,
|
|
71
73
|
f_user_id: row.f_user_id,
|
|
72
74
|
f_userinfo_id: row.f_userinfo_id,
|
|
@@ -85,8 +87,7 @@ let LogicService = {
|
|
|
85
87
|
f_zoneid: Vue.$login.f.zoneid,
|
|
86
88
|
f_zones: Vue.$login.f.zones
|
|
87
89
|
}
|
|
88
|
-
|
|
89
|
-
return co(disable)
|
|
90
|
+
return disableGen(data)
|
|
90
91
|
},
|
|
91
92
|
|
|
92
93
|
// 其他收费
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|