manage-client 3.2.219 → 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,180 +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
|
-
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
|
-
'/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
|
-
})
|
|
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
|
@@ -101,12 +101,22 @@
|
|
|
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
|
+
<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>
|
|
104
112
|
<div class="col-sm-2 form-group">
|
|
105
113
|
<label class="font_normal_body">气价名称</label>
|
|
106
114
|
<v-select :value.sync="model.f_price_name"
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
115
|
+
v-model="model.f_price_name"
|
|
116
|
+
multiple
|
|
117
|
+
:options="$parent.$parent.getPricenames"
|
|
118
|
+
condition="f_price_name in {}"
|
|
119
|
+
></v-select>
|
|
110
120
|
</div>
|
|
111
121
|
</div>
|
|
112
122
|
</div>
|
|
@@ -282,6 +292,7 @@
|
|
|
282
292
|
dep:[],
|
|
283
293
|
user:[],
|
|
284
294
|
},
|
|
295
|
+
f_filialeid: this.$login.f.orgid,
|
|
285
296
|
show:false,
|
|
286
297
|
rowdata:{},
|
|
287
298
|
criteriaShow: false,
|
|
@@ -313,6 +324,9 @@
|
|
|
313
324
|
})
|
|
314
325
|
},
|
|
315
326
|
methods: {
|
|
327
|
+
pricetypechanged(){
|
|
328
|
+
this.$refs.paged.$refs.cri.model.f_price_name = []
|
|
329
|
+
},
|
|
316
330
|
Fileinput(){
|
|
317
331
|
this.batchmoneyShow=true;
|
|
318
332
|
},
|
|
@@ -436,6 +450,38 @@
|
|
|
436
450
|
},
|
|
437
451
|
},
|
|
438
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
|
+
},
|
|
439
485
|
getCondition() {
|
|
440
486
|
return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
|
|
441
487
|
orderitem: this.orderitem?`${this.orderitem}`: " f_input_date desc "}
|
|
@@ -464,9 +510,9 @@
|
|
|
464
510
|
whetherPay() {
|
|
465
511
|
return [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}]
|
|
466
512
|
},
|
|
467
|
-
|
|
513
|
+
pricetypes() {
|
|
468
514
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
469
|
-
}
|
|
515
|
+
},
|
|
470
516
|
},
|
|
471
517
|
events:{
|
|
472
518
|
'onFileUpload': function (file, res) {
|
|
@@ -133,12 +133,22 @@
|
|
|
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>
|
|
136
144
|
<div class="col-sm-2 form-group">
|
|
137
145
|
<label class="font_normal_body">气价名称</label>
|
|
138
146
|
<v-select :value.sync="model.f_price_name"
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
147
|
+
v-model="model.f_price_name"
|
|
148
|
+
multiple
|
|
149
|
+
:options="$parent.$parent.getPricenames"
|
|
150
|
+
condition="f_price_name in {}"
|
|
151
|
+
></v-select>
|
|
142
152
|
</div>
|
|
143
153
|
</div>
|
|
144
154
|
</div>
|
|
@@ -398,6 +408,7 @@
|
|
|
398
408
|
f_stair2fee:0,
|
|
399
409
|
f_stair3amount:0,
|
|
400
410
|
f_stair3fee:0}),
|
|
411
|
+
f_filialeid: this.$login.f.orgid,
|
|
401
412
|
initres: {
|
|
402
413
|
org:[this.$login.f.orgid],
|
|
403
414
|
dep:[],
|
|
@@ -434,6 +445,9 @@
|
|
|
434
445
|
})
|
|
435
446
|
},
|
|
436
447
|
methods: {
|
|
448
|
+
pricetypechanged(){
|
|
449
|
+
this.$refs.paged.$refs.cri.model.f_price_name = []
|
|
450
|
+
},
|
|
437
451
|
getotherfooter(){
|
|
438
452
|
// this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
|
|
439
453
|
// this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
|
|
@@ -594,9 +608,41 @@
|
|
|
594
608
|
whetherPay() {
|
|
595
609
|
return [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}]
|
|
596
610
|
},
|
|
597
|
-
|
|
611
|
+
pricetypes() {
|
|
598
612
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
599
|
-
}
|
|
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
|
+
},
|
|
600
646
|
},
|
|
601
647
|
events:{
|
|
602
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
|
+
|