manage-client 3.2.218 → 3.2.220
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
CHANGED
|
@@ -1,179 +1,180 @@
|
|
|
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
|
-
|
|
23
|
-
var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
|
|
25
|
-
//
|
|
26
|
-
//
|
|
27
|
-
var
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
})
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
//
|
|
121
|
-
// res.header('Access-Control-Allow-
|
|
122
|
-
// res.header('Access-Control-Allow-
|
|
123
|
-
// res.header('
|
|
124
|
-
// res.header('
|
|
125
|
-
// res.header('
|
|
126
|
-
//
|
|
127
|
-
//
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
//
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
//
|
|
141
|
-
//
|
|
142
|
-
//
|
|
143
|
-
//
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
//
|
|
147
|
-
//
|
|
148
|
-
//
|
|
149
|
-
//
|
|
150
|
-
//
|
|
151
|
-
//
|
|
152
|
-
//
|
|
153
|
-
//
|
|
154
|
-
//
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
//
|
|
158
|
-
//
|
|
159
|
-
//
|
|
160
|
-
//
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
//
|
|
164
|
-
//
|
|
165
|
-
//
|
|
166
|
-
//
|
|
167
|
-
//
|
|
168
|
-
//
|
|
169
|
-
//
|
|
170
|
-
//
|
|
171
|
-
//
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
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://139.214.92.34:7450/#'
|
|
23
|
+
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
+
var wode = 'http://139.214.92.34:7450/#'
|
|
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
|
+
'/files': {
|
|
33
|
+
target: bendi
|
|
34
|
+
},
|
|
35
|
+
// 查找资源服务数据
|
|
36
|
+
'/rs/search': {
|
|
37
|
+
target: bendi
|
|
38
|
+
},
|
|
39
|
+
// 查找资源服务数据
|
|
40
|
+
'/rs/logic/getLogin': {
|
|
41
|
+
target: bendi
|
|
42
|
+
},
|
|
43
|
+
// 查找资源服务数据
|
|
44
|
+
'/rs/logic/getInitData': {
|
|
45
|
+
target: bendi
|
|
46
|
+
},
|
|
47
|
+
'/rs/logic/getSaleInitData': {
|
|
48
|
+
target: bendi
|
|
49
|
+
},
|
|
50
|
+
// 用户登录服务地址
|
|
51
|
+
'/rs/user': {
|
|
52
|
+
target: bendi
|
|
53
|
+
},
|
|
54
|
+
'/rs/path/getParams': {
|
|
55
|
+
target: bendi
|
|
56
|
+
},
|
|
57
|
+
'/rs/data': {
|
|
58
|
+
target: bendi
|
|
59
|
+
},
|
|
60
|
+
'/rs/license': {
|
|
61
|
+
target: bendi
|
|
62
|
+
},
|
|
63
|
+
'/rs/db': {
|
|
64
|
+
target: bendi
|
|
65
|
+
},
|
|
66
|
+
'/excel': {
|
|
67
|
+
target: bendi
|
|
68
|
+
},
|
|
69
|
+
'/rs/config': {
|
|
70
|
+
target: bendi
|
|
71
|
+
},
|
|
72
|
+
'/rs/sql/getLicenseById': {
|
|
73
|
+
target: bendi
|
|
74
|
+
},
|
|
75
|
+
'/rs/report': {
|
|
76
|
+
target: bendi
|
|
77
|
+
},
|
|
78
|
+
'/rs/vue': {
|
|
79
|
+
target: bendi
|
|
80
|
+
},
|
|
81
|
+
'/rs/file': {
|
|
82
|
+
target: bendi
|
|
83
|
+
},
|
|
84
|
+
'/rs/sql/singleTable': {
|
|
85
|
+
target: bendi
|
|
86
|
+
},
|
|
87
|
+
'/rs': {
|
|
88
|
+
target: wode
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
93
|
+
publicPath: config.output.publicPath,
|
|
94
|
+
stats: {
|
|
95
|
+
colors: true,
|
|
96
|
+
chunks: false
|
|
97
|
+
}
|
|
98
|
+
})
|
|
99
|
+
|
|
100
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
101
|
+
// force page reload when html-webpack-plugin template changes
|
|
102
|
+
compiler.plugin('compilation', function (compilation) {
|
|
103
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
104
|
+
hotMiddleware.publish({action: 'reload'})
|
|
105
|
+
cb()
|
|
106
|
+
})
|
|
107
|
+
})
|
|
108
|
+
|
|
109
|
+
// proxy api requests
|
|
110
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
111
|
+
var options = proxyTable[context]
|
|
112
|
+
if (typeof options === 'string') {
|
|
113
|
+
options = {target: options}
|
|
114
|
+
}
|
|
115
|
+
app.use(proxyMiddleware(context, options))
|
|
116
|
+
})
|
|
117
|
+
|
|
118
|
+
// handle fallback for HTML5 history API
|
|
119
|
+
app.use(require('connect-history-api-fallback')())
|
|
120
|
+
// app.use(function (req, res, next) {
|
|
121
|
+
// res.header('Access-Control-Allow-Origin', '*')
|
|
122
|
+
// res.header('Access-Control-Allow-Headers', 'X-Requested-With')
|
|
123
|
+
// res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
|
|
124
|
+
// res.header('X-Powered-By', '3,2,1')
|
|
125
|
+
// res.header('Access-Control-Allow-Credentials', 'true')
|
|
126
|
+
// res.header('Content-Type', 'application/json;charset=utf-8')
|
|
127
|
+
// next()
|
|
128
|
+
// })
|
|
129
|
+
|
|
130
|
+
// serve webpack bundle output
|
|
131
|
+
app.use(devMiddleware)
|
|
132
|
+
|
|
133
|
+
// enable hot-reload and state-preserving
|
|
134
|
+
// compilation error display
|
|
135
|
+
app.use(hotMiddleware)
|
|
136
|
+
|
|
137
|
+
// serve pure static assets
|
|
138
|
+
app.use('/static', express.static('./static'))
|
|
139
|
+
|
|
140
|
+
// app.all('/rs/*', function (req, res) {
|
|
141
|
+
// proxy.web(req, res, {
|
|
142
|
+
// target: 'http://127.0.0.1:8081/reports'
|
|
143
|
+
// })
|
|
144
|
+
// })
|
|
145
|
+
|
|
146
|
+
// app.all('/rs/*', function (req, res) {
|
|
147
|
+
// proxy.web(req, res, {
|
|
148
|
+
// target: 'http://127.0.0.1:8081/ldap'
|
|
149
|
+
// })
|
|
150
|
+
// })
|
|
151
|
+
// app.all('/excel/*', function (req, res) {
|
|
152
|
+
// proxy.web(req, res, {
|
|
153
|
+
// target: 'http://127.0.0.1:8081/charge'
|
|
154
|
+
// })
|
|
155
|
+
// })
|
|
156
|
+
|
|
157
|
+
// app.all('/rs/*', function (req, res) {
|
|
158
|
+
// proxy.web(req, res, {
|
|
159
|
+
// target: 'http://127.0.0.1:82/charge'
|
|
160
|
+
// })
|
|
161
|
+
// })
|
|
162
|
+
|
|
163
|
+
// app.all('/*', function (req, res) {
|
|
164
|
+
// proxy.web(req, res, {
|
|
165
|
+
// target: 'http://127.0.0.1:82'
|
|
166
|
+
// })
|
|
167
|
+
// })
|
|
168
|
+
// app.all('/rs/user', function (req, res) {
|
|
169
|
+
// proxy.web(req, res, {
|
|
170
|
+
// target: 'http://127.0.0.1:82'
|
|
171
|
+
// })
|
|
172
|
+
// })
|
|
173
|
+
|
|
174
|
+
module.exports = app.listen(8015, function (err) {
|
|
175
|
+
if (err) {
|
|
176
|
+
console.log(err)
|
|
177
|
+
return
|
|
178
|
+
}
|
|
179
|
+
console.log('Listening at http://localhost:8015')
|
|
180
|
+
})
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "manage-client",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.220",
|
|
4
4
|
"description": "经营管控模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"karma-sourcemap-loader": "^0.3.7",
|
|
54
54
|
"karma-spec-reporter": "0.0.31",
|
|
55
55
|
"karma-webpack": "^2.0.2",
|
|
56
|
-
"ldap-clients": "3.0.
|
|
56
|
+
"ldap-clients": "3.0.55-test-1",
|
|
57
57
|
"less": "^2.7.3",
|
|
58
58
|
"mkdirp": "^0.5.1",
|
|
59
59
|
"mocha": "^3.2.0",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"style": "0.0.3",
|
|
68
68
|
"style-loader": "^0.20.3",
|
|
69
69
|
"swiper": "^5.4.5",
|
|
70
|
-
"system-clients": "3.
|
|
70
|
+
"system-clients": "3.2.54-test-1",
|
|
71
71
|
"url-loader": "^0.5.7",
|
|
72
72
|
"vue-amap": "0.5.10",
|
|
73
73
|
"vue-client": "1.24.51",
|
|
@@ -356,9 +356,9 @@
|
|
|
356
356
|
<th>
|
|
357
357
|
<nobr>合计欠费</nobr>
|
|
358
358
|
</th>
|
|
359
|
-
<th title="实际欠费=合计欠费-上期结余"
|
|
360
|
-
<nobr>实际欠费</nobr
|
|
361
|
-
</th
|
|
359
|
+
<!-- <th title="实际欠费=合计欠费-上期结余">-->
|
|
360
|
+
<!-- <nobr>实际欠费</nobr>-->
|
|
361
|
+
<!-- </th>-->
|
|
362
362
|
<th>
|
|
363
363
|
<nobr>抄表员</nobr>
|
|
364
364
|
</th>
|
|
@@ -459,9 +459,9 @@
|
|
|
459
459
|
<td style="text-align: center;">
|
|
460
460
|
<nobr>{{ row.f_oughtfee_all }}</nobr>
|
|
461
461
|
</td>
|
|
462
|
-
<td style="text-align: center;"
|
|
463
|
-
<nobr>{{ row.f_oughtfee_col }}</nobr
|
|
464
|
-
</td
|
|
462
|
+
<!-- <td style="text-align: center;">-->
|
|
463
|
+
<!-- <nobr>{{ row.f_oughtfee_col }}</nobr>-->
|
|
464
|
+
<!-- </td>-->
|
|
465
465
|
<td style="text-align: center;">
|
|
466
466
|
<nobr>{{ row.f_inputtor }}</nobr>
|
|
467
467
|
</td>
|
|
@@ -591,8 +591,7 @@ export default {
|
|
|
591
591
|
f_oughtfee_new: 0,
|
|
592
592
|
overdue: 0,
|
|
593
593
|
f_garbage_fee: 0,
|
|
594
|
-
f_oughtfee_all: 0
|
|
595
|
-
f_oughtfee_col: 0
|
|
594
|
+
f_oughtfee_all: 0
|
|
596
595
|
}),
|
|
597
596
|
criteriaShow: false,
|
|
598
597
|
orgCondtionStr: '',
|
|
@@ -101,7 +101,23 @@
|
|
|
101
101
|
close-on-select></v-select>
|
|
102
102
|
</div>-->
|
|
103
103
|
<res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
104
|
-
|
|
104
|
+
<div class="col-sm-2 form-group">
|
|
105
|
+
<label class="font_normal_body">气价类型</label>
|
|
106
|
+
<v-select :value.sync="model.pricetype" v-model="model.pricetype"
|
|
107
|
+
@change="$parent.$parent.pricetypechanged"
|
|
108
|
+
placeholder='气价类型' :options="$parent.$parent.pricetypes"
|
|
109
|
+
close-on-select v-ref:type>
|
|
110
|
+
</v-select>
|
|
111
|
+
</div>
|
|
112
|
+
<div class="col-sm-2 form-group">
|
|
113
|
+
<label class="font_normal_body">气价名称</label>
|
|
114
|
+
<v-select :value.sync="model.f_price_name"
|
|
115
|
+
v-model="model.f_price_name"
|
|
116
|
+
multiple
|
|
117
|
+
:options="$parent.$parent.getPricenames"
|
|
118
|
+
condition="f_price_name in {}"
|
|
119
|
+
></v-select>
|
|
120
|
+
</div>
|
|
105
121
|
</div>
|
|
106
122
|
</div>
|
|
107
123
|
</criteria>
|
|
@@ -276,6 +292,7 @@
|
|
|
276
292
|
dep:[],
|
|
277
293
|
user:[],
|
|
278
294
|
},
|
|
295
|
+
f_filialeid: this.$login.f.orgid,
|
|
279
296
|
show:false,
|
|
280
297
|
rowdata:{},
|
|
281
298
|
criteriaShow: false,
|
|
@@ -307,6 +324,9 @@
|
|
|
307
324
|
})
|
|
308
325
|
},
|
|
309
326
|
methods: {
|
|
327
|
+
pricetypechanged(){
|
|
328
|
+
this.$refs.paged.$refs.cri.model.f_price_name = []
|
|
329
|
+
},
|
|
310
330
|
Fileinput(){
|
|
311
331
|
this.batchmoneyShow=true;
|
|
312
332
|
},
|
|
@@ -430,6 +450,38 @@
|
|
|
430
450
|
},
|
|
431
451
|
},
|
|
432
452
|
computed: {
|
|
453
|
+
getPricenames() {
|
|
454
|
+
let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
|
|
455
|
+
let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
|
|
456
|
+
console.log("打印一下:",f_user_type,pricetype,this.f_filialeid)
|
|
457
|
+
if(this.$refs.paged.$refs.cri.model !==null) {
|
|
458
|
+
let rs = []
|
|
459
|
+
let priceArr = []
|
|
460
|
+
if ( pricetype.length >0) {
|
|
461
|
+
let params = {
|
|
462
|
+
f_price_type: pricetype[0],
|
|
463
|
+
filter: this.f_filialeid,
|
|
464
|
+
prices: this.prices
|
|
465
|
+
}
|
|
466
|
+
this.$MagGetSaleParam.getPrice(params).forEach((item) => {
|
|
467
|
+
let temp = {}
|
|
468
|
+
temp.label = item.label
|
|
469
|
+
temp.value = item.value.f_price_name
|
|
470
|
+
priceArr.push(temp)
|
|
471
|
+
})
|
|
472
|
+
if(priceArr.length == 0 ){
|
|
473
|
+
rs= [{label: '全部', value: ''}]
|
|
474
|
+
}else{
|
|
475
|
+
rs = [ ...priceArr]
|
|
476
|
+
}
|
|
477
|
+
}
|
|
478
|
+
if (rs.length === 0) {
|
|
479
|
+
console.log('rs读出来是空')
|
|
480
|
+
this.$refs.paged.$refs.cri.model.f_price_name = ''
|
|
481
|
+
}
|
|
482
|
+
return rs
|
|
483
|
+
}
|
|
484
|
+
},
|
|
433
485
|
getCondition() {
|
|
434
486
|
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
|
|
435
487
|
orderitem: this.orderitem?`${this.orderitem}`: " f_input_date desc "}
|
|
@@ -457,7 +509,10 @@
|
|
|
457
509
|
},
|
|
458
510
|
whetherPay() {
|
|
459
511
|
return [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}]
|
|
460
|
-
}
|
|
512
|
+
},
|
|
513
|
+
pricetypes() {
|
|
514
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
515
|
+
},
|
|
461
516
|
},
|
|
462
517
|
events:{
|
|
463
518
|
'onFileUpload': function (file, res) {
|
|
@@ -133,6 +133,23 @@
|
|
|
133
133
|
close-on-select></v-select>
|
|
134
134
|
</div>-->
|
|
135
135
|
<res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
|
|
136
|
+
<div class="col-sm-2 form-group">
|
|
137
|
+
<label class="font_normal_body">气价类型</label>
|
|
138
|
+
<v-select :value.sync="model.pricetype" v-model="model.pricetype"
|
|
139
|
+
@change="$parent.$parent.pricetypechanged"
|
|
140
|
+
placeholder='气价类型' :options="$parent.$parent.pricetypes"
|
|
141
|
+
close-on-select v-ref:type>
|
|
142
|
+
</v-select>
|
|
143
|
+
</div>
|
|
144
|
+
<div class="col-sm-2 form-group">
|
|
145
|
+
<label class="font_normal_body">气价名称</label>
|
|
146
|
+
<v-select :value.sync="model.f_price_name"
|
|
147
|
+
v-model="model.f_price_name"
|
|
148
|
+
multiple
|
|
149
|
+
:options="$parent.$parent.getPricenames"
|
|
150
|
+
condition="f_price_name in {}"
|
|
151
|
+
></v-select>
|
|
152
|
+
</div>
|
|
136
153
|
</div>
|
|
137
154
|
</div>
|
|
138
155
|
</criteria>
|
|
@@ -391,6 +408,7 @@
|
|
|
391
408
|
f_stair2fee:0,
|
|
392
409
|
f_stair3amount:0,
|
|
393
410
|
f_stair3fee:0}),
|
|
411
|
+
f_filialeid: this.$login.f.orgid,
|
|
394
412
|
initres: {
|
|
395
413
|
org:[this.$login.f.orgid],
|
|
396
414
|
dep:[],
|
|
@@ -427,6 +445,9 @@
|
|
|
427
445
|
})
|
|
428
446
|
},
|
|
429
447
|
methods: {
|
|
448
|
+
pricetypechanged(){
|
|
449
|
+
this.$refs.paged.$refs.cri.model.f_price_name = []
|
|
450
|
+
},
|
|
430
451
|
getotherfooter(){
|
|
431
452
|
// this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
|
|
432
453
|
// this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
|
|
@@ -586,7 +607,42 @@
|
|
|
586
607
|
},
|
|
587
608
|
whetherPay() {
|
|
588
609
|
return [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}]
|
|
589
|
-
}
|
|
610
|
+
},
|
|
611
|
+
pricetypes() {
|
|
612
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
613
|
+
},
|
|
614
|
+
getPricenames() {
|
|
615
|
+
let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
|
|
616
|
+
let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
|
|
617
|
+
console.log("打印一下:",f_user_type,pricetype,this.f_filialeid)
|
|
618
|
+
if(this.$refs.paged.$refs.cri.model !==null) {
|
|
619
|
+
let rs = []
|
|
620
|
+
let priceArr = []
|
|
621
|
+
if ( pricetype.length >0) {
|
|
622
|
+
let params = {
|
|
623
|
+
f_price_type: pricetype[0],
|
|
624
|
+
filter: this.f_filialeid,
|
|
625
|
+
prices: this.prices
|
|
626
|
+
}
|
|
627
|
+
this.$MagGetSaleParam.getPrice(params).forEach((item) => {
|
|
628
|
+
let temp = {}
|
|
629
|
+
temp.label = item.label
|
|
630
|
+
temp.value = item.value.f_price_name
|
|
631
|
+
priceArr.push(temp)
|
|
632
|
+
})
|
|
633
|
+
if(priceArr.length == 0 ){
|
|
634
|
+
rs= [{label: '全部', value: ''}]
|
|
635
|
+
}else{
|
|
636
|
+
rs = [ ...priceArr]
|
|
637
|
+
}
|
|
638
|
+
}
|
|
639
|
+
if (rs.length === 0) {
|
|
640
|
+
console.log('rs读出来是空')
|
|
641
|
+
this.$refs.paged.$refs.cri.model.f_price_name = ''
|
|
642
|
+
}
|
|
643
|
+
return rs
|
|
644
|
+
}
|
|
645
|
+
},
|
|
590
646
|
},
|
|
591
647
|
events:{
|
|
592
648
|
'onFileUpload': function (file, res) {
|
package/src/main.js
CHANGED
|
@@ -1,66 +1,66 @@
|
|
|
1
|
-
import Vue from 'vue'
|
|
2
|
-
import App from './App'
|
|
3
|
-
import { all } from 'vue-client'
|
|
4
|
-
|
|
5
|
-
// import { sale } from 'sale-client'
|
|
6
|
-
import { system } from 'system-clients'
|
|
7
|
-
import { ldap } from 'ldap-clients'
|
|
8
|
-
import saleManage from './saleManage'
|
|
9
|
-
import webmeterManage from './webmeterManage'
|
|
10
|
-
import reportManage from './reportManage'
|
|
11
|
-
import newmanage from './newmanage'
|
|
12
|
-
import ManageHome from './ManageHome'
|
|
13
|
-
import echarts from 'echarts'
|
|
14
|
-
import AMap from 'vue-amap'
|
|
15
|
-
|
|
16
|
-
Vue.config.silent = true
|
|
17
|
-
// Vue.mmType = 'AES'
|
|
18
|
-
|
|
19
|
-
Vue.use(AMap);
|
|
20
|
-
|
|
21
|
-
// 初始化vue-amap
|
|
22
|
-
AMap.initAMapApiLoader({
|
|
23
|
-
// 高德key
|
|
24
|
-
key: '3cec9ae8e2349207f7ac29279e3f4abe',
|
|
25
|
-
// 插件集合 (插件按需引入)
|
|
26
|
-
plugin: [
|
|
27
|
-
"AMap.Autocomplete", //输入提示插件
|
|
28
|
-
"AMap.PlaceSearch", //POI搜索插件
|
|
29
|
-
"AMap.Scale", //右下角缩略图插件 比例尺
|
|
30
|
-
"AMap.OverView", //地图鹰眼插件
|
|
31
|
-
"AMap.ToolBar", //地图工具条0
|
|
32
|
-
"AMap.MapType", //类别切换控件,实现默认图层与卫星图、实施交通图层之间切换的控制
|
|
33
|
-
"AMap.PolyEditor", //编辑 折线多,边形
|
|
34
|
-
"AMap.CircleEditor", //圆形编辑器插件
|
|
35
|
-
"AMap.Geolocation" //定位控件,用来获取和展示用户主机所在的经纬度位置
|
|
36
|
-
],
|
|
37
|
-
uiVersion: "1.0"
|
|
38
|
-
});
|
|
39
|
-
/** **************************通用组件******************************/
|
|
40
|
-
|
|
41
|
-
Vue.prototype.$echarts = echarts
|
|
42
|
-
all()
|
|
43
|
-
// sale()
|
|
44
|
-
ldap()
|
|
45
|
-
system(false)
|
|
46
|
-
|
|
47
|
-
saleManage(
|
|
48
|
-
webmeterManage("wuhai")
|
|
49
|
-
ManageHome()
|
|
50
|
-
newmanage()
|
|
51
|
-
reportManage()
|
|
52
|
-
require('system-clients/src/styles/less/bootstrap.less')
|
|
53
|
-
require('./components/qinhua/Style/qinhuaStyle.less')
|
|
54
|
-
// require('./bootstrap/less/manageStyle/manageChile.less')
|
|
55
|
-
// require('./bootstrap/less/manageStyle/safeStyle.less')
|
|
56
|
-
|
|
57
|
-
//大屏展示要放开的样式
|
|
58
|
-
// require('system-clients/src/styles/less/manageStyle/manageChile.less')
|
|
59
|
-
// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
|
|
60
|
-
// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
|
|
61
|
-
|
|
62
|
-
new Vue({
|
|
63
|
-
el: 'body',
|
|
64
|
-
components: { App }
|
|
65
|
-
})
|
|
66
|
-
|
|
1
|
+
import Vue from 'vue'
|
|
2
|
+
import App from './App'
|
|
3
|
+
import { all } from 'vue-client'
|
|
4
|
+
|
|
5
|
+
// import { sale } from 'sale-client'
|
|
6
|
+
import { system } from 'system-clients'
|
|
7
|
+
import { ldap } from 'ldap-clients'
|
|
8
|
+
import saleManage from './saleManage'
|
|
9
|
+
import webmeterManage from './webmeterManage'
|
|
10
|
+
import reportManage from './reportManage'
|
|
11
|
+
import newmanage from './newmanage'
|
|
12
|
+
import ManageHome from './ManageHome'
|
|
13
|
+
import echarts from 'echarts'
|
|
14
|
+
import AMap from 'vue-amap'
|
|
15
|
+
|
|
16
|
+
Vue.config.silent = true
|
|
17
|
+
// Vue.mmType = 'AES'
|
|
18
|
+
|
|
19
|
+
Vue.use(AMap);
|
|
20
|
+
|
|
21
|
+
// 初始化vue-amap
|
|
22
|
+
AMap.initAMapApiLoader({
|
|
23
|
+
// 高德key
|
|
24
|
+
key: '3cec9ae8e2349207f7ac29279e3f4abe',
|
|
25
|
+
// 插件集合 (插件按需引入)
|
|
26
|
+
plugin: [
|
|
27
|
+
"AMap.Autocomplete", //输入提示插件
|
|
28
|
+
"AMap.PlaceSearch", //POI搜索插件
|
|
29
|
+
"AMap.Scale", //右下角缩略图插件 比例尺
|
|
30
|
+
"AMap.OverView", //地图鹰眼插件
|
|
31
|
+
"AMap.ToolBar", //地图工具条0
|
|
32
|
+
"AMap.MapType", //类别切换控件,实现默认图层与卫星图、实施交通图层之间切换的控制
|
|
33
|
+
"AMap.PolyEditor", //编辑 折线多,边形
|
|
34
|
+
"AMap.CircleEditor", //圆形编辑器插件
|
|
35
|
+
"AMap.Geolocation" //定位控件,用来获取和展示用户主机所在的经纬度位置
|
|
36
|
+
],
|
|
37
|
+
uiVersion: "1.0"
|
|
38
|
+
});
|
|
39
|
+
/** **************************通用组件******************************/
|
|
40
|
+
|
|
41
|
+
Vue.prototype.$echarts = echarts
|
|
42
|
+
all()
|
|
43
|
+
// sale()
|
|
44
|
+
ldap()
|
|
45
|
+
system(false)
|
|
46
|
+
|
|
47
|
+
saleManage('meihekou')
|
|
48
|
+
webmeterManage("wuhai")
|
|
49
|
+
ManageHome()
|
|
50
|
+
newmanage()
|
|
51
|
+
reportManage()
|
|
52
|
+
require('system-clients/src/styles/less/bootstrap.less')
|
|
53
|
+
require('./components/qinhua/Style/qinhuaStyle.less')
|
|
54
|
+
// require('./bootstrap/less/manageStyle/manageChile.less')
|
|
55
|
+
// require('./bootstrap/less/manageStyle/safeStyle.less')
|
|
56
|
+
|
|
57
|
+
//大屏展示要放开的样式
|
|
58
|
+
// require('system-clients/src/styles/less/manageStyle/manageChile.less')
|
|
59
|
+
// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
|
|
60
|
+
// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
|
|
61
|
+
|
|
62
|
+
new Vue({
|
|
63
|
+
el: 'body',
|
|
64
|
+
components: { App }
|
|
65
|
+
})
|
|
66
|
+
|