sale-client 3.5.123 → 3.5.124
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 +193 -193
- package/package.json +1 -1
- package/src/components/revenue/Common/PaymentCode.vue +2 -0
- package/src/filiale/dongguan/components/common/userinfo_detail/UserBaseInfoNew.vue +20 -5
- package/src/filiale/gehua/BankPayment.vue +281 -0
- package/src/filiale/gehua/sale.js +4 -1
- package/src/filiale/macheng/FilesManageNew/UserGeneralInfoTest.vue +1 -1
- package/src/filiale/tongchuan/MeterinfoTest.vue +11 -1
package/build/dev-server.js
CHANGED
|
@@ -1,193 +1,193 @@
|
|
|
1
|
-
var express = require('express')
|
|
2
|
-
var webpack = require('webpack')
|
|
3
|
-
var config = require('./webpack.dev.conf')
|
|
4
|
-
var proxyMiddleware = require('http-proxy-middleware')
|
|
5
|
-
// var httpProxy = require('http-proxy')
|
|
6
|
-
|
|
7
|
-
var app = express()
|
|
8
|
-
var compiler = webpack(config)
|
|
9
|
-
// var proxy = httpProxy.createProxyServer()
|
|
10
|
-
|
|
11
|
-
// Define HTTP proxies to your custom API backend
|
|
12
|
-
// https://github.com/chimurai/http-proxy-middleware
|
|
13
|
-
var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
|
|
14
|
-
// 公司测试服务
|
|
15
|
-
// var fuwu = 'http://192.168.50.4:8400'
|
|
16
|
-
var fuwu = 'http://
|
|
17
|
-
// var fuwu = 'http://121.36.106.17:8400/'
|
|
18
|
-
// 铜川正式
|
|
19
|
-
// var fuwu = 'http://61.134.55.234:9999/'
|
|
20
|
-
// 铜川测试
|
|
21
|
-
// var fuwu = 'http://61.134.55.234:9999/'
|
|
22
|
-
// var fuwu = 'http://60.222.250.39:8300/'
|
|
23
|
-
// 韶关
|
|
24
|
-
// var fuwu = 'http://119.146.1.106:8300/'
|
|
25
|
-
// 巩义测试服务
|
|
26
|
-
// var fuwu = 'http://192.168.0.227:8400'
|
|
27
|
-
// 燎原测试服务
|
|
28
|
-
// var fuwu = 'http://121.41.19.238:8400 '
|
|
29
|
-
// var fuwu = 'http://121.41.19.238:9001/'
|
|
30
|
-
|
|
31
|
-
// var fuwu = 'http://139.214.92.34:8301/'
|
|
32
|
-
|
|
33
|
-
var proxyTable = {
|
|
34
|
-
// '/'
|
|
35
|
-
// '/rs/logic/stopBasicLivingNew':{
|
|
36
|
-
// target:'http://127.0.0.1:8080'
|
|
37
|
-
// },
|
|
38
|
-
// '/rs/logic/getBatchOperaPro':{
|
|
39
|
-
// target:'http://127.0.0.1:8080'
|
|
40
|
-
// },
|
|
41
|
-
// '/rs/sql/sale_getUser':{
|
|
42
|
-
// target:'http://127.0.0.1:8080'
|
|
43
|
-
// },
|
|
44
|
-
// '/rs/logic/getOperBtns':{
|
|
45
|
-
// target:'http://127.0.0.1:8080'
|
|
46
|
-
// },
|
|
47
|
-
// '/rs/file/uploadFile':{
|
|
48
|
-
// target:'http://127.0.0.1:8080'
|
|
49
|
-
// },
|
|
50
|
-
// '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
|
|
51
|
-
// target:'http://127.0.0.1:8080'
|
|
52
|
-
// },
|
|
53
|
-
// '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
|
|
54
|
-
// target:'http:127.0.0.1:8080'
|
|
55
|
-
// },
|
|
56
|
-
// '/rs/sql/getDownPlan':{
|
|
57
|
-
// target:'http:127.0.0.1:8080'
|
|
58
|
-
// },
|
|
59
|
-
// '/rs/logic/saleExport': {
|
|
60
|
-
// target: fuwu
|
|
61
|
-
// },
|
|
62
|
-
// '/rs/logic/saleGetExportProgress': {
|
|
63
|
-
// target: fuwu
|
|
64
|
-
// },
|
|
65
|
-
// '/rs/logic/getWarningMsg': {
|
|
66
|
-
// target: 'http://localhost:8080/'
|
|
67
|
-
// },
|
|
68
|
-
'/rs/file': {
|
|
69
|
-
target: fuwu
|
|
70
|
-
},
|
|
71
|
-
'/files': {
|
|
72
|
-
target: fuwu
|
|
73
|
-
},
|
|
74
|
-
// 查找资源服务数据
|
|
75
|
-
'/rs/search': {
|
|
76
|
-
target: fuwu
|
|
77
|
-
},
|
|
78
|
-
// 查找资源服务数据
|
|
79
|
-
'/rs/logic/getLogin': {
|
|
80
|
-
target: fuwu
|
|
81
|
-
},
|
|
82
|
-
// 查找资源服务数据
|
|
83
|
-
'/rs/logic/getInitData': {
|
|
84
|
-
target: fuwu
|
|
85
|
-
},
|
|
86
|
-
'/rs/logic/getSaleInitData': {
|
|
87
|
-
target: fuwu
|
|
88
|
-
},
|
|
89
|
-
'/invoice': {
|
|
90
|
-
target: fuwu
|
|
91
|
-
},
|
|
92
|
-
// 用户登录服务地址
|
|
93
|
-
'/rs/user': {
|
|
94
|
-
target: fuwu
|
|
95
|
-
},
|
|
96
|
-
'/rs/path/getParams': {
|
|
97
|
-
target: fuwu
|
|
98
|
-
},
|
|
99
|
-
'/rs/data': {
|
|
100
|
-
target: fuwu
|
|
101
|
-
},
|
|
102
|
-
'/rs/license': {
|
|
103
|
-
target: fuwu
|
|
104
|
-
},
|
|
105
|
-
'/rs/db': {
|
|
106
|
-
target: fuwu
|
|
107
|
-
},
|
|
108
|
-
'/excel': {
|
|
109
|
-
target: fuwu
|
|
110
|
-
},
|
|
111
|
-
'/rs/config': {
|
|
112
|
-
target: fuwu
|
|
113
|
-
},
|
|
114
|
-
'/rs/sql/getLicenseById': {
|
|
115
|
-
target: fuwu
|
|
116
|
-
},
|
|
117
|
-
'/rs/sql/manage_getarealist': {
|
|
118
|
-
target: fuwu
|
|
119
|
-
},
|
|
120
|
-
'/rs/sql/manage_getstreetlist': {
|
|
121
|
-
target: fuwu
|
|
122
|
-
},
|
|
123
|
-
'/rs/report': {
|
|
124
|
-
target: 'http://121.36.106.17:8400/'
|
|
125
|
-
},
|
|
126
|
-
'/rs/vue': {
|
|
127
|
-
target: fuwu
|
|
128
|
-
},
|
|
129
|
-
'/webmeter': {
|
|
130
|
-
target: 'http://192.168.50.4:8450'
|
|
131
|
-
},
|
|
132
|
-
'/rs': {
|
|
133
|
-
// target: 'http://192.168.30.63:8081/'
|
|
134
|
-
// target: 'http://121.36.106.17:8400/'
|
|
135
|
-
target: fuwu
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
140
|
-
publicPath: config.output.publicPath,
|
|
141
|
-
stats: {
|
|
142
|
-
colors: true,
|
|
143
|
-
chunks: false
|
|
144
|
-
}
|
|
145
|
-
})
|
|
146
|
-
|
|
147
|
-
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
148
|
-
// force page reload when html-webpack-plugin template changes
|
|
149
|
-
compiler.plugin('compilation', function (compilation) {
|
|
150
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
151
|
-
hotMiddleware.publish({action: 'reload'})
|
|
152
|
-
cb()
|
|
153
|
-
})
|
|
154
|
-
})
|
|
155
|
-
|
|
156
|
-
// proxy api requests
|
|
157
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
158
|
-
var options = proxyTable[context]
|
|
159
|
-
if (typeof options === 'string') {
|
|
160
|
-
options = {target: options}
|
|
161
|
-
}
|
|
162
|
-
app.use(proxyMiddleware(context, options))
|
|
163
|
-
})
|
|
164
|
-
|
|
165
|
-
// handle fallback for HTML5 history API
|
|
166
|
-
app.use(require('connect-history-api-fallback')())
|
|
167
|
-
// app.use(function (req, res, next) {
|
|
168
|
-
// res.header('Access-Control-Allow-Origin', '*')
|
|
169
|
-
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
170
|
-
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
171
|
-
// res.header('X-Powered-By', '3,2,1')
|
|
172
|
-
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
173
|
-
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
174
|
-
// next()
|
|
175
|
-
// })
|
|
176
|
-
|
|
177
|
-
// serve webpack bundle output
|
|
178
|
-
app.use(devMiddleware)
|
|
179
|
-
|
|
180
|
-
// enable hot-reload and state-preserving
|
|
181
|
-
// compilation error display
|
|
182
|
-
app.use(hotMiddleware)
|
|
183
|
-
|
|
184
|
-
// serve pure static assets
|
|
185
|
-
app.use('/static', express.static('./static'))
|
|
186
|
-
|
|
187
|
-
module.exports = app.listen(
|
|
188
|
-
if (err) {
|
|
189
|
-
console.log(err)
|
|
190
|
-
return
|
|
191
|
-
}
|
|
192
|
-
console.log('Listening at http://localhost:8089')
|
|
193
|
-
})
|
|
1
|
+
var express = require('express')
|
|
2
|
+
var webpack = require('webpack')
|
|
3
|
+
var config = require('./webpack.dev.conf')
|
|
4
|
+
var proxyMiddleware = require('http-proxy-middleware')
|
|
5
|
+
// var httpProxy = require('http-proxy')
|
|
6
|
+
|
|
7
|
+
var app = express()
|
|
8
|
+
var compiler = webpack(config)
|
|
9
|
+
// var proxy = httpProxy.createProxyServer()
|
|
10
|
+
|
|
11
|
+
// Define HTTP proxies to your custom API backend
|
|
12
|
+
// https://github.com/chimurai/http-proxy-middleware
|
|
13
|
+
var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
|
|
14
|
+
// 公司测试服务
|
|
15
|
+
// var fuwu = 'http://192.168.50.4:8400'
|
|
16
|
+
var fuwu = 'http://39.99.85.14:8400'
|
|
17
|
+
// var fuwu = 'http://121.36.106.17:8400/'
|
|
18
|
+
// 铜川正式
|
|
19
|
+
// var fuwu = 'http://61.134.55.234:9999/'
|
|
20
|
+
// 铜川测试
|
|
21
|
+
// var fuwu = 'http://61.134.55.234:9999/'
|
|
22
|
+
// var fuwu = 'http://60.222.250.39:8300/'
|
|
23
|
+
// 韶关
|
|
24
|
+
// var fuwu = 'http://119.146.1.106:8300/'
|
|
25
|
+
// 巩义测试服务
|
|
26
|
+
// var fuwu = 'http://192.168.0.227:8400'
|
|
27
|
+
// 燎原测试服务
|
|
28
|
+
// var fuwu = 'http://121.41.19.238:8400 '
|
|
29
|
+
// var fuwu = 'http://121.41.19.238:9001/'
|
|
30
|
+
|
|
31
|
+
// var fuwu = 'http://139.214.92.34:8301/'
|
|
32
|
+
|
|
33
|
+
var proxyTable = {
|
|
34
|
+
// '/'
|
|
35
|
+
// '/rs/logic/stopBasicLivingNew':{
|
|
36
|
+
// target:'http://127.0.0.1:8080'
|
|
37
|
+
// },
|
|
38
|
+
// '/rs/logic/getBatchOperaPro':{
|
|
39
|
+
// target:'http://127.0.0.1:8080'
|
|
40
|
+
// },
|
|
41
|
+
// '/rs/sql/sale_getUser':{
|
|
42
|
+
// target:'http://127.0.0.1:8080'
|
|
43
|
+
// },
|
|
44
|
+
// '/rs/logic/getOperBtns':{
|
|
45
|
+
// target:'http://127.0.0.1:8080'
|
|
46
|
+
// },
|
|
47
|
+
// '/rs/file/uploadFile':{
|
|
48
|
+
// target:'http://127.0.0.1:8080'
|
|
49
|
+
// },
|
|
50
|
+
// '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
|
|
51
|
+
// target:'http://127.0.0.1:8080'
|
|
52
|
+
// },
|
|
53
|
+
// '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
|
|
54
|
+
// target:'http:127.0.0.1:8080'
|
|
55
|
+
// },
|
|
56
|
+
// '/rs/sql/getDownPlan':{
|
|
57
|
+
// target:'http:127.0.0.1:8080'
|
|
58
|
+
// },
|
|
59
|
+
// '/rs/logic/saleExport': {
|
|
60
|
+
// target: fuwu
|
|
61
|
+
// },
|
|
62
|
+
// '/rs/logic/saleGetExportProgress': {
|
|
63
|
+
// target: fuwu
|
|
64
|
+
// },
|
|
65
|
+
// '/rs/logic/getWarningMsg': {
|
|
66
|
+
// target: 'http://localhost:8080/'
|
|
67
|
+
// },
|
|
68
|
+
'/rs/file': {
|
|
69
|
+
target: fuwu
|
|
70
|
+
},
|
|
71
|
+
'/files': {
|
|
72
|
+
target: fuwu
|
|
73
|
+
},
|
|
74
|
+
// 查找资源服务数据
|
|
75
|
+
'/rs/search': {
|
|
76
|
+
target: fuwu
|
|
77
|
+
},
|
|
78
|
+
// 查找资源服务数据
|
|
79
|
+
'/rs/logic/getLogin': {
|
|
80
|
+
target: fuwu
|
|
81
|
+
},
|
|
82
|
+
// 查找资源服务数据
|
|
83
|
+
'/rs/logic/getInitData': {
|
|
84
|
+
target: fuwu
|
|
85
|
+
},
|
|
86
|
+
'/rs/logic/getSaleInitData': {
|
|
87
|
+
target: fuwu
|
|
88
|
+
},
|
|
89
|
+
'/invoice': {
|
|
90
|
+
target: fuwu
|
|
91
|
+
},
|
|
92
|
+
// 用户登录服务地址
|
|
93
|
+
'/rs/user': {
|
|
94
|
+
target: fuwu
|
|
95
|
+
},
|
|
96
|
+
'/rs/path/getParams': {
|
|
97
|
+
target: fuwu
|
|
98
|
+
},
|
|
99
|
+
'/rs/data': {
|
|
100
|
+
target: fuwu
|
|
101
|
+
},
|
|
102
|
+
'/rs/license': {
|
|
103
|
+
target: fuwu
|
|
104
|
+
},
|
|
105
|
+
'/rs/db': {
|
|
106
|
+
target: fuwu
|
|
107
|
+
},
|
|
108
|
+
'/excel': {
|
|
109
|
+
target: fuwu
|
|
110
|
+
},
|
|
111
|
+
'/rs/config': {
|
|
112
|
+
target: fuwu
|
|
113
|
+
},
|
|
114
|
+
'/rs/sql/getLicenseById': {
|
|
115
|
+
target: fuwu
|
|
116
|
+
},
|
|
117
|
+
'/rs/sql/manage_getarealist': {
|
|
118
|
+
target: fuwu
|
|
119
|
+
},
|
|
120
|
+
'/rs/sql/manage_getstreetlist': {
|
|
121
|
+
target: fuwu
|
|
122
|
+
},
|
|
123
|
+
'/rs/report': {
|
|
124
|
+
target: 'http://121.36.106.17:8400/'
|
|
125
|
+
},
|
|
126
|
+
'/rs/vue': {
|
|
127
|
+
target: fuwu
|
|
128
|
+
},
|
|
129
|
+
'/webmeter': {
|
|
130
|
+
target: 'http://192.168.50.4:8450'
|
|
131
|
+
},
|
|
132
|
+
'/rs': {
|
|
133
|
+
// target: 'http://192.168.30.63:8081/'
|
|
134
|
+
// target: 'http://121.36.106.17:8400/'
|
|
135
|
+
target: fuwu
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
140
|
+
publicPath: config.output.publicPath,
|
|
141
|
+
stats: {
|
|
142
|
+
colors: true,
|
|
143
|
+
chunks: false
|
|
144
|
+
}
|
|
145
|
+
})
|
|
146
|
+
|
|
147
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
148
|
+
// force page reload when html-webpack-plugin template changes
|
|
149
|
+
compiler.plugin('compilation', function (compilation) {
|
|
150
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
151
|
+
hotMiddleware.publish({action: 'reload'})
|
|
152
|
+
cb()
|
|
153
|
+
})
|
|
154
|
+
})
|
|
155
|
+
|
|
156
|
+
// proxy api requests
|
|
157
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
158
|
+
var options = proxyTable[context]
|
|
159
|
+
if (typeof options === 'string') {
|
|
160
|
+
options = {target: options}
|
|
161
|
+
}
|
|
162
|
+
app.use(proxyMiddleware(context, options))
|
|
163
|
+
})
|
|
164
|
+
|
|
165
|
+
// handle fallback for HTML5 history API
|
|
166
|
+
app.use(require('connect-history-api-fallback')())
|
|
167
|
+
// app.use(function (req, res, next) {
|
|
168
|
+
// res.header('Access-Control-Allow-Origin', '*')
|
|
169
|
+
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
170
|
+
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
171
|
+
// res.header('X-Powered-By', '3,2,1')
|
|
172
|
+
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
173
|
+
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
174
|
+
// next()
|
|
175
|
+
// })
|
|
176
|
+
|
|
177
|
+
// serve webpack bundle output
|
|
178
|
+
app.use(devMiddleware)
|
|
179
|
+
|
|
180
|
+
// enable hot-reload and state-preserving
|
|
181
|
+
// compilation error display
|
|
182
|
+
app.use(hotMiddleware)
|
|
183
|
+
|
|
184
|
+
// serve pure static assets
|
|
185
|
+
app.use('/static', express.static('./static'))
|
|
186
|
+
|
|
187
|
+
module.exports = app.listen(8085, function (err) {
|
|
188
|
+
if (err) {
|
|
189
|
+
console.log(err)
|
|
190
|
+
return
|
|
191
|
+
}
|
|
192
|
+
console.log('Listening at http://localhost:8089')
|
|
193
|
+
})
|
package/package.json
CHANGED
|
@@ -237,9 +237,11 @@
|
|
|
237
237
|
</div>
|
|
238
238
|
</article>
|
|
239
239
|
<footer slot="modal-footer" class="modal-footer">
|
|
240
|
-
<button type="button" class="
|
|
240
|
+
<button type="button" class="btn btn-info btn-ln fr" @click='valveoperate("权限关阀")'>权限关阀</button>
|
|
241
241
|
|
|
242
|
-
<button type="button" class="
|
|
242
|
+
<button type="button" class="button_search btn-ln fr" @click='valveoperate("开阀")'>开阀</button>
|
|
243
|
+
|
|
244
|
+
<button type="button" class="btn btn-info btn-ln fr" @click='valveoperate("关阀")'>关阀</button>
|
|
243
245
|
</footer>
|
|
244
246
|
</modal>
|
|
245
247
|
<!-- 销户-->
|
|
@@ -410,18 +412,31 @@
|
|
|
410
412
|
},
|
|
411
413
|
// 开关阀操作
|
|
412
414
|
async valveoperate (oper) {
|
|
413
|
-
|
|
415
|
+
console.log('oper----------------',oper)
|
|
416
|
+
let msg = ''
|
|
417
|
+
let nnum
|
|
418
|
+
if (oper === '权限关阀'){
|
|
419
|
+
msg = '权限关阀'
|
|
420
|
+
nnum = 2
|
|
421
|
+
} else if (oper === '关阀') {
|
|
422
|
+
msg = '手动关阀'
|
|
423
|
+
nnum = 0
|
|
424
|
+
}else {
|
|
425
|
+
msg = '手动开阀'
|
|
426
|
+
nnum = 1
|
|
427
|
+
}
|
|
414
428
|
let datas = {
|
|
415
429
|
instructType: '阀门控制',
|
|
416
|
-
instructTitle:
|
|
430
|
+
instructTitle: `${msg}`,
|
|
417
431
|
condition: `t_userfiles.f_userfiles_id='${this.row.f_userfiles_id}'`,
|
|
418
432
|
meterBrandName: this.row.f_alias,
|
|
419
433
|
f_instruct_state: '待发送',
|
|
420
434
|
inputtor: Vue.$login.f.name,
|
|
421
435
|
reasonInfo: this.operateReason,
|
|
422
436
|
meternumberf: this.row.f_meternumber,
|
|
423
|
-
contentData: {isOpen:
|
|
437
|
+
contentData: {isOpen: nnum}
|
|
424
438
|
}
|
|
439
|
+
console.log('-------------------->{data}',datas)
|
|
425
440
|
await this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
|
|
426
441
|
{warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
|
|
427
442
|
this.valve = false
|
|
@@ -0,0 +1,281 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="basic-main" style="height: 98%">
|
|
3
|
+
<div class="flex">
|
|
4
|
+
<criteria-paged :model="model" v-ref:paged>
|
|
5
|
+
<criteria partial='criteria' @condition-changed='search' v-ref:cri>
|
|
6
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
7
|
+
<div class="row">
|
|
8
|
+
<div
|
|
9
|
+
:class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
|
|
10
|
+
class="form-group">
|
|
11
|
+
<label class="font_normal_body">组织机构</label>
|
|
12
|
+
<res-select :initresid='$parent.$parent.curorgid'
|
|
13
|
+
@res-select="$parent.$parent.getorg"
|
|
14
|
+
class="select select_list"
|
|
15
|
+
restype='organization'
|
|
16
|
+
style="width: 60%">
|
|
17
|
+
</res-select>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="col-sm-2 form-group">
|
|
20
|
+
<label for="f_bank_name" class="font_normal_body">银行名称:</label>
|
|
21
|
+
<v-select id="f_bank_name"
|
|
22
|
+
v-model="model.f_bank_name"
|
|
23
|
+
placeholder='银行名称'
|
|
24
|
+
condition="(s.f_bank_name= '{}' or s.bankname='{}') "
|
|
25
|
+
:value.sync="model.f_bank_name"
|
|
26
|
+
:options='$parent.$parent.bankname'
|
|
27
|
+
close-on-select ></v-select>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="col-sm-2 form-group">
|
|
30
|
+
<label for="msg" class="font_normal_body" title="对账信息">对账信息:</label>
|
|
31
|
+
<v-select id="msg"
|
|
32
|
+
v-model="model.msg"
|
|
33
|
+
placeholder='对账信息'
|
|
34
|
+
condition="msg = '{}' "
|
|
35
|
+
:value.sync="model.msg"
|
|
36
|
+
:options='$parent.$parent.msg'
|
|
37
|
+
close-on-select ></v-select>
|
|
38
|
+
</div>
|
|
39
|
+
<div class="col-sm-2 form-group">
|
|
40
|
+
<label for="startDate" class="font_normal_body">开始日期:</label>
|
|
41
|
+
<datepicker id="startDate" placeholder="开始日期"
|
|
42
|
+
v-model="model.startDate" style="width: 55%"
|
|
43
|
+
:value.sync="model.startDate"
|
|
44
|
+
condition="(f_trade_date >= '{} 00:00:00' or s.f_operate_date >= '{} 00:00:00')"
|
|
45
|
+
:disabled-days-of-Week="[]"
|
|
46
|
+
:format="'yyyy-MM-dd'"
|
|
47
|
+
:show-reset-button="reset">
|
|
48
|
+
</datepicker>
|
|
49
|
+
</div>
|
|
50
|
+
<div class="col-sm-2 form-group">
|
|
51
|
+
<label for="endDate" class="font_normal_body"> 结束日期:</label>
|
|
52
|
+
<datepicker id="endDate" placeholder="结束日期"
|
|
53
|
+
v-model="model.endDate" style="width: 55%"
|
|
54
|
+
:value.sync="model.endDate"
|
|
55
|
+
condition="(f_trade_date < '{} 23:59:59' or s.f_operate_date < '{} 23:59:59' )"
|
|
56
|
+
:disabled-days-of-Week="[]"
|
|
57
|
+
:format="'yyyy-MM-dd'"
|
|
58
|
+
:show-reset-button="reset">
|
|
59
|
+
</datepicker>
|
|
60
|
+
|
|
61
|
+
</div>
|
|
62
|
+
<div class="form-group button-range" style="float: right">
|
|
63
|
+
<button class="button_search button_spacing width-60" @click="search()" v-el:cx>查询</button>
|
|
64
|
+
<!-- <export-excel :data="{orderitem: 'msg_id,f_delivery_date DESC',condition: condition,startDate: this.model.startDate,endDate: this.model.endDate,bankname: this.model.f_bank_name[0]}"-->
|
|
65
|
+
<!-- bean="银行对账查询导出" sqlurl="rs/logic/exportfile"></export-excel>-->
|
|
66
|
+
<export-excel :data="$parent.$parent.getCondition" sql-name="bankPayment"
|
|
67
|
+
template-name="银行对账查询导出" sqlurl="rs/logic/saleExport"
|
|
68
|
+
:field="$parent.$parent.getfield" :choose-col="true"></export-excel>
|
|
69
|
+
<div style="float: right" class="button_spacing"
|
|
70
|
+
:class="{'button_shrink_top': $parent.$parent.criteriaShow,'button_shrink_bottom': !$parent.$parent.criteriaShow}"
|
|
71
|
+
@click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></div>
|
|
72
|
+
</div>
|
|
73
|
+
</div>
|
|
74
|
+
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
75
|
+
|
|
76
|
+
<div class="col-sm-2 form-group">
|
|
77
|
+
<label class="font_normal_body">用户编号:</label>
|
|
78
|
+
<input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
|
|
79
|
+
condition="f_userinfo_code = '{}'" placeholder='用户编号'>
|
|
80
|
+
</div>
|
|
81
|
+
<div class="col-sm-2 form-group">
|
|
82
|
+
<label class="font_normal_body"> 订单号:</label>
|
|
83
|
+
<input type="text" class="input_search" style="width:60%" v-model="model.f_serial_id"
|
|
84
|
+
condition="(f_serial_id = '{}' or f_trade_number = '{}')" placeholder='订单号'>
|
|
85
|
+
</div>
|
|
86
|
+
|
|
87
|
+
</div>
|
|
88
|
+
</div>
|
|
89
|
+
</criteria>
|
|
90
|
+
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
|
|
91
|
+
<template partial='head'>
|
|
92
|
+
<tr>
|
|
93
|
+
<th>序号</th>
|
|
94
|
+
<th>用户编号</th>
|
|
95
|
+
<th>银行名称</th>
|
|
96
|
+
<th>燃气方订单号</th>
|
|
97
|
+
<th>银行方订单号</th>
|
|
98
|
+
<th>燃气方金额</th>
|
|
99
|
+
<th>银行金额</th>
|
|
100
|
+
<th>燃气方日期</th>
|
|
101
|
+
<th>银行日期</th>
|
|
102
|
+
<th>燃气方记录是否有效</th>
|
|
103
|
+
<th>对账信息</th>
|
|
104
|
+
<th>操作</th>
|
|
105
|
+
</tr>
|
|
106
|
+
</template>
|
|
107
|
+
<template partial='body'>
|
|
108
|
+
<td style="text-align: center;">{{$index+1}}</td>
|
|
109
|
+
<td>{{row.f_userinfo_code}}</td>
|
|
110
|
+
<th>{{row.f_bank_name?row.f_bank_name:row.bankname}}</th>
|
|
111
|
+
<td>{{row.f_serial_id}}</td>
|
|
112
|
+
<td>{{row.f_trade_number}}</td>
|
|
113
|
+
<td>{{row.f_collection}}</td>
|
|
114
|
+
<td>{{row.f_total_charge}}</td>
|
|
115
|
+
<td>{{row.f_operate_date}}</td>
|
|
116
|
+
<td>{{row.f_trade_date}}</td>
|
|
117
|
+
<td>{{row.f_state}}</td>
|
|
118
|
+
<td>{{row.msg}}</td>
|
|
119
|
+
<td>
|
|
120
|
+
<button type="button" name="button" class="button_search button_spacing width-60" @click="$parent.$parent.$parent.chargecal(row)"
|
|
121
|
+
v-if="row.msg === '燃气方单方面账单' && row.maxid !== '' && row.maxid!== null">冲正</button>
|
|
122
|
+
<!-- <button type="button" name="button" class="button_search button_spacing width-60" @click="$parent.$parent.$parent.charge(row)"-->
|
|
123
|
+
<!-- v-if="row.msg === '银行方单方面账单'&& row.f_userinfo_id !=='' && row.f_userinfo_id !==null" >缴费</button>-->
|
|
124
|
+
<button type="button" name="button" class="button_search button_spacing width-60" @click="$parent.$parent.$parent.charge(row)"
|
|
125
|
+
v-if="row.msg === '银行方单方面账单'" >缴费</button>
|
|
126
|
+
<!-- <span v-if="row.f_type !== 1 && row.msg !== '对账成功' && row.msg !== '燃气方单方面账单'">需人工处理</span>-->
|
|
127
|
+
<span v-if="row.msg === '对账成功'">正常</span>
|
|
128
|
+
</td>
|
|
129
|
+
</template>
|
|
130
|
+
<!--<template partial='foot'>-->
|
|
131
|
+
<!--<td style="text-align: center;">合计</td>-->
|
|
132
|
+
<!--<td style="text-align: center;"></td>-->
|
|
133
|
+
<!--<td style="text-align: center;"></td>-->
|
|
134
|
+
<!--<td style="text-align: center;"></td>-->
|
|
135
|
+
<!--<td style="text-align: center;"></td>-->
|
|
136
|
+
<!--<td style="text-align: center;">{{model.sums.f_collection.toFixed(2)}}</td>-->
|
|
137
|
+
<!--<td style="text-align: center;">{{model.sums.f_total_charge.toFixed(2)}}</td>-->
|
|
138
|
+
<!--<td style="text-align: center;"></td>-->
|
|
139
|
+
<!--<td style="text-align: center;"></td>-->
|
|
140
|
+
<!--<td style="text-align: center;"></td>-->
|
|
141
|
+
<!--<td style="text-align: center;"></td>-->
|
|
142
|
+
<!--<td style="text-align: center;"></td>-->
|
|
143
|
+
<!--</template>-->
|
|
144
|
+
</data-grid>
|
|
145
|
+
</criteria-paged>
|
|
146
|
+
<table class="table-hover">
|
|
147
|
+
<tr style="position: relative" class="table-bordered">
|
|
148
|
+
<td
|
|
149
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
|
|
150
|
+
汇总信息
|
|
151
|
+
</td>
|
|
152
|
+
<td
|
|
153
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
154
|
+
燃气方金额汇总: {{model.sums.f_collection.toFixed(2)}}
|
|
155
|
+
</td>
|
|
156
|
+
<td
|
|
157
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
158
|
+
银行金额汇总: {{model.sums.f_total_charge.toFixed(2)}}
|
|
159
|
+
</td>
|
|
160
|
+
<td
|
|
161
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
162
|
+
差额汇总: {{((model.sums.f_total_charge -0) - (model.sums.f_collection.toFixed(2) -0)).toFixed(2)}}
|
|
163
|
+
</td>
|
|
164
|
+
</tr>
|
|
165
|
+
</table>
|
|
166
|
+
</div>
|
|
167
|
+
</div>
|
|
168
|
+
</template>
|
|
169
|
+
<script>
|
|
170
|
+
import { PagedList } from 'vue-client'
|
|
171
|
+
import Vue from 'vue'
|
|
172
|
+
|
|
173
|
+
export default {
|
|
174
|
+
title: '银行对账',
|
|
175
|
+
data () {
|
|
176
|
+
return {
|
|
177
|
+
resid: [], // 存放新增的f_files表中id
|
|
178
|
+
criteriaShow:false,
|
|
179
|
+
curorgid: [this.$login.f.orgid],
|
|
180
|
+
model: new PagedList('rs/sql/bankPayment', 20, {bankname: 'this.model.f_bank_name[0]', startDate: 'this.model.startDate', endDate: 'this.model.endDate', orderitem: '"delivery_date DESC "'}, {f_collection: '', f_total_charge: ''}),
|
|
181
|
+
bodydata: ['f_userinfo_code', 'f_bank_name', 'f_serial_id', 'f_trade_number', 'f_collection', 'f_total_charge', 'f_operate_date', 'f_state', 'msg'],
|
|
182
|
+
header: ['用户编号', '银行名称', '燃气方流水号', '银行流水号', '燃气方金额', '银行金额', '燃气方日期', '银行日期', '燃气方记录是否有效', '对账信息']
|
|
183
|
+
|
|
184
|
+
}
|
|
185
|
+
},
|
|
186
|
+
props: [],
|
|
187
|
+
ready () {
|
|
188
|
+
},
|
|
189
|
+
methods: {
|
|
190
|
+
search () {
|
|
191
|
+
this.$refs.paged.$refs.cri.search()
|
|
192
|
+
},
|
|
193
|
+
selfSearch (args) {
|
|
194
|
+
if (!this.f_orgid) {
|
|
195
|
+
this.getorg([this.$login.f.orgid])
|
|
196
|
+
}
|
|
197
|
+
console.log('查询。。。', this.f_orgid)
|
|
198
|
+
if (this.f_orgid) {
|
|
199
|
+
args.condition = `${args.condition} and f_orgid in ${this.f_orgid}`
|
|
200
|
+
}
|
|
201
|
+
this.model.search(args.condition, args.model)
|
|
202
|
+
},
|
|
203
|
+
async chargecal (row) {
|
|
204
|
+
let param = {
|
|
205
|
+
f_sell_id: row.maxid,
|
|
206
|
+
f_cancel_reason: '',
|
|
207
|
+
f_orgid: Vue.$login.f.orgid,
|
|
208
|
+
f_orgname: Vue.$login.f.orgs,
|
|
209
|
+
f_depid: Vue.$login.f.depids,
|
|
210
|
+
f_depname: Vue.$login.f.deps,
|
|
211
|
+
f_zoneid: Vue.$login.f.zoneid,
|
|
212
|
+
f_zones: Vue.$login.f.zones
|
|
213
|
+
}
|
|
214
|
+
await Vue.resetpost('rs/logic/commonCancel', {data: param}, {resolveMsg: '撤销成功', rejectMsg: '撤销失败'})
|
|
215
|
+
this.$refs.paged.$refs.cri.search()
|
|
216
|
+
},
|
|
217
|
+
getorg (val) {
|
|
218
|
+
this.f_orgid = this.$login.convertToIn(val)
|
|
219
|
+
this.f_filialeid = val[0]
|
|
220
|
+
},
|
|
221
|
+
// 微信单方账单，系统可缴费
|
|
222
|
+
async charge (row) {
|
|
223
|
+
row.f_operator=Vue.$login.f.name,
|
|
224
|
+
row.f_operatorid= Vue.$login.f.id,
|
|
225
|
+
row.f_orgid= Vue.$login.f.orgid,
|
|
226
|
+
row.f_orgname= Vue.$login.f.orgs,
|
|
227
|
+
row.f_depid= Vue.$login.f.depids,
|
|
228
|
+
row. f_depname= Vue.$login.f.deps,
|
|
229
|
+
row. f_zoneid= Vue.$login.f.zoneid,
|
|
230
|
+
row. f_zones= Vue.$login.f.zones
|
|
231
|
+
let res = await this.$resetpost('rs/logic/cardOneBank',row,{resolveMsg:'缴费成功',rejectMsg:'缴费失败'})
|
|
232
|
+
let param = []
|
|
233
|
+
for (let row of this.resid) {
|
|
234
|
+
param.push({id: row.id})
|
|
235
|
+
}
|
|
236
|
+
let data = {
|
|
237
|
+
param: param,
|
|
238
|
+
f_blobid: res.data
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
await this.$resetpost('rs/logic/updatefiles', data)
|
|
242
|
+
this.$refs.paged.$refs.cri.search()
|
|
243
|
+
}
|
|
244
|
+
// })
|
|
245
|
+
},
|
|
246
|
+
events: {
|
|
247
|
+
// 删除Resid数组元素
|
|
248
|
+
'delResid' (val) {
|
|
249
|
+
this.resid.$remove({id: val, f_biobid: ''})
|
|
250
|
+
// this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
|
|
251
|
+
},
|
|
252
|
+
// 增加Resid数组元素
|
|
253
|
+
'resid' (val) {
|
|
254
|
+
console.log('-=', val)
|
|
255
|
+
this.resid.push({id: val, f_biobid: ''})
|
|
256
|
+
}
|
|
257
|
+
},
|
|
258
|
+
computed: {
|
|
259
|
+
bankname () {
|
|
260
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('银行名称')]
|
|
261
|
+
},
|
|
262
|
+
msg () {
|
|
263
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('对账信息')]
|
|
264
|
+
},
|
|
265
|
+
filiales () {
|
|
266
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('分公司')]
|
|
267
|
+
},
|
|
268
|
+
getCondition () {
|
|
269
|
+
return {condition: this.$refs.paged.$refs.cri.condition, orderitem: 'delivery_date DESC ' }
|
|
270
|
+
},
|
|
271
|
+
getfield () {
|
|
272
|
+
let data = {}
|
|
273
|
+
this.bodydata.forEach((value, index) => {
|
|
274
|
+
data[this.bodydata[index]] = this.header[index]
|
|
275
|
+
})
|
|
276
|
+
return data
|
|
277
|
+
console.log('field' + data)
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
</script>
|
|
@@ -25,6 +25,9 @@ let specialComp = {
|
|
|
25
25
|
// 补卡管理
|
|
26
26
|
'replace-card-manage': (resolve) => { require(['./ReplaceCardManage'], resolve) },
|
|
27
27
|
// 换表
|
|
28
|
-
'change-meter': (resolve) => { require(['./ChangeMeter'], resolve) }
|
|
28
|
+
'change-meter': (resolve) => { require(['./ChangeMeter'], resolve) },
|
|
29
|
+
|
|
30
|
+
'bank-payment': (resolve) => { require(['./BankPayment'], resolve) },
|
|
31
|
+
|
|
29
32
|
}
|
|
30
33
|
exports.specialComp = specialComp
|
|
@@ -659,13 +659,23 @@ let meterBookGen = function * (self) {
|
|
|
659
659
|
return
|
|
660
660
|
}
|
|
661
661
|
}
|
|
662
|
+
console.log("***表计信息校验",this.row.gasbrand[0].f_meterverification)
|
|
662
663
|
// 表计信息验证
|
|
663
|
-
if (this.row.gasbrand[0].f_meterverification
|
|
664
|
+
if (this.row.gasbrand[0].f_meterverification === '是') {
|
|
665
|
+
console.log("********返回值信息长度：",res1.data.length)
|
|
664
666
|
if (res1.data.length <= 0) {
|
|
665
667
|
this.$showAlert(`当前表号: ${this.row.f_meternumber}在表计信息中无记录, 请核实!!!`, 'warning', 3000)
|
|
666
668
|
this.row.f_meternumber = ''
|
|
667
669
|
return
|
|
668
670
|
}
|
|
671
|
+
}else{
|
|
672
|
+
if ( this.row.gasbrand[0].f_meter_type === '物联网表'){
|
|
673
|
+
if (res1.data.length <= 0) {
|
|
674
|
+
this.$showAlert(`当前表号: ${this.row.f_meternumber}在表计信息中无记录, 请核实!!!`, 'warning', 3000)
|
|
675
|
+
this.row.f_meternumber = ''
|
|
676
|
+
return
|
|
677
|
+
}
|
|
678
|
+
}
|
|
669
679
|
}
|
|
670
680
|
let param = {
|
|
671
681
|
f_meternumber: this.row.f_meternumber,
|