sale-client 3.5.249 → 3.5.251
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 +104 -104
- package/package.json +1 -1
- package/src/components/revenue/base/rightview/RecordCancel.vue +2 -0
- package/src/filiale/kelai/CardMeterCenter.vue +6 -2
- package/src/filiale/kelai/GarbageCharge.vue +4 -3
- package/src/filiale/kelai/IOTMeterCenter.vue +6 -2
- package/src/filiale/rongcheng/RecordCancel.vue +314 -314
- package/src/filiale/wenxi/plugins/FileManageService.js +3 -1
- package/src/filiale/xiangyun/machineHand.vue +2068 -0
- package/src/filiale/xiangyun/sale.js +2 -0
- package/src/main.js +1 -1
package/build/dev-server.js
CHANGED
|
@@ -1,104 +1,104 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
const [localUrl, serverRul] = ['http://
|
|
3
|
-
var merge = require('webpack-merge')
|
|
4
|
-
var baseConfig = require('./webpack.dev.conf')
|
|
5
|
-
var devConfig = {
|
|
6
|
-
devServer: {
|
|
7
|
-
contentBase: path.join(__dirname, 'src'),
|
|
8
|
-
hot: true,
|
|
9
|
-
publicPath: baseConfig.output.publicPath,
|
|
10
|
-
historyApiFallback: true,
|
|
11
|
-
port: 8089,
|
|
12
|
-
open: true,
|
|
13
|
-
stats: {
|
|
14
|
-
colors: false, // 配置控制台输出彩色日志
|
|
15
|
-
chunks: false, // 不输出构建 chunk 信息
|
|
16
|
-
children: false // 不输出子模块构建信息
|
|
17
|
-
},
|
|
18
|
-
proxy: {
|
|
19
|
-
'/rs/file': {
|
|
20
|
-
target: serverRul
|
|
21
|
-
},
|
|
22
|
-
// 查找资源服务数据
|
|
23
|
-
'/rs/search': {
|
|
24
|
-
target: serverRul
|
|
25
|
-
},
|
|
26
|
-
'/rs/sql/sale_getUser': {
|
|
27
|
-
target:
|
|
28
|
-
},
|
|
29
|
-
'/rs/logic/chargeCancel': {
|
|
30
|
-
target:
|
|
31
|
-
},
|
|
32
|
-
'/rs/sql/gasCancel': {
|
|
33
|
-
target:
|
|
34
|
-
},
|
|
35
|
-
|
|
36
|
-
'/rs/logic/marginCharge': {
|
|
37
|
-
target:
|
|
38
|
-
},
|
|
39
|
-
'/rs/logic/sale_cardCharge_logic': {
|
|
40
|
-
target:
|
|
41
|
-
},
|
|
42
|
-
|
|
43
|
-
'/rs/logic/getOperBtns': {
|
|
44
|
-
target:
|
|
45
|
-
},
|
|
46
|
-
'/rs/logic/commonCal': {
|
|
47
|
-
target:
|
|
48
|
-
},
|
|
49
|
-
// 查找资源服务数据
|
|
50
|
-
'/rs/logic/getLogin': {
|
|
51
|
-
target: serverRul
|
|
52
|
-
},
|
|
53
|
-
// 查找资源服务数据
|
|
54
|
-
'/rs/logic/getInitData': {
|
|
55
|
-
target: serverRul
|
|
56
|
-
},
|
|
57
|
-
'/rs/logic/getSaleInitData': {
|
|
58
|
-
target: serverRul
|
|
59
|
-
},
|
|
60
|
-
// 用户登录服务地址
|
|
61
|
-
'/rs/user': {
|
|
62
|
-
target: serverRul
|
|
63
|
-
},
|
|
64
|
-
'/rs/path': {
|
|
65
|
-
target: serverRul
|
|
66
|
-
},
|
|
67
|
-
'/rs/data': {
|
|
68
|
-
target: serverRul
|
|
69
|
-
},
|
|
70
|
-
'/rs/license': {
|
|
71
|
-
target: serverRul
|
|
72
|
-
},
|
|
73
|
-
'/rs/db': {
|
|
74
|
-
target: serverRul
|
|
75
|
-
},
|
|
76
|
-
'/excel': {
|
|
77
|
-
target: serverRul
|
|
78
|
-
},
|
|
79
|
-
'/rs/config': {
|
|
80
|
-
target: serverRul
|
|
81
|
-
},
|
|
82
|
-
'/rs/report': {
|
|
83
|
-
target: serverRul
|
|
84
|
-
},
|
|
85
|
-
'/rs/vue': {
|
|
86
|
-
target: serverRul
|
|
87
|
-
},
|
|
88
|
-
'/rs/logic': {
|
|
89
|
-
target: localUrl
|
|
90
|
-
},
|
|
91
|
-
'/rs/sql': {
|
|
92
|
-
target: localUrl
|
|
93
|
-
},
|
|
94
|
-
'/webmeter': {
|
|
95
|
-
target: serverRul
|
|
96
|
-
},
|
|
97
|
-
'/rs': {
|
|
98
|
-
target: serverRul
|
|
99
|
-
// changeOrigin: true
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
module.exports = merge(baseConfig, devConfig)
|
|
1
|
+
var path = require('path')
|
|
2
|
+
const [localUrl, serverRul] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
|
|
3
|
+
var merge = require('webpack-merge')
|
|
4
|
+
var baseConfig = require('./webpack.dev.conf')
|
|
5
|
+
var devConfig = {
|
|
6
|
+
devServer: {
|
|
7
|
+
contentBase: path.join(__dirname, 'src'),
|
|
8
|
+
hot: true,
|
|
9
|
+
publicPath: baseConfig.output.publicPath,
|
|
10
|
+
historyApiFallback: true,
|
|
11
|
+
port: 8089,
|
|
12
|
+
open: true,
|
|
13
|
+
stats: {
|
|
14
|
+
colors: false, // 配置控制台输出彩色日志
|
|
15
|
+
chunks: false, // 不输出构建 chunk 信息
|
|
16
|
+
children: false // 不输出子模块构建信息
|
|
17
|
+
},
|
|
18
|
+
proxy: {
|
|
19
|
+
'/rs/file': {
|
|
20
|
+
target: serverRul
|
|
21
|
+
},
|
|
22
|
+
// 查找资源服务数据
|
|
23
|
+
'/rs/search': {
|
|
24
|
+
target: serverRul
|
|
25
|
+
},
|
|
26
|
+
'/rs/sql/sale_getUser': {
|
|
27
|
+
target: localUrl
|
|
28
|
+
},
|
|
29
|
+
'/rs/logic/chargeCancel': {
|
|
30
|
+
target: localUrl
|
|
31
|
+
},
|
|
32
|
+
'/rs/sql/gasCancel': {
|
|
33
|
+
target: localUrl
|
|
34
|
+
},
|
|
35
|
+
|
|
36
|
+
'/rs/logic/marginCharge': {
|
|
37
|
+
target: localUrl
|
|
38
|
+
},
|
|
39
|
+
'/rs/logic/sale_cardCharge_logic': {
|
|
40
|
+
target: localUrl
|
|
41
|
+
},
|
|
42
|
+
|
|
43
|
+
'/rs/logic/getOperBtns': {
|
|
44
|
+
target: localUrl
|
|
45
|
+
},
|
|
46
|
+
'/rs/logic/commonCal': {
|
|
47
|
+
target: localUrl
|
|
48
|
+
},
|
|
49
|
+
// 查找资源服务数据
|
|
50
|
+
'/rs/logic/getLogin': {
|
|
51
|
+
target: serverRul
|
|
52
|
+
},
|
|
53
|
+
// 查找资源服务数据
|
|
54
|
+
'/rs/logic/getInitData': {
|
|
55
|
+
target: serverRul
|
|
56
|
+
},
|
|
57
|
+
'/rs/logic/getSaleInitData': {
|
|
58
|
+
target: serverRul
|
|
59
|
+
},
|
|
60
|
+
// 用户登录服务地址
|
|
61
|
+
'/rs/user': {
|
|
62
|
+
target: serverRul
|
|
63
|
+
},
|
|
64
|
+
'/rs/path': {
|
|
65
|
+
target: serverRul
|
|
66
|
+
},
|
|
67
|
+
'/rs/data': {
|
|
68
|
+
target: serverRul
|
|
69
|
+
},
|
|
70
|
+
'/rs/license': {
|
|
71
|
+
target: serverRul
|
|
72
|
+
},
|
|
73
|
+
'/rs/db': {
|
|
74
|
+
target: serverRul
|
|
75
|
+
},
|
|
76
|
+
'/excel': {
|
|
77
|
+
target: serverRul
|
|
78
|
+
},
|
|
79
|
+
'/rs/config': {
|
|
80
|
+
target: serverRul
|
|
81
|
+
},
|
|
82
|
+
'/rs/report': {
|
|
83
|
+
target: serverRul
|
|
84
|
+
},
|
|
85
|
+
'/rs/vue': {
|
|
86
|
+
target: serverRul
|
|
87
|
+
},
|
|
88
|
+
'/rs/logic': {
|
|
89
|
+
target: localUrl
|
|
90
|
+
},
|
|
91
|
+
'/rs/sql': {
|
|
92
|
+
target: localUrl
|
|
93
|
+
},
|
|
94
|
+
'/webmeter': {
|
|
95
|
+
target: serverRul
|
|
96
|
+
},
|
|
97
|
+
'/rs': {
|
|
98
|
+
target: serverRul
|
|
99
|
+
// changeOrigin: true
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
module.exports = merge(baseConfig, devConfig)
|
package/package.json
CHANGED
|
@@ -147,9 +147,11 @@
|
|
|
147
147
|
|
|
148
148
|
<div class="row" style="padding-top: 0.5em;">
|
|
149
149
|
<div class="col-sm-4 form-group">
|
|
150
|
+
<label class="font_normal_body" style="color: red;">欠费账期</label>
|
|
151
|
+
<input class="input_search" style="width:60%" type="text" v-model="accountperiod" disabled>
|
|
150
152
|
</div>
|
|
151
153
|
<div class="col-sm-4 form-group">
|
|
152
|
-
<label class="font_normal_body">垃 圾 费</label>
|
|
154
|
+
<label class="font_normal_body" style="color: red;">垃 圾 费</label>
|
|
153
155
|
<input class="input_search" style="width:60%" type="number" v-model="garbage_money" disabled>
|
|
154
156
|
</div>
|
|
155
157
|
<div class="col-sm-4 form-group">
|
|
@@ -556,7 +558,8 @@
|
|
|
556
558
|
garbage_list: [],
|
|
557
559
|
garbage_number: 0,
|
|
558
560
|
garbage_money: 0,
|
|
559
|
-
totalCharge: 0
|
|
561
|
+
totalCharge: 0,
|
|
562
|
+
accountperiod: ''
|
|
560
563
|
}
|
|
561
564
|
},
|
|
562
565
|
props: ['row', 'cardData'],
|
|
@@ -647,6 +650,7 @@
|
|
|
647
650
|
this.garbage_list = res.data.list
|
|
648
651
|
this.garbage_number = res.data.list.length
|
|
649
652
|
this.garbage_money = res.data.money
|
|
653
|
+
this.accountperiod = res.data.accountperiod
|
|
650
654
|
},
|
|
651
655
|
// 校验发票信息
|
|
652
656
|
checkInvoiceMsg (flag) {
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
<label class="font_normal_body" title="参数名称：付款方式">收款方式</label>
|
|
8
8
|
<input type="text" v-show="false" v-model="$refs.payment.selectedItems"
|
|
9
9
|
v-validate:payment='{required: true }'>
|
|
10
|
-
<v-select v-model="f_payment"
|
|
10
|
+
<v-select v-model="model.f_payment"
|
|
11
11
|
placeholder='请选择'
|
|
12
12
|
style="width:60%"
|
|
13
13
|
:value.sync="model.f_payment"
|
|
@@ -91,7 +91,7 @@ export default {
|
|
|
91
91
|
hasBillManage: false, // 默认不启用发票管理
|
|
92
92
|
overBalance: false, // 为true时退费金额可以大于余额
|
|
93
93
|
printType: '普通收据', // 收据/电子票/专用发票/国税发票
|
|
94
|
-
payment: '
|
|
94
|
+
payment: '现金',
|
|
95
95
|
billType: '燃气费'
|
|
96
96
|
},
|
|
97
97
|
model: {
|
|
@@ -144,7 +144,8 @@ export default {
|
|
|
144
144
|
f_orgid: this.$login.f.orgid,
|
|
145
145
|
f_orgname: this.$login.f.orgs,
|
|
146
146
|
f_depid: this.$login.f.depids,
|
|
147
|
-
f_depname: this.$login.f.deps
|
|
147
|
+
f_depname: this.$login.f.deps,
|
|
148
|
+
f_payment: this.model.f_payment[0]
|
|
148
149
|
}
|
|
149
150
|
console.log('垃圾费收费', param)
|
|
150
151
|
let res = await this.$resetpost('rs/logic/garbageCharges', {data: param}, {warnMsg: `确定要对用户${this.row.f_user_name}进行垃圾费收费吗？`, resolveMsg: '收费成功！！', rejectMsg: '收费失败！！请重试！！'})
|
|
@@ -137,9 +137,11 @@
|
|
|
137
137
|
</div>
|
|
138
138
|
<div class="row" style="padding-top: 0.5em;">
|
|
139
139
|
<div class="col-sm-4 form-group">
|
|
140
|
+
<label class="font_normal_body" style="color: red;">欠费账期</label>
|
|
141
|
+
<input class="input_search" style="width:60%" type="text" v-model="accountperiod" disabled>
|
|
140
142
|
</div>
|
|
141
143
|
<div class="col-sm-4 form-group">
|
|
142
|
-
<label class="font_normal_body">垃 圾 费</label>
|
|
144
|
+
<label class="font_normal_body" style="color: red;">垃 圾 费</label>
|
|
143
145
|
<input class="input_search" style="width:60%" type="number" v-model="garbage_money" disabled>
|
|
144
146
|
</div>
|
|
145
147
|
<div class="col-sm-4 form-group">
|
|
@@ -517,7 +519,8 @@
|
|
|
517
519
|
garbage_list: [],
|
|
518
520
|
garbage_number: 0,
|
|
519
521
|
garbage_money: 0,
|
|
520
|
-
totalCharge: 0
|
|
522
|
+
totalCharge: 0,
|
|
523
|
+
accountperiod: ''
|
|
521
524
|
}
|
|
522
525
|
},
|
|
523
526
|
props: ['row'],
|
|
@@ -606,6 +609,7 @@
|
|
|
606
609
|
this.garbage_list = res.data.list
|
|
607
610
|
this.garbage_number = res.data.list.length
|
|
608
611
|
this.garbage_money = res.data.money
|
|
612
|
+
this.accountperiod = res.data.accountperiod
|
|
609
613
|
},
|
|
610
614
|
// 校验发票信息
|
|
611
615
|
checkInvoiceMsg () {
|