manage-client 3.2.114 → 3.2.115
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 +176 -176
- package/package.json +1 -1
- package/src/components/sale/config/exportConfig.js +1 -1
- package/src/components/webmeter/WebmeterQuery.vue +3 -3
- package/src/filiale/qianneng/ArrearsQuery.vue +25 -5
- package/src/filiale/tongchuan/MeterQuery.vue +2 -4
- package/src/filiale/zhongyi/GasStatistics.vue +499 -0
- package/src/filiale/zhongyi/sale.js +10 -0
package/build/dev-server.js
CHANGED
|
@@ -1,176 +1,176 @@
|
|
|
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://
|
|
17
|
-
// var bendi = 'http://172.168.1.11:9001'
|
|
18
|
-
var fuwu = 'http://192.168.50.4:8400'
|
|
19
|
-
// var fuwu = 'http://203.57.101.233:9001'
|
|
20
|
-
var system = 'http://192.168.50.4:8400'
|
|
21
|
-
//192.168.
|
|
22
|
-
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
23
|
-
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
|
24
|
-
var proxyTable = {
|
|
25
|
-
'/rs/logic/exportfile': {
|
|
26
|
-
target: fuwu
|
|
27
|
-
},
|
|
28
|
-
'/files': {
|
|
29
|
-
target: fuwu
|
|
30
|
-
},
|
|
31
|
-
// 查找资源服务数据
|
|
32
|
-
'/rs/search': {
|
|
33
|
-
target: fuwu
|
|
34
|
-
},
|
|
35
|
-
// 查找资源服务数据
|
|
36
|
-
'/rs/logic/getLogin': {
|
|
37
|
-
target: fuwu
|
|
38
|
-
},
|
|
39
|
-
// 查找资源服务数据
|
|
40
|
-
'/rs/logic/getInitData': {
|
|
41
|
-
target: fuwu
|
|
42
|
-
},
|
|
43
|
-
'/rs/logic/getSaleInitData':{
|
|
44
|
-
target: fuwu
|
|
45
|
-
},
|
|
46
|
-
// 用户登录服务地址
|
|
47
|
-
'/rs/user': {
|
|
48
|
-
target: fuwu
|
|
49
|
-
},
|
|
50
|
-
'/rs/path/getParams': {
|
|
51
|
-
target: fuwu
|
|
52
|
-
},
|
|
53
|
-
'/rs/data': {
|
|
54
|
-
target: fuwu
|
|
55
|
-
},
|
|
56
|
-
'/rs/license': {
|
|
57
|
-
target: fuwu
|
|
58
|
-
},
|
|
59
|
-
'/rs/db': {
|
|
60
|
-
target: fuwu
|
|
61
|
-
},
|
|
62
|
-
'/excel': {
|
|
63
|
-
target: fuwu
|
|
64
|
-
},
|
|
65
|
-
'/rs/config': {
|
|
66
|
-
target: fuwu
|
|
67
|
-
},
|
|
68
|
-
'/rs/sql/getLicenseById': {
|
|
69
|
-
target: fuwu
|
|
70
|
-
},
|
|
71
|
-
'/rs/report': {
|
|
72
|
-
target: bendi
|
|
73
|
-
},
|
|
74
|
-
'/rs/vue': {
|
|
75
|
-
target: fuwu
|
|
76
|
-
},
|
|
77
|
-
'/rs/file': {
|
|
78
|
-
target: bendi
|
|
79
|
-
},
|
|
80
|
-
'/rs/logic/SumSettleFileImport': {
|
|
81
|
-
target: 'http://127.0.0.1:8080'
|
|
82
|
-
},
|
|
83
|
-
'/rs': {
|
|
84
|
-
target: bendi
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
89
|
-
publicPath: config.output.publicPath,
|
|
90
|
-
stats: {
|
|
91
|
-
colors: true,
|
|
92
|
-
chunks: false
|
|
93
|
-
}
|
|
94
|
-
})
|
|
95
|
-
|
|
96
|
-
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
97
|
-
// force page reload when html-webpack-plugin template changes
|
|
98
|
-
compiler.plugin('compilation', function (compilation) {
|
|
99
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
100
|
-
hotMiddleware.publish({action: 'reload'})
|
|
101
|
-
cb()
|
|
102
|
-
})
|
|
103
|
-
})
|
|
104
|
-
|
|
105
|
-
// proxy api requests
|
|
106
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
107
|
-
var options = proxyTable[context]
|
|
108
|
-
if (typeof options === 'string') {
|
|
109
|
-
options = {target: options}
|
|
110
|
-
}
|
|
111
|
-
app.use(proxyMiddleware(context, options))
|
|
112
|
-
})
|
|
113
|
-
|
|
114
|
-
// handle fallback for HTML5 history API
|
|
115
|
-
app.use(require('connect-history-api-fallback')())
|
|
116
|
-
// app.use(function (req, res, next) {
|
|
117
|
-
// res.header('Access-Control-Allow-Origin', '*')
|
|
118
|
-
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
119
|
-
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
120
|
-
// res.header('X-Powered-By', '3,2,1')
|
|
121
|
-
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
122
|
-
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
123
|
-
// next()
|
|
124
|
-
// })
|
|
125
|
-
|
|
126
|
-
// serve webpack bundle output
|
|
127
|
-
app.use(devMiddleware)
|
|
128
|
-
|
|
129
|
-
// enable hot-reload and state-preserving
|
|
130
|
-
// compilation error display
|
|
131
|
-
app.use(hotMiddleware)
|
|
132
|
-
|
|
133
|
-
// serve pure static assets
|
|
134
|
-
app.use('/static', express.static('./static'))
|
|
135
|
-
|
|
136
|
-
// app.all('/rs/*', function (req, res) {
|
|
137
|
-
// proxy.web(req, res, {
|
|
138
|
-
// target: 'http://127.0.0.1:8081/reports'
|
|
139
|
-
// })
|
|
140
|
-
// })
|
|
141
|
-
|
|
142
|
-
// app.all('/rs/*', function (req, res) {
|
|
143
|
-
// proxy.web(req, res, {
|
|
144
|
-
// target: 'http://127.0.0.1:8081/ldap'
|
|
145
|
-
// })
|
|
146
|
-
// })
|
|
147
|
-
// app.all('/excel/*', function (req, res) {
|
|
148
|
-
// proxy.web(req, res, {
|
|
149
|
-
// target: 'http://127.0.0.1:8081/charge'
|
|
150
|
-
// })
|
|
151
|
-
// })
|
|
152
|
-
|
|
153
|
-
// app.all('/rs/*', function (req, res) {
|
|
154
|
-
// proxy.web(req, res, {
|
|
155
|
-
// target: 'http://127.0.0.1:82/charge'
|
|
156
|
-
// })
|
|
157
|
-
// })
|
|
158
|
-
|
|
159
|
-
// app.all('/*', function (req, res) {
|
|
160
|
-
// proxy.web(req, res, {
|
|
161
|
-
// target: 'http://127.0.0.1:82'
|
|
162
|
-
// })
|
|
163
|
-
// })
|
|
164
|
-
// app.all('/rs/user', function (req, res) {
|
|
165
|
-
// proxy.web(req, res, {
|
|
166
|
-
// target: 'http://127.0.0.1:82'
|
|
167
|
-
// })
|
|
168
|
-
// })
|
|
169
|
-
|
|
170
|
-
module.exports = app.listen(8085, function (err) {
|
|
171
|
-
if (err) {
|
|
172
|
-
console.log(err)
|
|
173
|
-
return
|
|
174
|
-
}
|
|
175
|
-
console.log('Listening at http://localhost:8085')
|
|
176
|
-
})
|
|
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://127.0.0.1:8090'
|
|
17
|
+
// var bendi = 'http://172.168.1.11:9001'
|
|
18
|
+
var fuwu = 'http://192.168.50.4:8400'
|
|
19
|
+
// var fuwu = 'http://203.57.101.233:9001'
|
|
20
|
+
var system = 'http://192.168.50.4:8400'
|
|
21
|
+
//192.168.
|
|
22
|
+
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
23
|
+
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
|
24
|
+
var proxyTable = {
|
|
25
|
+
'/rs/logic/exportfile': {
|
|
26
|
+
target: fuwu
|
|
27
|
+
},
|
|
28
|
+
'/files': {
|
|
29
|
+
target: fuwu
|
|
30
|
+
},
|
|
31
|
+
// 查找资源服务数据
|
|
32
|
+
'/rs/search': {
|
|
33
|
+
target: fuwu
|
|
34
|
+
},
|
|
35
|
+
// 查找资源服务数据
|
|
36
|
+
'/rs/logic/getLogin': {
|
|
37
|
+
target: fuwu
|
|
38
|
+
},
|
|
39
|
+
// 查找资源服务数据
|
|
40
|
+
'/rs/logic/getInitData': {
|
|
41
|
+
target: fuwu
|
|
42
|
+
},
|
|
43
|
+
'/rs/logic/getSaleInitData':{
|
|
44
|
+
target: fuwu
|
|
45
|
+
},
|
|
46
|
+
// 用户登录服务地址
|
|
47
|
+
'/rs/user': {
|
|
48
|
+
target: fuwu
|
|
49
|
+
},
|
|
50
|
+
'/rs/path/getParams': {
|
|
51
|
+
target: fuwu
|
|
52
|
+
},
|
|
53
|
+
'/rs/data': {
|
|
54
|
+
target: fuwu
|
|
55
|
+
},
|
|
56
|
+
'/rs/license': {
|
|
57
|
+
target: fuwu
|
|
58
|
+
},
|
|
59
|
+
'/rs/db': {
|
|
60
|
+
target: fuwu
|
|
61
|
+
},
|
|
62
|
+
'/excel': {
|
|
63
|
+
target: fuwu
|
|
64
|
+
},
|
|
65
|
+
'/rs/config': {
|
|
66
|
+
target: fuwu
|
|
67
|
+
},
|
|
68
|
+
'/rs/sql/getLicenseById': {
|
|
69
|
+
target: fuwu
|
|
70
|
+
},
|
|
71
|
+
'/rs/report': {
|
|
72
|
+
target: bendi
|
|
73
|
+
},
|
|
74
|
+
'/rs/vue': {
|
|
75
|
+
target: fuwu
|
|
76
|
+
},
|
|
77
|
+
'/rs/file': {
|
|
78
|
+
target: bendi
|
|
79
|
+
},
|
|
80
|
+
'/rs/logic/SumSettleFileImport': {
|
|
81
|
+
target: 'http://127.0.0.1:8080'
|
|
82
|
+
},
|
|
83
|
+
'/rs': {
|
|
84
|
+
target: bendi
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
89
|
+
publicPath: config.output.publicPath,
|
|
90
|
+
stats: {
|
|
91
|
+
colors: true,
|
|
92
|
+
chunks: false
|
|
93
|
+
}
|
|
94
|
+
})
|
|
95
|
+
|
|
96
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
97
|
+
// force page reload when html-webpack-plugin template changes
|
|
98
|
+
compiler.plugin('compilation', function (compilation) {
|
|
99
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
100
|
+
hotMiddleware.publish({action: 'reload'})
|
|
101
|
+
cb()
|
|
102
|
+
})
|
|
103
|
+
})
|
|
104
|
+
|
|
105
|
+
// proxy api requests
|
|
106
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
107
|
+
var options = proxyTable[context]
|
|
108
|
+
if (typeof options === 'string') {
|
|
109
|
+
options = {target: options}
|
|
110
|
+
}
|
|
111
|
+
app.use(proxyMiddleware(context, options))
|
|
112
|
+
})
|
|
113
|
+
|
|
114
|
+
// handle fallback for HTML5 history API
|
|
115
|
+
app.use(require('connect-history-api-fallback')())
|
|
116
|
+
// app.use(function (req, res, next) {
|
|
117
|
+
// res.header('Access-Control-Allow-Origin', '*')
|
|
118
|
+
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
119
|
+
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
120
|
+
// res.header('X-Powered-By', '3,2,1')
|
|
121
|
+
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
122
|
+
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
123
|
+
// next()
|
|
124
|
+
// })
|
|
125
|
+
|
|
126
|
+
// serve webpack bundle output
|
|
127
|
+
app.use(devMiddleware)
|
|
128
|
+
|
|
129
|
+
// enable hot-reload and state-preserving
|
|
130
|
+
// compilation error display
|
|
131
|
+
app.use(hotMiddleware)
|
|
132
|
+
|
|
133
|
+
// serve pure static assets
|
|
134
|
+
app.use('/static', express.static('./static'))
|
|
135
|
+
|
|
136
|
+
// app.all('/rs/*', function (req, res) {
|
|
137
|
+
// proxy.web(req, res, {
|
|
138
|
+
// target: 'http://127.0.0.1:8081/reports'
|
|
139
|
+
// })
|
|
140
|
+
// })
|
|
141
|
+
|
|
142
|
+
// app.all('/rs/*', function (req, res) {
|
|
143
|
+
// proxy.web(req, res, {
|
|
144
|
+
// target: 'http://127.0.0.1:8081/ldap'
|
|
145
|
+
// })
|
|
146
|
+
// })
|
|
147
|
+
// app.all('/excel/*', function (req, res) {
|
|
148
|
+
// proxy.web(req, res, {
|
|
149
|
+
// target: 'http://127.0.0.1:8081/charge'
|
|
150
|
+
// })
|
|
151
|
+
// })
|
|
152
|
+
|
|
153
|
+
// app.all('/rs/*', function (req, res) {
|
|
154
|
+
// proxy.web(req, res, {
|
|
155
|
+
// target: 'http://127.0.0.1:82/charge'
|
|
156
|
+
// })
|
|
157
|
+
// })
|
|
158
|
+
|
|
159
|
+
// app.all('/*', function (req, res) {
|
|
160
|
+
// proxy.web(req, res, {
|
|
161
|
+
// target: 'http://127.0.0.1:82'
|
|
162
|
+
// })
|
|
163
|
+
// })
|
|
164
|
+
// app.all('/rs/user', function (req, res) {
|
|
165
|
+
// proxy.web(req, res, {
|
|
166
|
+
// target: 'http://127.0.0.1:82'
|
|
167
|
+
// })
|
|
168
|
+
// })
|
|
169
|
+
|
|
170
|
+
module.exports = app.listen(8085, function (err) {
|
|
171
|
+
if (err) {
|
|
172
|
+
console.log(err)
|
|
173
|
+
return
|
|
174
|
+
}
|
|
175
|
+
console.log('Listening at http://localhost:8085')
|
|
176
|
+
})
|
package/package.json
CHANGED
|
@@ -611,7 +611,7 @@ export default{
|
|
|
611
611
|
},
|
|
612
612
|
GasStatistics: {
|
|
613
613
|
'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_residential_area': '小区', 'f_address': '地址', 'f_user_phone': '电话', 'f_gascode': '燃气证号', 'f_meternumber': '表号',
|
|
614
|
-
'f_meter_classify': '表具类型', 'f_meter_title': '表描述', 'f_price_name': '气价名称', 'f_gasproperties': '用气性质', 'f_balance': '期初余额', 'f_last_tablebase': '起方', 'f_tablebase': '止方',
|
|
614
|
+
'f_meter_classify': '表具类型', 'f_meter_title': '表描述', 'f_price_name': '气价名称', 'f_user_nature': '用气类型','f_gasproperties': '用气性质', 'f_balance': '期初余额', 'f_last_tablebase': '起方', 'f_tablebase': '止方',
|
|
615
615
|
'f_oughtamount': '期间用气量', 'f_oughtfee': '期间用气金额', 'f_collection': '期末充值金额', 'f_curbalance': '期末余额', 'f_gas_state': '用气状态', 'f_changetable_state': '是否换表', 'f_input_date': '最后通讯日期'
|
|
616
616
|
},
|
|
617
617
|
ArrearageConfig: {
|
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
<tabs header="未用气查询" v-if="permission('未用气查询')">
|
|
28
28
|
<get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
|
|
29
29
|
</tabs>
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
<!--<tabs header="物联网表结算分析" v-if="permission('物联网表结算分析')">-->
|
|
31
|
+
<!--<webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>-->
|
|
32
|
+
<!--</tabs>-->
|
|
33
33
|
</tab-button>
|
|
34
34
|
|
|
35
35
|
</template>
|
|
@@ -33,8 +33,8 @@
|
|
|
33
33
|
|
|
34
34
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
35
35
|
<div class="col-sm-2 form-group">
|
|
36
|
-
<label for="startDate" class="font_normal_body" title="
|
|
37
|
-
<datepicker id="startDate" placeholder="
|
|
36
|
+
<label for="startDate" class="font_normal_body" title="审核日期">开始日期</label>
|
|
37
|
+
<datepicker id="startDate" placeholder="审核开始日期" style="width:60%"
|
|
38
38
|
v-model="model.startDate"
|
|
39
39
|
:value.sync="model.startDate"
|
|
40
40
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
@@ -43,8 +43,8 @@
|
|
|
43
43
|
</datepicker>
|
|
44
44
|
</div>
|
|
45
45
|
<div class="col-sm-2 form-group">
|
|
46
|
-
<label for="endDate" class="font_normal_body" title="
|
|
47
|
-
<datepicker id="endDate" placeholder="
|
|
46
|
+
<label for="endDate" class="font_normal_body" title="审核日期">结束日期</label>
|
|
47
|
+
<datepicker id="endDate" placeholder="审核结束日期" style="width:60%"
|
|
48
48
|
v-model="model.endDate"
|
|
49
49
|
:value.sync="model.endDate"
|
|
50
50
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
@@ -150,7 +150,27 @@
|
|
|
150
150
|
</v-select>
|
|
151
151
|
</div>
|
|
152
152
|
<div class="col-sm-2 form-group">
|
|
153
|
-
|
|
153
|
+
<label for="handstartDate" class="font_normal_body" title="下发日期">开始日期</label>
|
|
154
|
+
<datepicker id="handstartDate" placeholder="下发开始日期" style="width:60%"
|
|
155
|
+
v-model="model.handstartDate"
|
|
156
|
+
:value.sync="model.handstartDate"
|
|
157
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
158
|
+
condition="f_hand_date >= '{}'"
|
|
159
|
+
:show-reset-button="true"
|
|
160
|
+
>
|
|
161
|
+
</datepicker>
|
|
162
|
+
</div>
|
|
163
|
+
<div class="col-sm-2 form-group">
|
|
164
|
+
<label for="handendDate" class="font_normal_body" title="下发日期">结束日期</label>
|
|
165
|
+
<datepicker id="handendDate" placeholder="下发结束日期" style="width:60%"
|
|
166
|
+
v-model="model.handendDate"
|
|
167
|
+
:value.sync="model.handendDate"
|
|
168
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
169
|
+
condition="f_hand_date <= '{}'"
|
|
170
|
+
:show-reset-button="true" >
|
|
171
|
+
</datepicker>
|
|
172
|
+
</div>
|
|
173
|
+
<div class="col-sm-2 form-group">
|
|
154
174
|
<label for="inputstartDate" class="font_normal_body">抄表日期</label>
|
|
155
175
|
<datepicker id="inputstartDate" placeholder="开始日期" style="width:60%"
|
|
156
176
|
v-model="model.inputstartDate"
|
|
@@ -378,13 +378,11 @@
|
|
|
378
378
|
<td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
379
379
|
<nobr>{{row.f_card_id}}</nobr>
|
|
380
380
|
</td>
|
|
381
|
-
|
|
382
|
-
|
|
383
381
|
<td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
384
382
|
<nobr>{{row.f_price_name}}</nobr>
|
|
385
383
|
</td>
|
|
386
|
-
<th :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
387
|
-
<nobr>{{row.value}}</nobr>
|
|
384
|
+
<th :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;" title="{{row.value}}">
|
|
385
|
+
<nobr>{{row.value.substring(0,10)}}</nobr>
|
|
388
386
|
</th>
|
|
389
387
|
<td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
390
388
|
<nobr>{{row.f_meter_brand}}</nobr>
|
|
@@ -0,0 +1,499 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div id="unit" class="flex-row">
|
|
3
|
+
<div class="basic-main">
|
|
4
|
+
<div class="flex" :class="{showbottom:showbottomsum}" v-if="!show">
|
|
5
|
+
<criteria-paged :model="model" v-ref:paged>
|
|
6
|
+
<criteria partial='criteria' v-ref:criteria @condition-changed='$parent.search'>
|
|
7
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
8
|
+
<div class="row" >
|
|
9
|
+
<div class="col-sm-2">
|
|
10
|
+
<label class="font_normal_body">组织机构</label>
|
|
11
|
+
<res-select :initresid="$parent.$parent.org"
|
|
12
|
+
style="width:60%"
|
|
13
|
+
@res-select="$parent.$parent.getorg"
|
|
14
|
+
:is-mul=false
|
|
15
|
+
restype='organization'>
|
|
16
|
+
</res-select>
|
|
17
|
+
</div>
|
|
18
|
+
<div class="col-sm-2">
|
|
19
|
+
<label class="font_normal_body">客户编号</label>
|
|
20
|
+
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
|
|
21
|
+
condition="ss.f_userinfo_code like '%{}%'" v-next-el='f_userinfo_code' v-el:meternumber
|
|
22
|
+
>
|
|
23
|
+
</div>
|
|
24
|
+
<div class="col-sm-2">
|
|
25
|
+
<label class="font_normal_body">客户名称</label>
|
|
26
|
+
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
|
|
27
|
+
condition="ss.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="col-sm-2">
|
|
30
|
+
<label class="font_normal_body">客户地址</label>
|
|
31
|
+
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_address" placeholder='客户地址'
|
|
32
|
+
condition="ss.f_address like '%{}%'" v-next-el='f_address' v-el:f_address>
|
|
33
|
+
</div>
|
|
34
|
+
<div class="span" style="float:right;margin-top:10px">
|
|
35
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
36
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
|
|
37
|
+
<export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
|
|
38
|
+
:field="$parent.$parent.getfield"
|
|
39
|
+
sqlurl="rs/logic/exportfile" sql-name="gasStatisticsQuery" template-name='用气量统计表'
|
|
40
|
+
:choose-col="true"></export-excel>
|
|
41
|
+
<print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
|
|
42
|
+
:defaultfield="$parent.$parent.defaultfield"
|
|
43
|
+
titletable="缴费记录报表" :starthead="$parent.$parent.getstart"
|
|
44
|
+
:sumsmodel="$parent.$parent.sumsmodel"></print-data>
|
|
45
|
+
<div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
|
|
46
|
+
</div>
|
|
47
|
+
</div>
|
|
48
|
+
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
49
|
+
<div class="col-sm-2">
|
|
50
|
+
<label class="font_normal_body">电 话</label>
|
|
51
|
+
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_user_phone" placeholder='电话'
|
|
52
|
+
condition="ss.f_user_phone like '%{}%'" v-next-el='f_user_phone' v-el:f_user_phone
|
|
53
|
+
>
|
|
54
|
+
</div>
|
|
55
|
+
<div class="col-sm-2">
|
|
56
|
+
<label class="font_normal_body">小 区</label>
|
|
57
|
+
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_residential_area" placeholder='小区'
|
|
58
|
+
condition="ss.f_residential_area like '%{}%'" v-next-el='f_residential_area' v-el:f_residential_area>
|
|
59
|
+
</div>
|
|
60
|
+
<div class="col-sm-2">
|
|
61
|
+
<label class="font_normal_body">表 号</label>
|
|
62
|
+
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_meternumber" placeholder='表号'
|
|
63
|
+
condition="ss.f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
|
|
64
|
+
>
|
|
65
|
+
</div>
|
|
66
|
+
<div class="col-sm-2">
|
|
67
|
+
<label class="font_normal_body">燃气证号</label>
|
|
68
|
+
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_gascode" placeholder='燃气证号'
|
|
69
|
+
condition="ss.f_gascode like '%{}%'" v-next-el='f_gascode' v-el:f_gascode
|
|
70
|
+
>
|
|
71
|
+
</div>
|
|
72
|
+
<div class="col-sm-2 form-group">
|
|
73
|
+
<label class="font_normal_body">气价类型</label>
|
|
74
|
+
<v-select :value.sync="model.pricetype" v-model="model.pricetype"
|
|
75
|
+
placeholder='气价类型' :options="$parent.$parent.pricetypes"
|
|
76
|
+
close-on-select>
|
|
77
|
+
</v-select>
|
|
78
|
+
</div>
|
|
79
|
+
<div class="col-sm-2 form-group">
|
|
80
|
+
<label class="font_normal_body">气价名称</label>
|
|
81
|
+
<v-select :value.sync="model.f_price_name"
|
|
82
|
+
v-model="model.f_price_name"
|
|
83
|
+
:options="$parent.$parent.getPricenames"
|
|
84
|
+
condition="ss.f_price_name = '{}'"
|
|
85
|
+
close-on-select></v-select>
|
|
86
|
+
</div>
|
|
87
|
+
<div class="col-sm-2 form-group">
|
|
88
|
+
<label class="font_normal_body">气表品牌</label>
|
|
89
|
+
<v-select :value.sync="model.f_meter_brand"
|
|
90
|
+
v-model="model.f_meter_brand"
|
|
91
|
+
:options="$parent.$parent.meterbrands"
|
|
92
|
+
condition="ss.f_meter_brand = '{}'"
|
|
93
|
+
close-on-select></v-select>
|
|
94
|
+
</div>
|
|
95
|
+
<div class="col-sm-2 form-group">
|
|
96
|
+
<label class="font_normal_body">是否换表</label>
|
|
97
|
+
<v-select :value.sync="model.f_changetable_state"
|
|
98
|
+
v-model="model.f_changetable_state"
|
|
99
|
+
:options="$parent.$parent.isChange"
|
|
100
|
+
condition="ss.f_changetable_state = '{}'"
|
|
101
|
+
close-on-select></v-select>
|
|
102
|
+
</div>
|
|
103
|
+
<div class="col-sm-2 form-group">
|
|
104
|
+
<label class="font_normal_body">用气状态</label>
|
|
105
|
+
<v-select :value.sync="model.f_gas_state"
|
|
106
|
+
v-model="model.f_gas_state"
|
|
107
|
+
:options="$parent.$parent.gasState"
|
|
108
|
+
condition="ss.f_gas_state = '{}'"
|
|
109
|
+
close-on-select></v-select>
|
|
110
|
+
</div>
|
|
111
|
+
<div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
|
|
112
|
+
<label class="font_normal_body">用气量区间</label>
|
|
113
|
+
<div class="row">
|
|
114
|
+
<input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount1"
|
|
115
|
+
condition="ss.f_oughtamount >= {} " placeholder="">
|
|
116
|
+
<label class="font_normal_body"> ≤ x ≤ </label>
|
|
117
|
+
<input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount2"
|
|
118
|
+
condition="ss.f_oughtamount <= {} " placeholder="">
|
|
119
|
+
</div>
|
|
120
|
+
</div>
|
|
121
|
+
<div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
|
|
122
|
+
<label class="font_normal_body"> 充值区间 </label>
|
|
123
|
+
<div class="row">
|
|
124
|
+
<input type="text" style="width:27%" class="input_search" v-model="model.f_collection1"
|
|
125
|
+
condition="ss.f_collection >= {} " placeholder="">
|
|
126
|
+
<label class="font_normal_body"> ≤ x ≤ </label>
|
|
127
|
+
<input type="text" style="width:27%" class="input_search" v-model="model.f_collection2"
|
|
128
|
+
condition="ss.f_collection <= {} " placeholder="">
|
|
129
|
+
</div>
|
|
130
|
+
</div>
|
|
131
|
+
<div class="col-sm-2 form-group" >
|
|
132
|
+
<label class="font_normal_body" for="startDate">开始时间</label>
|
|
133
|
+
<datepicker id="startDate" placeholder="开始日期" style="width: 60%"
|
|
134
|
+
v-model="model.startDate"
|
|
135
|
+
:value.sync="model.startDate"
|
|
136
|
+
:disabled-days-of-Week="[]"
|
|
137
|
+
:format="'yyyy-MM-dd 00:00:00'"
|
|
138
|
+
:show-reset-button="reset">
|
|
139
|
+
</datepicker>
|
|
140
|
+
</div>
|
|
141
|
+
<div class="col-sm-2 form-group" >
|
|
142
|
+
<label class="font_normal_body" for="endDate">结束时间</label>
|
|
143
|
+
<datepicker id="endDate" placeholder="结束日期" style="width: 60%"
|
|
144
|
+
v-model="model.endDate"
|
|
145
|
+
:value.sync="model.endDate"
|
|
146
|
+
:disabled-days-of-Week="[]"
|
|
147
|
+
:format="'yyyy-MM-dd 23:59:59'"
|
|
148
|
+
:show-reset-button="reset">
|
|
149
|
+
</datepicker>
|
|
150
|
+
</div>
|
|
151
|
+
</div>
|
|
152
|
+
</div>
|
|
153
|
+
</criteria>
|
|
154
|
+
<data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
|
|
155
|
+
<template partial='head'>
|
|
156
|
+
<tr>
|
|
157
|
+
<th><nobr>客户编号</nobr></th>
|
|
158
|
+
<th><nobr>客户名称</nobr></th>
|
|
159
|
+
<th><nobr>小区</nobr></th>
|
|
160
|
+
<th><nobr>地址</nobr></th>
|
|
161
|
+
<th><nobr>电话</nobr></th>
|
|
162
|
+
|
|
163
|
+
<th><nobr>燃气证号</nobr></th>
|
|
164
|
+
<th><nobr>表号</nobr></th>
|
|
165
|
+
<th><nobr>表具类型</nobr></th>
|
|
166
|
+
<th><nobr>表描述</nobr></th>
|
|
167
|
+
<th><nobr>气价名称</nobr></th>
|
|
168
|
+
|
|
169
|
+
<th><nobr>一阶气价</nobr></th>
|
|
170
|
+
<th><nobr>二阶气价</nobr></th>
|
|
171
|
+
<th><nobr>三阶气价</nobr></th>
|
|
172
|
+
|
|
173
|
+
<th><nobr>用气类型</nobr></th>
|
|
174
|
+
<th><nobr>用气性质</nobr></th>
|
|
175
|
+
<th><nobr>期初余额</nobr></th>
|
|
176
|
+
<th><nobr>起方</nobr></th>
|
|
177
|
+
<th><nobr>止方</nobr></th>
|
|
178
|
+
<th><nobr>期间用气量</nobr></th>
|
|
179
|
+
|
|
180
|
+
<th><nobr>期间用气金额</nobr></th>
|
|
181
|
+
<th><nobr>期间充值金额</nobr></th>
|
|
182
|
+
<th><nobr>期末余额</nobr></th>
|
|
183
|
+
<th><nobr>用气状态</nobr></th>
|
|
184
|
+
<th><nobr>是否换表</nobr></th>
|
|
185
|
+
<th><nobr>最后通讯日期</nobr></th>
|
|
186
|
+
</tr>
|
|
187
|
+
</template>
|
|
188
|
+
<template partial='body' partial='list'>
|
|
189
|
+
<tr >
|
|
190
|
+
<td style="text-align: left;"><nobr> <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr></td>
|
|
191
|
+
<td style="text-align: left;"><nobr>{{row.f_user_name}}</nobr></td>
|
|
192
|
+
<td style="text-align: left;"><nobr>{{row.f_residential_area}}</nobr></td>
|
|
193
|
+
<td style="text-align: left;"><nobr>{{row.f_address}}</nobr></td>
|
|
194
|
+
<td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
|
|
195
|
+
|
|
196
|
+
<td style="text-align:center"><nobr>{{row.f_gascode}}</nobr></td>
|
|
197
|
+
<th style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></th>
|
|
198
|
+
<th style="text-align:center"><nobr>{{row.f_meter_classify}}</nobr></th>
|
|
199
|
+
<th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
|
|
200
|
+
<th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
|
|
201
|
+
|
|
202
|
+
<th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>
|
|
203
|
+
<th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>
|
|
204
|
+
<th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>
|
|
205
|
+
|
|
206
|
+
<th style="text-align:center"><nobr>{{row.f_user_nature}}</nobr></th>
|
|
207
|
+
<th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
|
|
208
|
+
|
|
209
|
+
<th style="text-align:center"><nobr>{{row.f_balance}}</nobr></th>
|
|
210
|
+
<th style="text-align:center"><nobr>{{row.f_last_tablebase}}</nobr></th>
|
|
211
|
+
<th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
|
|
212
|
+
<th style="text-align:center"><nobr>{{row.f_oughtamount}}</nobr></th>
|
|
213
|
+
<th style="text-align:center"><nobr>{{row.f_oughtfee}}</nobr></th>
|
|
214
|
+
|
|
215
|
+
<th style="text-align:center"><nobr>{{row.f_collection}}</nobr></th>
|
|
216
|
+
<th style="text-align:center"><nobr>{{row.f_curbalance}}</nobr></th>
|
|
217
|
+
<th style="text-align:center"><nobr>{{row.f_gas_state}}</nobr></th>
|
|
218
|
+
<th style="text-align:center"><nobr>{{row.f_changetable_state}}</nobr></th>
|
|
219
|
+
<th style="text-align:center"><nobr>{{row.f_input_date}}</nobr></th>
|
|
220
|
+
</tr>
|
|
221
|
+
</template>
|
|
222
|
+
<template partial='foot'></template>
|
|
223
|
+
</data-grid>
|
|
224
|
+
</criteria-paged>
|
|
225
|
+
<table class="table-hover">
|
|
226
|
+
<tr style="position: relative" class="table-bordered">
|
|
227
|
+
<td
|
|
228
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
|
|
229
|
+
汇总信息
|
|
230
|
+
</td>
|
|
231
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
232
|
+
期间用气量: {{sumsmodel.f_oughtamount}}
|
|
233
|
+
</td>
|
|
234
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
235
|
+
期间用气金额: {{sumsmodel.f_oughtfee}}
|
|
236
|
+
</td>
|
|
237
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
238
|
+
期间充值金额: {{sumsmodel.f_collection}}
|
|
239
|
+
</td>
|
|
240
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
241
|
+
一阶气量合计: {{sumsmodel.f_stairamount1}}
|
|
242
|
+
</td>
|
|
243
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
244
|
+
一阶气费合计: {{sumsmodel.f_stair1fee}}
|
|
245
|
+
</td>
|
|
246
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
247
|
+
二阶气量合计: {{sumsmodel.f_stairamount2}}
|
|
248
|
+
</td>
|
|
249
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
250
|
+
二阶气费合计: {{sumsmodel.f_stair2fee}}
|
|
251
|
+
</td>
|
|
252
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
253
|
+
三阶气量合计: {{sumsmodel.f_stairamount3}}
|
|
254
|
+
</td>
|
|
255
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
256
|
+
三阶气费合计: {{sumsmodel.f_stair3fee}}
|
|
257
|
+
</td>
|
|
258
|
+
</tr>
|
|
259
|
+
</table>
|
|
260
|
+
</div>
|
|
261
|
+
</div>
|
|
262
|
+
</div>
|
|
263
|
+
</template>
|
|
264
|
+
|
|
265
|
+
<script>
|
|
266
|
+
import {HttpResetClass, PagedList} from 'vue-client'
|
|
267
|
+
import exportConfig from '../../components/sale/config/exportConfig'
|
|
268
|
+
import * as Util from '../../Util'
|
|
269
|
+
import plugins from '../../plugins/GetLoginInfoService'
|
|
270
|
+
|
|
271
|
+
let readySomething = async function (self) {
|
|
272
|
+
await self.$MagLoadParams.loadParam()
|
|
273
|
+
self.initParams()
|
|
274
|
+
self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
|
|
275
|
+
self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
|
|
276
|
+
}
|
|
277
|
+
export default {
|
|
278
|
+
title: '用气量统计表',
|
|
279
|
+
data () {
|
|
280
|
+
return {
|
|
281
|
+
show:false,
|
|
282
|
+
org:[this.$login.f.orgid],
|
|
283
|
+
orgcondition: ' and ss.f_orgid = ' + this.$login.f.orgid,
|
|
284
|
+
//f_filialeid: this.$login.f.f_orgid,
|
|
285
|
+
detaillist: [],
|
|
286
|
+
meterbrands: [],
|
|
287
|
+
prices: [],
|
|
288
|
+
gasproperties:[],
|
|
289
|
+
condition:'',
|
|
290
|
+
rowdata:{},
|
|
291
|
+
getstart:'',
|
|
292
|
+
config: {
|
|
293
|
+
defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_meternumber', 'f_gasproperties', 'f_balance', 'f_last_tablebase','f_tablebase',
|
|
294
|
+
'f_oughtamount', 'f_oughtfee', 'f_collection', 'f_curbalance', 'f_gas_state', 'f_changetable_state', 'f_input_date']
|
|
295
|
+
},
|
|
296
|
+
sumsmodel: {},
|
|
297
|
+
orgid:[this.$login.f.orgid],
|
|
298
|
+
criteriaShow:false,
|
|
299
|
+
//默认打印列
|
|
300
|
+
defaultfield: [],
|
|
301
|
+
orgCondtionStr: '',
|
|
302
|
+
model: new PagedList('rs/sql/gasStatisticsQuery', 50,{
|
|
303
|
+
startDate: 'this.model.startDate',
|
|
304
|
+
endDate: 'this.model.endDate'
|
|
305
|
+
},{
|
|
306
|
+
f_oughtamount: 0,
|
|
307
|
+
f_oughtfee: 0,
|
|
308
|
+
f_collection:0,
|
|
309
|
+
f_stairamount1:0,
|
|
310
|
+
f_stair1fee:0,
|
|
311
|
+
f_stairamount2:0,
|
|
312
|
+
f_stair2fee:0,
|
|
313
|
+
f_stairamount3:0,
|
|
314
|
+
f_stair3fee:0
|
|
315
|
+
}),
|
|
316
|
+
showbottomsum:false //页面下方是否有合计: 默认为false, 在watch修改
|
|
317
|
+
}
|
|
318
|
+
},
|
|
319
|
+
ready () {
|
|
320
|
+
// this.$refs.paged.$refs.criteria.search()
|
|
321
|
+
readySomething(this).then(() => {
|
|
322
|
+
this.$emit('ready')
|
|
323
|
+
}).catch((error) => {
|
|
324
|
+
this.$emit('error', error)
|
|
325
|
+
})
|
|
326
|
+
this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),-1).substring(0,10) + ' 00:00:00'
|
|
327
|
+
this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
|
|
328
|
+
this.$refs.paged.$refs.criteria.model.inputStartDate = Util.addDate(new Date(),-1).substring(0,10) + ' 00:00:00'
|
|
329
|
+
this.$refs.paged.$refs.criteria.model.inputEndDate = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
|
|
330
|
+
this.$refs.paged.$refs.criteria.search()
|
|
331
|
+
},
|
|
332
|
+
methods: {
|
|
333
|
+
initParams() {
|
|
334
|
+
// 初始化气表品牌
|
|
335
|
+
let brandArr = []
|
|
336
|
+
this.$MagGetSaleParam.getGasbrand().forEach((item) => {
|
|
337
|
+
let temp = {}
|
|
338
|
+
temp.label = item.label
|
|
339
|
+
temp.value = item.value.f_meter_brand
|
|
340
|
+
brandArr.push(temp)
|
|
341
|
+
})
|
|
342
|
+
this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
|
|
343
|
+
//初始化气表价格
|
|
344
|
+
this.prices = this.$MagGetSaleParam.getPrices();
|
|
345
|
+
},
|
|
346
|
+
async updateParams() {
|
|
347
|
+
await this.$MagLoadParams.loadParam(this.f_filialeid)
|
|
348
|
+
this.initParams()
|
|
349
|
+
},
|
|
350
|
+
getorg(obj) {
|
|
351
|
+
if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
|
|
352
|
+
this.orgcondition = " and ss.f_orgid in " + plugins.convertToIn(obj)
|
|
353
|
+
}else{
|
|
354
|
+
this.orgcondition = " and ss.f_orgid = " + this.$login.f.orgid
|
|
355
|
+
}
|
|
356
|
+
},
|
|
357
|
+
userTypeChange () {
|
|
358
|
+
this.gasproperties=[]
|
|
359
|
+
if(this.$refs.paged.$refs.criteria.model !==null) {
|
|
360
|
+
this.$refs.paged.$refs.criteria.model.f_gasproperties=''
|
|
361
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
|
|
362
|
+
}
|
|
363
|
+
else{
|
|
364
|
+
this.gasproperties =[{label: '全部', value: ''}]
|
|
365
|
+
}
|
|
366
|
+
},
|
|
367
|
+
hidden(){
|
|
368
|
+
this.criteriaShow = !this.criteriaShow
|
|
369
|
+
},
|
|
370
|
+
cancel() {
|
|
371
|
+
this.show = false
|
|
372
|
+
},
|
|
373
|
+
clearmsg () {
|
|
374
|
+
Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
|
|
375
|
+
this.$refs.paged.$refs.criteria.model[key] = []
|
|
376
|
+
})
|
|
377
|
+
},
|
|
378
|
+
getRes (obj) {
|
|
379
|
+
this.orgCondtionStr = condition
|
|
380
|
+
this.orgname = obj.orgnames[0]
|
|
381
|
+
this.depname = obj.depnames[0]
|
|
382
|
+
},
|
|
383
|
+
showmsg(obj){
|
|
384
|
+
this.rowdata=obj
|
|
385
|
+
this.show=true
|
|
386
|
+
},
|
|
387
|
+
|
|
388
|
+
search (args) {
|
|
389
|
+
args.condition = `${args.condition}`+this.orgcondition
|
|
390
|
+
this.condition = args.condition
|
|
391
|
+
this.model.search(args.condition, args.model)
|
|
392
|
+
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
393
|
+
// args.condition = `${args.condition}`
|
|
394
|
+
// if (this.orgcondition)
|
|
395
|
+
// args.condition = `${args.condition}` + this.orgcondition
|
|
396
|
+
// else
|
|
397
|
+
// args.condition = `${args.condition}` + 'and m.f_orgid in ' + '(' + this.$login.f.orgid + ')'
|
|
398
|
+
// this.model.search(args.condition, args.model)
|
|
399
|
+
}
|
|
400
|
+
},
|
|
401
|
+
watch: {
|
|
402
|
+
'model.rows'(val) {
|
|
403
|
+
//如果有合计 这里为true, 其他为false ,反正相反
|
|
404
|
+
this.showbottomsum=true;
|
|
405
|
+
if(val.length === 0){
|
|
406
|
+
this.sumsmodel = {}
|
|
407
|
+
this.showbottomsum=false;
|
|
408
|
+
}
|
|
409
|
+
},
|
|
410
|
+
'orgCondtionStr'(val) {
|
|
411
|
+
let res = val.match(/'(.*?)'/)
|
|
412
|
+
console.log('正则提取:',res && res[1])
|
|
413
|
+
if (res) {
|
|
414
|
+
this.f_filialeid = res[1]
|
|
415
|
+
// this.updateParams()
|
|
416
|
+
}
|
|
417
|
+
}
|
|
418
|
+
},
|
|
419
|
+
computed: {
|
|
420
|
+
getstart(){
|
|
421
|
+
return `开始时间：${this.$refs.paged.$refs.criteria.model.startDate} 结束时间：${this.$refs.paged.$refs.criteria.model.endDate}`
|
|
422
|
+
},
|
|
423
|
+
getPricenames() {
|
|
424
|
+
let f_user_type = this.$refs.paged.$refs.criteria.model.f_user_type;
|
|
425
|
+
let f_gasproperties = this.$refs.paged.$refs.criteria.model.f_gasproperties;
|
|
426
|
+
let pricetype = this.$refs.paged.$refs.criteria.model.pricetype;
|
|
427
|
+
console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
|
|
428
|
+
console.log("查看f_orgid:",this.$login.f.f_orgid)
|
|
429
|
+
if(this.$refs.paged.$refs.criteria.model !==null) {
|
|
430
|
+
let rs = []
|
|
431
|
+
let priceArr = []
|
|
432
|
+
if ( pricetype.length >0) {
|
|
433
|
+
let params = {
|
|
434
|
+
f_price_type: pricetype[0],
|
|
435
|
+
filter: this.org[0],
|
|
436
|
+
prices: this.prices
|
|
437
|
+
}
|
|
438
|
+
console.log("打印一下params:",params)
|
|
439
|
+
this.$MagGetSaleParam.getPrice(params).forEach((item) => {
|
|
440
|
+
console.log("====================================》")
|
|
441
|
+
let temp = {}
|
|
442
|
+
temp.label = item.label
|
|
443
|
+
temp.value = item.value.f_price_name
|
|
444
|
+
priceArr.push(temp)
|
|
445
|
+
console.log("打印一下temp:",temp)
|
|
446
|
+
})
|
|
447
|
+
|
|
448
|
+
rs = [{label: '全部', value: ''}, ...priceArr]
|
|
449
|
+
}
|
|
450
|
+
if (rs.length === 0) {
|
|
451
|
+
console.log('rs读出来是空')
|
|
452
|
+
this.$refs.paged.$refs.criteria.model.f_price_name = ''
|
|
453
|
+
}
|
|
454
|
+
return rs
|
|
455
|
+
}
|
|
456
|
+
},
|
|
457
|
+
getfield () {
|
|
458
|
+
return exportConfig.GasStatistics
|
|
459
|
+
},
|
|
460
|
+
usertypes() {
|
|
461
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
462
|
+
},
|
|
463
|
+
pricetypes() {
|
|
464
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
465
|
+
},
|
|
466
|
+
gasState() {
|
|
467
|
+
return [{label:'正常', value:'正常'},
|
|
468
|
+
{label:'异常', value:'异常'},
|
|
469
|
+
]
|
|
470
|
+
},
|
|
471
|
+
isChange() {
|
|
472
|
+
return [{label:'是', value:'是'},
|
|
473
|
+
{label:'否', value:'否'},
|
|
474
|
+
]
|
|
475
|
+
},
|
|
476
|
+
getCondition () {
|
|
477
|
+
// var con = ""
|
|
478
|
+
// if (this.orgCondtionStr) {
|
|
479
|
+
// con = `${this.$refs.paged.$refs.criteria.condition} and m.f_orgid in (${this.orgCondtionStr})`
|
|
480
|
+
// }
|
|
481
|
+
// else {
|
|
482
|
+
// con = `${this.$refs.paged.$refs.criteria.condition}and m.f_orgid in ('${this.$login.f.orgid}' )`
|
|
483
|
+
// }
|
|
484
|
+
return {
|
|
485
|
+
startDate: this.$refs.paged.$refs.criteria.model.startDate,
|
|
486
|
+
endDate: this.$refs.paged.$refs.criteria.model.endDate,
|
|
487
|
+
condition: this.condition
|
|
488
|
+
}
|
|
489
|
+
}
|
|
490
|
+
}
|
|
491
|
+
}
|
|
492
|
+
</script>
|
|
493
|
+
|
|
494
|
+
<style>
|
|
495
|
+
.showbottom{
|
|
496
|
+
height:95%
|
|
497
|
+
}
|
|
498
|
+
</style>
|
|
499
|
+
|