manage-client 3.3.134 → 3.3.136-mx
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 +189 -189
- package/package.json +1 -1
- package/src/components/sale/config/exportConfig.js +2 -2
- package/src/components/valueaddinfo/valueAddUserQuery.vue +6 -0
- package/src/components/webmeter/instruction/NewQueryInstruct.vue +1 -1
- package/src/components/webmeter/report/ReportDetailList.vue +4 -4
- package/src/components/webmeter/report/ReportList.vue +5 -0
- package/src/filiale/lixianV3/HandplanQuery.vue +12 -0
- package/src/filiale/lixianV3/NewGasStatistics.vue +4 -17
- package/src/filiale/lixianV3/config/exportConfig.js +5 -2
- package/src/filiale/qianneng/HandplanQuery.vue +6 -0
- package/src/filiale/shanxian/UserQuery.vue +4 -4
- package/src/filiale/yuncheng/GasInspection.vue +596 -0
- package/src/filiale/yuncheng/config/exportConfig.js +1 -1
- package/src/filiale/yuncheng/sale.js +4 -0
- package/src/main.js +68 -72
package/build/dev-server.js
CHANGED
|
@@ -1,189 +1,189 @@
|
|
|
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://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
|
|
14
|
-
var shaoguan = 'http://119.146.1.106:8300/'
|
|
15
|
-
var qtx= 'http://36.103.222.144:6300/'
|
|
16
|
-
// var bendi = 'http://220.194.141.253:8600/'
|
|
17
|
-
// var bendi = 'http://203.57.101.233:9001'
|
|
18
|
-
// var bendi = 'http://172.168.1.11:9001/'
|
|
19
|
-
// var bendi = 'http://203.57.101.233:8400/'
|
|
20
|
-
// var bendi = 'http://121.36.106.17:8400/'
|
|
21
|
-
// var fuwu = 'http://203.57.101.233:9001'
|
|
22
|
-
var bendi = 'http://
|
|
23
|
-
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://
|
|
25
|
-
// 192.168.
|
|
26
|
-
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
27
|
-
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
|
28
|
-
var proxyTable = {
|
|
29
|
-
'/rs/logic/exportfile': {
|
|
30
|
-
target: bendi
|
|
31
|
-
},
|
|
32
|
-
'/rs/sql/chargeQuery_by_gasproperties': {
|
|
33
|
-
target: 'http://localhost:8084/'
|
|
34
|
-
},
|
|
35
|
-
'/rs/logic/chargeQuery_by_gasproperties_line': {
|
|
36
|
-
target: 'http://localhost:8084/'
|
|
37
|
-
},
|
|
38
|
-
'/files': {
|
|
39
|
-
target: bendi
|
|
40
|
-
},
|
|
41
|
-
// 查找资源服务数据
|
|
42
|
-
'/rs/search': {
|
|
43
|
-
target: bendi
|
|
44
|
-
},
|
|
45
|
-
// 查找资源服务数据
|
|
46
|
-
'/rs/logic/getLogin': {
|
|
47
|
-
target: bendi
|
|
48
|
-
},
|
|
49
|
-
// 查找资源服务数据
|
|
50
|
-
'/rs/logic/getInitData': {
|
|
51
|
-
target: bendi
|
|
52
|
-
},
|
|
53
|
-
'/rs/logic/getSaleInitData': {
|
|
54
|
-
target: bendi
|
|
55
|
-
},
|
|
56
|
-
// 用户登录服务地址
|
|
57
|
-
'/rs/user': {
|
|
58
|
-
target: bendi
|
|
59
|
-
},
|
|
60
|
-
'/rs/path/getParams': {
|
|
61
|
-
target: bendi
|
|
62
|
-
},
|
|
63
|
-
'/rs/data': {
|
|
64
|
-
target: bendi
|
|
65
|
-
},
|
|
66
|
-
'/rs/license': {
|
|
67
|
-
target: bendi
|
|
68
|
-
},
|
|
69
|
-
'/rs/db': {
|
|
70
|
-
target: bendi
|
|
71
|
-
},
|
|
72
|
-
'/excel': {
|
|
73
|
-
target: bendi
|
|
74
|
-
},
|
|
75
|
-
'/rs/config': {
|
|
76
|
-
target: bendi
|
|
77
|
-
},
|
|
78
|
-
'/rs/sql/getLicenseById': {
|
|
79
|
-
target: bendi
|
|
80
|
-
},
|
|
81
|
-
'/rs/report': {
|
|
82
|
-
target: bendi
|
|
83
|
-
},
|
|
84
|
-
'/rs/vue': {
|
|
85
|
-
target: bendi
|
|
86
|
-
},
|
|
87
|
-
'/rs/file': {
|
|
88
|
-
target: bendi
|
|
89
|
-
},
|
|
90
|
-
'/rs/sql/singleTable': {
|
|
91
|
-
target: bendi
|
|
92
|
-
},
|
|
93
|
-
'/rs/sql': {
|
|
94
|
-
target:
|
|
95
|
-
},
|
|
96
|
-
'/rs': {
|
|
97
|
-
target:
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
102
|
-
publicPath: config.output.publicPath,
|
|
103
|
-
stats: {
|
|
104
|
-
colors: true,
|
|
105
|
-
chunks: false
|
|
106
|
-
}
|
|
107
|
-
})
|
|
108
|
-
|
|
109
|
-
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
110
|
-
// force page reload when html-webpack-plugin template changes
|
|
111
|
-
compiler.plugin('compilation', function (compilation) {
|
|
112
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
113
|
-
hotMiddleware.publish({action: 'reload'})
|
|
114
|
-
cb()
|
|
115
|
-
})
|
|
116
|
-
})
|
|
117
|
-
|
|
118
|
-
// proxy api requests
|
|
119
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
120
|
-
var options = proxyTable[context]
|
|
121
|
-
if (typeof options === 'string') {
|
|
122
|
-
options = {target: options}
|
|
123
|
-
}
|
|
124
|
-
app.use(proxyMiddleware(context, options))
|
|
125
|
-
})
|
|
126
|
-
|
|
127
|
-
// handle fallback for HTML5 history API
|
|
128
|
-
app.use(require('connect-history-api-fallback')())
|
|
129
|
-
// app.use(function (req, res, next) {
|
|
130
|
-
// res.header('Access-Control-Allow-Origin', '*')
|
|
131
|
-
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
132
|
-
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
133
|
-
// res.header('X-Powered-By', '3,2,1')
|
|
134
|
-
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
135
|
-
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
136
|
-
// next()
|
|
137
|
-
// })
|
|
138
|
-
|
|
139
|
-
// serve webpack bundle output
|
|
140
|
-
app.use(devMiddleware)
|
|
141
|
-
|
|
142
|
-
// enable hot-reload and state-preserving
|
|
143
|
-
// compilation error display
|
|
144
|
-
app.use(hotMiddleware)
|
|
145
|
-
|
|
146
|
-
// serve pure static assets
|
|
147
|
-
app.use('/static', express.static('./static'))
|
|
148
|
-
|
|
149
|
-
// app.all('/rs/*', function (req, res) {
|
|
150
|
-
// proxy.web(req, res, {
|
|
151
|
-
// target: 'http://127.0.0.1:8081/reports'
|
|
152
|
-
// })
|
|
153
|
-
// })
|
|
154
|
-
|
|
155
|
-
// app.all('/rs/*', function (req, res) {
|
|
156
|
-
// proxy.web(req, res, {
|
|
157
|
-
// target: 'http://127.0.0.1:8081/ldap'
|
|
158
|
-
// })
|
|
159
|
-
// })
|
|
160
|
-
// app.all('/excel/*', function (req, res) {
|
|
161
|
-
// proxy.web(req, res, {
|
|
162
|
-
// target: 'http://127.0.0.1:8081/charge'
|
|
163
|
-
// })
|
|
164
|
-
// })
|
|
165
|
-
|
|
166
|
-
// app.all('/rs/*', function (req, res) {
|
|
167
|
-
// proxy.web(req, res, {
|
|
168
|
-
// target: 'http://127.0.0.1:82/charge'
|
|
169
|
-
// })
|
|
170
|
-
// })
|
|
171
|
-
|
|
172
|
-
// app.all('/*', function (req, res) {
|
|
173
|
-
// proxy.web(req, res, {
|
|
174
|
-
// target: 'http://127.0.0.1:82'
|
|
175
|
-
// })
|
|
176
|
-
// })
|
|
177
|
-
// app.all('/rs/user', function (req, res) {
|
|
178
|
-
// proxy.web(req, res, {
|
|
179
|
-
// target: 'http://127.0.0.1:82'
|
|
180
|
-
// })
|
|
181
|
-
// })
|
|
182
|
-
|
|
183
|
-
module.exports = app.listen(8015, function (err) {
|
|
184
|
-
if (err) {
|
|
185
|
-
console.log(err)
|
|
186
|
-
return
|
|
187
|
-
}
|
|
188
|
-
console.log('Listening at http://localhost:8015')
|
|
189
|
-
})
|
|
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://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
|
|
14
|
+
var shaoguan = 'http://119.146.1.106:8300/'
|
|
15
|
+
var qtx= 'http://36.103.222.144:6300/'
|
|
16
|
+
// var bendi = 'http://220.194.141.253:8600/'
|
|
17
|
+
// var bendi = 'http://203.57.101.233:9001'
|
|
18
|
+
// var bendi = 'http://172.168.1.11:9001/'
|
|
19
|
+
// var bendi = 'http://203.57.101.233:8400/'
|
|
20
|
+
// var bendi = 'http://121.36.106.17:8400/'
|
|
21
|
+
// var fuwu = 'http://203.57.101.233:9001'
|
|
22
|
+
var bendi = 'http://192.168.50.67:31785'
|
|
23
|
+
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
+
var wode = 'http://192.168.50.67:31785'
|
|
25
|
+
// 192.168.
|
|
26
|
+
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
27
|
+
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
|
28
|
+
var proxyTable = {
|
|
29
|
+
'/rs/logic/exportfile': {
|
|
30
|
+
target: bendi
|
|
31
|
+
},
|
|
32
|
+
'/rs/sql/chargeQuery_by_gasproperties': {
|
|
33
|
+
target: 'http://localhost:8084/'
|
|
34
|
+
},
|
|
35
|
+
'/rs/logic/chargeQuery_by_gasproperties_line': {
|
|
36
|
+
target: 'http://localhost:8084/'
|
|
37
|
+
},
|
|
38
|
+
'/files': {
|
|
39
|
+
target: bendi
|
|
40
|
+
},
|
|
41
|
+
// 查找资源服务数据
|
|
42
|
+
'/rs/search': {
|
|
43
|
+
target: bendi
|
|
44
|
+
},
|
|
45
|
+
// 查找资源服务数据
|
|
46
|
+
'/rs/logic/getLogin': {
|
|
47
|
+
target: bendi
|
|
48
|
+
},
|
|
49
|
+
// 查找资源服务数据
|
|
50
|
+
'/rs/logic/getInitData': {
|
|
51
|
+
target: bendi
|
|
52
|
+
},
|
|
53
|
+
'/rs/logic/getSaleInitData': {
|
|
54
|
+
target: bendi
|
|
55
|
+
},
|
|
56
|
+
// 用户登录服务地址
|
|
57
|
+
'/rs/user': {
|
|
58
|
+
target: bendi
|
|
59
|
+
},
|
|
60
|
+
'/rs/path/getParams': {
|
|
61
|
+
target: bendi
|
|
62
|
+
},
|
|
63
|
+
'/rs/data': {
|
|
64
|
+
target: bendi
|
|
65
|
+
},
|
|
66
|
+
'/rs/license': {
|
|
67
|
+
target: bendi
|
|
68
|
+
},
|
|
69
|
+
'/rs/db': {
|
|
70
|
+
target: bendi
|
|
71
|
+
},
|
|
72
|
+
'/excel': {
|
|
73
|
+
target: bendi
|
|
74
|
+
},
|
|
75
|
+
'/rs/config': {
|
|
76
|
+
target: bendi
|
|
77
|
+
},
|
|
78
|
+
'/rs/sql/getLicenseById': {
|
|
79
|
+
target: bendi
|
|
80
|
+
},
|
|
81
|
+
'/rs/report': {
|
|
82
|
+
target: bendi
|
|
83
|
+
},
|
|
84
|
+
'/rs/vue': {
|
|
85
|
+
target: bendi
|
|
86
|
+
},
|
|
87
|
+
'/rs/file': {
|
|
88
|
+
target: bendi
|
|
89
|
+
},
|
|
90
|
+
'/rs/sql/singleTable': {
|
|
91
|
+
target: bendi
|
|
92
|
+
},
|
|
93
|
+
'/rs/sql': {
|
|
94
|
+
target: 'http://localhost:8084/'
|
|
95
|
+
},
|
|
96
|
+
'/rs': {
|
|
97
|
+
target: wode
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
102
|
+
publicPath: config.output.publicPath,
|
|
103
|
+
stats: {
|
|
104
|
+
colors: true,
|
|
105
|
+
chunks: false
|
|
106
|
+
}
|
|
107
|
+
})
|
|
108
|
+
|
|
109
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
110
|
+
// force page reload when html-webpack-plugin template changes
|
|
111
|
+
compiler.plugin('compilation', function (compilation) {
|
|
112
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
113
|
+
hotMiddleware.publish({action: 'reload'})
|
|
114
|
+
cb()
|
|
115
|
+
})
|
|
116
|
+
})
|
|
117
|
+
|
|
118
|
+
// proxy api requests
|
|
119
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
120
|
+
var options = proxyTable[context]
|
|
121
|
+
if (typeof options === 'string') {
|
|
122
|
+
options = {target: options}
|
|
123
|
+
}
|
|
124
|
+
app.use(proxyMiddleware(context, options))
|
|
125
|
+
})
|
|
126
|
+
|
|
127
|
+
// handle fallback for HTML5 history API
|
|
128
|
+
app.use(require('connect-history-api-fallback')())
|
|
129
|
+
// app.use(function (req, res, next) {
|
|
130
|
+
// res.header('Access-Control-Allow-Origin', '*')
|
|
131
|
+
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
132
|
+
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
133
|
+
// res.header('X-Powered-By', '3,2,1')
|
|
134
|
+
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
135
|
+
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
136
|
+
// next()
|
|
137
|
+
// })
|
|
138
|
+
|
|
139
|
+
// serve webpack bundle output
|
|
140
|
+
app.use(devMiddleware)
|
|
141
|
+
|
|
142
|
+
// enable hot-reload and state-preserving
|
|
143
|
+
// compilation error display
|
|
144
|
+
app.use(hotMiddleware)
|
|
145
|
+
|
|
146
|
+
// serve pure static assets
|
|
147
|
+
app.use('/static', express.static('./static'))
|
|
148
|
+
|
|
149
|
+
// app.all('/rs/*', function (req, res) {
|
|
150
|
+
// proxy.web(req, res, {
|
|
151
|
+
// target: 'http://127.0.0.1:8081/reports'
|
|
152
|
+
// })
|
|
153
|
+
// })
|
|
154
|
+
|
|
155
|
+
// app.all('/rs/*', function (req, res) {
|
|
156
|
+
// proxy.web(req, res, {
|
|
157
|
+
// target: 'http://127.0.0.1:8081/ldap'
|
|
158
|
+
// })
|
|
159
|
+
// })
|
|
160
|
+
// app.all('/excel/*', function (req, res) {
|
|
161
|
+
// proxy.web(req, res, {
|
|
162
|
+
// target: 'http://127.0.0.1:8081/charge'
|
|
163
|
+
// })
|
|
164
|
+
// })
|
|
165
|
+
|
|
166
|
+
// app.all('/rs/*', function (req, res) {
|
|
167
|
+
// proxy.web(req, res, {
|
|
168
|
+
// target: 'http://127.0.0.1:82/charge'
|
|
169
|
+
// })
|
|
170
|
+
// })
|
|
171
|
+
|
|
172
|
+
// app.all('/*', function (req, res) {
|
|
173
|
+
// proxy.web(req, res, {
|
|
174
|
+
// target: 'http://127.0.0.1:82'
|
|
175
|
+
// })
|
|
176
|
+
// })
|
|
177
|
+
// app.all('/rs/user', function (req, res) {
|
|
178
|
+
// proxy.web(req, res, {
|
|
179
|
+
// target: 'http://127.0.0.1:82'
|
|
180
|
+
// })
|
|
181
|
+
// })
|
|
182
|
+
|
|
183
|
+
module.exports = app.listen(8015, function (err) {
|
|
184
|
+
if (err) {
|
|
185
|
+
console.log(err)
|
|
186
|
+
return
|
|
187
|
+
}
|
|
188
|
+
console.log('Listening at http://localhost:8015')
|
|
189
|
+
})
|
package/package.json
CHANGED
|
@@ -674,7 +674,7 @@ export default{
|
|
|
674
674
|
},
|
|
675
675
|
ReportListConfig: {
|
|
676
676
|
'f_userinfo_code': '客户编号', 'f_meternumber': '表号', 'f_user_name': '客户姓名', 'f_user_phone': '客户电话', 'f_address': '客户地址',
|
|
677
|
-
'f_hand_date': '上报日期', 'f_jval': '表内剩余金额', 'f_tablebase': '本次抄表底数', 'f_valvestate': '阀门状态',
|
|
677
|
+
'f_hand_date': '上报日期', 'f_jval': '表内剩余金额', 'f_tablebase': '本次抄表底数', 'f_valvestate': '阀门状态', 'flowmetertemperature': '温度', 'flowmeterpressure': '压力',
|
|
678
678
|
'f_upload_type': '上报类型', 'f_insert_date': '系统接收时间', 'f_meterDebitAmt': '表内累计充值金额',
|
|
679
679
|
'f_signal': '噪音强度', 'f_snr': '信噪比', 'f_batterylevel': '电压', 'f_lowlithiumbattery': '电压状态', 'f_networkshutvalve': '阀门强制状态',
|
|
680
680
|
'f_wmprepaytype': '计量类型', 'f_moneystate': '金额状态', 'f_magneticInterference': '磁干扰异常', 'f_compensateState': '补偿状态'
|
|
@@ -1096,7 +1096,7 @@ export default{
|
|
|
1096
1096
|
valueuserinfoConfig:{
|
|
1097
1097
|
'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_address':'客户地址','f_user_type':'用户类型','f_gasproperties':'用气性质','f_meter_classify':'气表类型',
|
|
1098
1098
|
'f_meternumber':'表号','itemname':'增值服务类型','ishas':'有无增值业务','startdate':'购买时间','f_operate_date':'最后操作时间',
|
|
1099
|
-
'f_orgname': '所属公司'
|
|
1099
|
+
'f_orgname': '所属公司', 'f_remark': '备注'
|
|
1100
1100
|
},
|
|
1101
1101
|
renewalvalueuserinfoConfig:{
|
|
1102
1102
|
'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_address':'客户地址','f_meternumber':'表号','f_user_type':'用户类型','f_gasproperties':'用气性质','f_meter_classify':'气表类型',
|
|
@@ -117,6 +117,9 @@
|
|
|
117
117
|
<th>
|
|
118
118
|
<nobr>所属公司</nobr>
|
|
119
119
|
</th>
|
|
120
|
+
<th>
|
|
121
|
+
<nobr>备注</nobr>
|
|
122
|
+
</th>
|
|
120
123
|
</tr>
|
|
121
124
|
</template>
|
|
122
125
|
<template partial='body'>
|
|
@@ -156,6 +159,9 @@
|
|
|
156
159
|
<td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
|
|
157
160
|
<nobr>{{row.f_orgname}}</nobr>
|
|
158
161
|
</td>
|
|
162
|
+
<td :style="{background:(row.istrue=='1'? '#f1dec2':'')}" style="text-align: center;">
|
|
163
|
+
<nobr>{{row.f_remark}}</nobr>
|
|
164
|
+
</td>
|
|
159
165
|
</template>
|
|
160
166
|
<template partial='foot'></template>
|
|
161
167
|
</data-grid>
|
|
@@ -442,7 +442,7 @@
|
|
|
442
442
|
this.operators = []
|
|
443
443
|
this.$MagGetSaleParam.inputtors.forEach((res) => {
|
|
444
444
|
if(res.rolestr != null && res.rolestr!='' ){
|
|
445
|
-
if(
|
|
445
|
+
if( res.f_orgid == orgid) {
|
|
446
446
|
let temp = {
|
|
447
447
|
label :res.name,
|
|
448
448
|
value:res.name,
|
|
@@ -142,10 +142,10 @@
|
|
|
142
142
|
sumsmodel: {},
|
|
143
143
|
ReportDetailListConfig: {
|
|
144
144
|
'f_userinfo_code': '客户编号', 'f_meternumber': '表号', 'f_user_name': '客户姓名', 'f_user_phone': '客户电话', 'f_address': '客户地址',
|
|
145
|
-
'f_hand_date': '上报日期', 'f_meter_brand': '气表品牌', '
|
|
146
|
-
'
|
|
147
|
-
'
|
|
148
|
-
'
|
|
145
|
+
'f_hand_date': '上报日期', 'f_meter_brand': '气表品牌', 'f_readdata1': '上传协议版本号', 'f_readdata2': '通信信号值', 'f_readdata3': '铭牌号',
|
|
146
|
+
'f_readdata4': '通信模式', 'f_readdata5': 'IC卡编号', 'f_readdata6': '购气次数','f_readdata7': '剩余金额/量', 'f_readdata8': '总累计用气量',
|
|
147
|
+
'f_readdata9': '总累计用气金额','f_readdata10': '总累计购气金额/量', 'f_readdata11': '计费周期累计用气量', 'f_readdata12': '当前透支金额/量', 'f_readdata13': '阀门状态',
|
|
148
|
+
'f_readdata14': '主电电压','f_readdata15': '备电电压', 'f_readdata16': '软件版本', 'f_readdata17': '硬件版本', 'f_readdata18': '当前rtc时钟'
|
|
149
149
|
},
|
|
150
150
|
orgid:[this.$login.f.orgid],
|
|
151
151
|
criteriaShow:false,
|
|
@@ -132,6 +132,9 @@
|
|
|
132
132
|
<th><nobr>本次抄表底数</nobr></th>
|
|
133
133
|
<th><nobr>阀门状态</nobr></th>
|
|
134
134
|
|
|
135
|
+
<th><nobr>温度</nobr></th>
|
|
136
|
+
<th><nobr>压力</nobr></th>
|
|
137
|
+
|
|
135
138
|
<th><nobr>上报类型</nobr></th>
|
|
136
139
|
<th><nobr>表内累计充值金额</nobr></th>
|
|
137
140
|
<th><nobr>信号强度</nobr></th>
|
|
@@ -157,6 +160,8 @@
|
|
|
157
160
|
<th style="text-align:center"><nobr>{{row.f_price}}</nobr></th>
|
|
158
161
|
<th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
|
|
159
162
|
<th style="text-align:center"><nobr>{{row.f_valvestate}}</nobr></th>
|
|
163
|
+
<th style="text-align:center"><nobr>{{row.flowmetertemperature}}</nobr></th>
|
|
164
|
+
<th style="text-align:center"><nobr>{{row.flowmeterpressure}}</nobr></th>
|
|
160
165
|
|
|
161
166
|
|
|
162
167
|
<th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>
|
|
@@ -351,6 +351,12 @@
|
|
|
351
351
|
<th>
|
|
352
352
|
<nobr>抄表员</nobr>
|
|
353
353
|
</th>
|
|
354
|
+
<th>
|
|
355
|
+
<nobr>用气性质</nobr>
|
|
356
|
+
</th>
|
|
357
|
+
<th>
|
|
358
|
+
<nobr>气表品牌</nobr>
|
|
359
|
+
</th>
|
|
354
360
|
<th>
|
|
355
361
|
<!-- <nobr>录入日期</nobr>-->
|
|
356
362
|
<data-order field="f_input_date" name="录入日期"
|
|
@@ -522,6 +528,12 @@
|
|
|
522
528
|
<td style="text-align: center;">
|
|
523
529
|
<nobr>{{row.f_inputtor}}</nobr>
|
|
524
530
|
</td>
|
|
531
|
+
<td style="text-align: center;">
|
|
532
|
+
<nobr>{{row.f_gasproperties}}</nobr>
|
|
533
|
+
</td>
|
|
534
|
+
<td style="text-align: center;">
|
|
535
|
+
<nobr>{{row.f_meter_brand}}</nobr>
|
|
536
|
+
</td>
|
|
525
537
|
<td style="text-align: center;">
|
|
526
538
|
<nobr>{{row.f_input_date}}</nobr>
|
|
527
539
|
</td>
|
|
@@ -191,20 +191,15 @@
|
|
|
191
191
|
<th><nobr>期末余额</nobr></th>
|
|
192
192
|
<th><nobr>录入人员</nobr></th>
|
|
193
193
|
<th><nobr>抄表员</nobr></th>
|
|
194
|
+
<th><nobr>用气性质</nobr></th>
|
|
195
|
+
<th><nobr>气表品牌</nobr></th>
|
|
194
196
|
<th><nobr>小区</nobr></th>
|
|
195
|
-
|
|
196
|
-
|
|
197
197
|
<th><nobr>燃气证号</nobr></th>
|
|
198
|
-
<th><nobr>气表品牌</nobr></th>
|
|
199
198
|
<th><nobr>表具类型</nobr></th>
|
|
200
199
|
<th><nobr>表描述</nobr></th>
|
|
201
200
|
<th><nobr>气价名称</nobr></th>
|
|
202
|
-
|
|
203
|
-
<th><nobr>用气性质</nobr></th>
|
|
204
201
|
<th><nobr>期初余额</nobr></th>
|
|
205
|
-
|
|
206
202
|
<th><nobr>期间充值金额</nobr></th>
|
|
207
|
-
|
|
208
203
|
<th><nobr>用气状态</nobr></th>
|
|
209
204
|
<th><nobr>是否换表</nobr></th>
|
|
210
205
|
<th><nobr>首次抄表时间</nobr></th>
|
|
@@ -225,23 +220,15 @@
|
|
|
225
220
|
<th style="text-align:center"><nobr>{{row.f_curbalance}}</nobr></th>
|
|
226
221
|
<th style="text-align:center"><nobr>{{row.f_input_person}}</nobr></th>
|
|
227
222
|
<th style="text-align:center"><nobr>{{row.f_inputtor}}</nobr></th>
|
|
228
|
-
|
|
223
|
+
<th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
|
|
224
|
+
<th style="text-align:center"><nobr>{{row.f_meter_brand}}</nobr></th>
|
|
229
225
|
<td style="text-align: left;"><nobr>{{row.f_residential_area}}</nobr></td>
|
|
230
|
-
|
|
231
226
|
<td style="text-align:center"><nobr>{{row.f_gascode}}</nobr></td>
|
|
232
|
-
<th style="text-align:center"><nobr>{{row.f_meter_brand}}</nobr></th>
|
|
233
227
|
<th style="text-align:center"><nobr>{{row.f_meter_classify}}</nobr></th>
|
|
234
228
|
<th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
|
|
235
229
|
<th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
<th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
|
|
239
|
-
|
|
240
|
-
|
|
241
230
|
<th style="text-align:center"><nobr>{{row.f_balance}}</nobr></th>
|
|
242
|
-
|
|
243
231
|
<th style="text-align:center"><nobr>{{row.f_collection}}</nobr></th>
|
|
244
|
-
|
|
245
232
|
<th style="text-align:center"><nobr>{{row.f_gas_state}}</nobr></th>
|
|
246
233
|
<th style="text-align:center"><nobr>{{row.f_changetable_state}}</nobr></th>
|
|
247
234
|
<th style="text-align:center"><nobr>{{row.f_first_input_date}}</nobr></th>
|
|
@@ -792,6 +792,8 @@ export default {
|
|
|
792
792
|
'f_curbalance': '本期余额',
|
|
793
793
|
'f_input_person': '录入人员',
|
|
794
794
|
'f_inputtor': '抄表员',
|
|
795
|
+
'f_gasproperties': '用气性质',
|
|
796
|
+
'f_meter_brand': '气表品牌',
|
|
795
797
|
'f_input_date': '录入日期',
|
|
796
798
|
'f_whether_pay': '是否缴费',
|
|
797
799
|
'f_operator': '下发人员',
|
|
@@ -1622,17 +1624,18 @@ export default {
|
|
|
1622
1624
|
'f_curbalance': '期末余额',
|
|
1623
1625
|
'f_input_person': '录入人员',
|
|
1624
1626
|
'f_inputtor': '抄表员',
|
|
1627
|
+
'f_gasproperties': '用气性质',
|
|
1628
|
+
'f_meter_brand': '气表品牌',
|
|
1625
1629
|
'f_residential_area': '小区',
|
|
1626
1630
|
'f_gascode': '燃气证号',
|
|
1627
1631
|
'f_meter_classify': '表具类型',
|
|
1628
1632
|
'f_meter_title': '表描述',
|
|
1629
1633
|
'f_price_name': '气价名称',
|
|
1630
|
-
'f_user_nature': '用气类型',
|
|
1631
|
-
'f_gasproperties': '用气性质',
|
|
1632
1634
|
'f_balance': '期初余额',
|
|
1633
1635
|
'f_collection': '期末充值金额',
|
|
1634
1636
|
'f_gas_state': '用气状态',
|
|
1635
1637
|
'f_changetable_state': '是否换表',
|
|
1638
|
+
'f_first_input_date': '首次抄表时间',
|
|
1636
1639
|
'f_input_date': '最后通讯日期'
|
|
1637
1640
|
},
|
|
1638
1641
|
ArrearageConfig: {
|
|
@@ -483,6 +483,9 @@
|
|
|
483
483
|
<th>
|
|
484
484
|
<nobr>状态</nobr>
|
|
485
485
|
</th>
|
|
486
|
+
<th>
|
|
487
|
+
<nobr>是否单户抄表</nobr>
|
|
488
|
+
</th>
|
|
486
489
|
<th>
|
|
487
490
|
<nobr>下发人员</nobr>
|
|
488
491
|
</th>
|
|
@@ -646,6 +649,9 @@
|
|
|
646
649
|
<td style="text-align: center;">
|
|
647
650
|
<nobr>{{row.f_hand_state}}</nobr>
|
|
648
651
|
</td>
|
|
652
|
+
<td style="text-align: center;">
|
|
653
|
+
<nobr>{{row.f_isone == '是' ? '是': '否'}}</nobr>
|
|
654
|
+
</td>
|
|
649
655
|
<td style="text-align: center;">
|
|
650
656
|
<nobr>{{row.f_operator}}</nobr>
|
|
651
657
|
</td>
|
|
@@ -209,22 +209,22 @@
|
|
|
209
209
|
<!-- </div>-->
|
|
210
210
|
<div class="col-sm-2 form-group">
|
|
211
211
|
<label for="startDate" class="font_normal_body">开始日期</label>
|
|
212
|
-
<datepicker id="startDate" placeholder="
|
|
212
|
+
<datepicker id="startDate" placeholder="开户日期" style="width:60%"
|
|
213
213
|
v-model="model.startDate"
|
|
214
214
|
:value.sync="model.startDate"
|
|
215
215
|
:format="'yyyy-MM-dd'"
|
|
216
216
|
:show-reset-button="true"
|
|
217
|
-
condition="
|
|
217
|
+
condition="f_open_date >= '{} 00:00:00'">
|
|
218
218
|
</datepicker>
|
|
219
219
|
</div>
|
|
220
220
|
<div class="col-sm-2 form-group">
|
|
221
221
|
<label for="endDate" class="font_normal_body">结束日期</label>
|
|
222
|
-
<datepicker id="endDate" placeholder="
|
|
222
|
+
<datepicker id="endDate" placeholder="开户日期" style="width:60%"
|
|
223
223
|
v-model="model.endDate"
|
|
224
224
|
:value.sync="model.endDate"
|
|
225
225
|
:format="'yyyy-MM-dd'"
|
|
226
226
|
:show-reset-button="true"
|
|
227
|
-
condition="
|
|
227
|
+
condition="f_open_date <= '{} 23:59:59'">
|
|
228
228
|
</datepicker>
|
|
229
229
|
</div>
|
|
230
230
|
<!--表册片区-->
|