manage-client 3.3.76 → 3.3.78-lx
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 +180 -180
- package/package.json +111 -111
- package/src/components/SellReport/shexian/SxSellSummary.vue +1 -1
- package/src/components/sale/filesquery/RecordInfoQuery.vue +4 -4
- package/src/filiale/daliyihua/RecordInfoQuery.vue +1449 -0
- package/src/filiale/daliyihua/config/DefaultPrint.js +6 -0
- package/src/filiale/daliyihua/config/exportConfig.js +2276 -0
- package/src/filiale/daliyihua/config/tableConfig.js +45 -0
- package/src/filiale/daliyihua/sale.js +9 -0
- package/src/filiale/rizhao/UserQuery.vue +0 -5
- package/src/filiale/shexian/UserQuery.vue +990 -0
- package/src/filiale/shexian/config/exportConfig.js +4 -2
- package/src/filiale/shexian/sale.js +4 -0
- package/src/filiale/wenxi/config/exportConfig.js +1 -1
- package/src/main.js +72 -70
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
|
|
85
|
-
target: bendi
|
|
86
|
-
},
|
|
87
|
-
'/rs': {
|
|
88
|
-
target:
|
|
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://113.219.193.157:8100/#'
|
|
23
|
+
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
+
var wode = 'http://127.0.0.1:8488'
|
|
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': {
|
|
85
|
+
target: bendi
|
|
86
|
+
},
|
|
87
|
+
'/rs': {
|
|
88
|
+
target: bendi
|
|
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,111 +1,111 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "manage-client",
|
|
3
|
-
"version": "3.3.
|
|
4
|
-
"description": "经营管控模块前台组件",
|
|
5
|
-
"main": "src/index.js",
|
|
6
|
-
"directories": {
|
|
7
|
-
"test": "test"
|
|
8
|
-
},
|
|
9
|
-
"dependencies": {
|
|
10
|
-
"crypto-js": "^4.1.1",
|
|
11
|
-
"swiper": "^5.4.5"
|
|
12
|
-
},
|
|
13
|
-
"devDependencies": {
|
|
14
|
-
"axios": "0.15.3",
|
|
15
|
-
"babel-core": "^6.0.0",
|
|
16
|
-
"babel-loader": "^6.0.0",
|
|
17
|
-
"babel-plugin-transform-runtime": "^6.0.0",
|
|
18
|
-
"babel-preset-es2015": "^6.0.0",
|
|
19
|
-
"babel-preset-stage-2": "^6.0.0",
|
|
20
|
-
"chai": "^3.5.0",
|
|
21
|
-
"co": "^4.6.0",
|
|
22
|
-
"connect-history-api-fallback": "^1.1.0",
|
|
23
|
-
"cross-env": "^1.0.7",
|
|
24
|
-
"cross-spawn": "^2.1.5",
|
|
25
|
-
"css-loader": "^0.23.0",
|
|
26
|
-
"echarts": "^4.1.0",
|
|
27
|
-
"eslint": "^2.0.0",
|
|
28
|
-
"eslint-config-standard": "^5.1.0",
|
|
29
|
-
"eslint-friendly-formatter": "^1.2.2",
|
|
30
|
-
"eslint-loader": "^1.3.0",
|
|
31
|
-
"eslint-plugin-html": "^1.3.0",
|
|
32
|
-
"eslint-plugin-promise": "^1.0.8",
|
|
33
|
-
"eslint-plugin-standard": "^1.3.2",
|
|
34
|
-
"eslint-plugin-vue": "^0.1.1",
|
|
35
|
-
"eventsource-polyfill": "^0.9.6",
|
|
36
|
-
"express": "^4.13.3",
|
|
37
|
-
"extract-text-webpack-plugin": "^1.0.1",
|
|
38
|
-
"filemanager-webpack-plugin": "^2.0.5",
|
|
39
|
-
"file-loader": "^0.8.4",
|
|
40
|
-
"function-bind": "^1.0.2",
|
|
41
|
-
"html-webpack-plugin": "^2.8.1",
|
|
42
|
-
"http-proxy-middleware": "^0.11.0",
|
|
43
|
-
"inject-loader": "^2.0.1",
|
|
44
|
-
"isparta-loader": "^2.0.0",
|
|
45
|
-
"jasmine-core": "^2.4.1",
|
|
46
|
-
"jquery": "^3.3.1",
|
|
47
|
-
"jsencrypt": "3.0.0-rc.1",
|
|
48
|
-
"json-loader": "^0.5.4",
|
|
49
|
-
"karma": "^1.4.1",
|
|
50
|
-
"karma-chrome-launcher": "^2.2.0",
|
|
51
|
-
"karma-coverage": "^1.1.1",
|
|
52
|
-
"karma-mocha": "^1.3.0",
|
|
53
|
-
"karma-sinon-chai": "^1.3.1",
|
|
54
|
-
"karma-sourcemap-loader": "^0.3.7",
|
|
55
|
-
"karma-spec-reporter": "0.0.31",
|
|
56
|
-
"karma-webpack": "^2.0.2",
|
|
57
|
-
"ldap-clients": "3.0.7",
|
|
58
|
-
"less": "^2.7.3",
|
|
59
|
-
"mkdirp": "^0.5.1",
|
|
60
|
-
"mocha": "^3.2.0",
|
|
61
|
-
"moment": "2.24.0",
|
|
62
|
-
"ncp": "^2.0.0",
|
|
63
|
-
"rimraf": "^2.5.0",
|
|
64
|
-
"sale-client": "3.4.14",
|
|
65
|
-
"selenium-server": "2.52.0",
|
|
66
|
-
"sinon": "^2.1.0",
|
|
67
|
-
"sinon-chai": "^2.8.0",
|
|
68
|
-
"style": "0.0.3",
|
|
69
|
-
"style-loader": "^0.20.3",
|
|
70
|
-
"swiper": "^5.4.5",
|
|
71
|
-
"system-clients": "3.2.61",
|
|
72
|
-
"url-loader": "^0.5.7",
|
|
73
|
-
"vue-amap": "0.5.10",
|
|
74
|
-
"vue-client": "1.24.
|
|
75
|
-
"vue-hot-reload-api": "^1.2.0",
|
|
76
|
-
"vue-html-loader": "^1.0.0",
|
|
77
|
-
"vue-loader": "8.2.1",
|
|
78
|
-
"vue-resource": "^1.5.0",
|
|
79
|
-
"vue-router": "^0.7.13",
|
|
80
|
-
"vue-strap": "^1.0.9",
|
|
81
|
-
"vue-style-loader": "^1.0.0",
|
|
82
|
-
"vue-validator": "2.1.7",
|
|
83
|
-
"webpack": "1.12.2",
|
|
84
|
-
"webpack-dev-middleware": "^1.4.0",
|
|
85
|
-
"webpack-hot-middleware": "^2.6.0",
|
|
86
|
-
"webpack-merge": "^0.8.3",
|
|
87
|
-
"webpack-parallel-uglify-plugin": "^1.0.0"
|
|
88
|
-
},
|
|
89
|
-
"scripts": {
|
|
90
|
-
"unit": "karma start test/unit/karma.conf.js --single-run",
|
|
91
|
-
"example": "node build/example-server.js",
|
|
92
|
-
"dev": "node build/dev-server.js",
|
|
93
|
-
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
94
|
-
"oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
|
|
95
|
-
"build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
96
|
-
"buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
97
|
-
"buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
98
|
-
"buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
99
|
-
"e2e": "node test/e2e/runner.js",
|
|
100
|
-
"release": "bash build/release.sh"
|
|
101
|
-
},
|
|
102
|
-
"repository": {
|
|
103
|
-
"type": "git",
|
|
104
|
-
"url": "https://gitee.com/aote/management_modules.git"
|
|
105
|
-
},
|
|
106
|
-
"keywords": [
|
|
107
|
-
"manage"
|
|
108
|
-
],
|
|
109
|
-
"author": "liuxudong",
|
|
110
|
-
"license": "ISC"
|
|
111
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "manage-client",
|
|
3
|
+
"version": "3.3.78-lx",
|
|
4
|
+
"description": "经营管控模块前台组件",
|
|
5
|
+
"main": "src/index.js",
|
|
6
|
+
"directories": {
|
|
7
|
+
"test": "test"
|
|
8
|
+
},
|
|
9
|
+
"dependencies": {
|
|
10
|
+
"crypto-js": "^4.1.1",
|
|
11
|
+
"swiper": "^5.4.5"
|
|
12
|
+
},
|
|
13
|
+
"devDependencies": {
|
|
14
|
+
"axios": "0.15.3",
|
|
15
|
+
"babel-core": "^6.0.0",
|
|
16
|
+
"babel-loader": "^6.0.0",
|
|
17
|
+
"babel-plugin-transform-runtime": "^6.0.0",
|
|
18
|
+
"babel-preset-es2015": "^6.0.0",
|
|
19
|
+
"babel-preset-stage-2": "^6.0.0",
|
|
20
|
+
"chai": "^3.5.0",
|
|
21
|
+
"co": "^4.6.0",
|
|
22
|
+
"connect-history-api-fallback": "^1.1.0",
|
|
23
|
+
"cross-env": "^1.0.7",
|
|
24
|
+
"cross-spawn": "^2.1.5",
|
|
25
|
+
"css-loader": "^0.23.0",
|
|
26
|
+
"echarts": "^4.1.0",
|
|
27
|
+
"eslint": "^2.0.0",
|
|
28
|
+
"eslint-config-standard": "^5.1.0",
|
|
29
|
+
"eslint-friendly-formatter": "^1.2.2",
|
|
30
|
+
"eslint-loader": "^1.3.0",
|
|
31
|
+
"eslint-plugin-html": "^1.3.0",
|
|
32
|
+
"eslint-plugin-promise": "^1.0.8",
|
|
33
|
+
"eslint-plugin-standard": "^1.3.2",
|
|
34
|
+
"eslint-plugin-vue": "^0.1.1",
|
|
35
|
+
"eventsource-polyfill": "^0.9.6",
|
|
36
|
+
"express": "^4.13.3",
|
|
37
|
+
"extract-text-webpack-plugin": "^1.0.1",
|
|
38
|
+
"filemanager-webpack-plugin": "^2.0.5",
|
|
39
|
+
"file-loader": "^0.8.4",
|
|
40
|
+
"function-bind": "^1.0.2",
|
|
41
|
+
"html-webpack-plugin": "^2.8.1",
|
|
42
|
+
"http-proxy-middleware": "^0.11.0",
|
|
43
|
+
"inject-loader": "^2.0.1",
|
|
44
|
+
"isparta-loader": "^2.0.0",
|
|
45
|
+
"jasmine-core": "^2.4.1",
|
|
46
|
+
"jquery": "^3.3.1",
|
|
47
|
+
"jsencrypt": "3.0.0-rc.1",
|
|
48
|
+
"json-loader": "^0.5.4",
|
|
49
|
+
"karma": "^1.4.1",
|
|
50
|
+
"karma-chrome-launcher": "^2.2.0",
|
|
51
|
+
"karma-coverage": "^1.1.1",
|
|
52
|
+
"karma-mocha": "^1.3.0",
|
|
53
|
+
"karma-sinon-chai": "^1.3.1",
|
|
54
|
+
"karma-sourcemap-loader": "^0.3.7",
|
|
55
|
+
"karma-spec-reporter": "0.0.31",
|
|
56
|
+
"karma-webpack": "^2.0.2",
|
|
57
|
+
"ldap-clients": "3.0.7",
|
|
58
|
+
"less": "^2.7.3",
|
|
59
|
+
"mkdirp": "^0.5.1",
|
|
60
|
+
"mocha": "^3.2.0",
|
|
61
|
+
"moment": "2.24.0",
|
|
62
|
+
"ncp": "^2.0.0",
|
|
63
|
+
"rimraf": "^2.5.0",
|
|
64
|
+
"sale-client": "3.4.14",
|
|
65
|
+
"selenium-server": "2.52.0",
|
|
66
|
+
"sinon": "^2.1.0",
|
|
67
|
+
"sinon-chai": "^2.8.0",
|
|
68
|
+
"style": "0.0.3",
|
|
69
|
+
"style-loader": "^0.20.3",
|
|
70
|
+
"swiper": "^5.4.5",
|
|
71
|
+
"system-clients": "3.2.61",
|
|
72
|
+
"url-loader": "^0.5.7",
|
|
73
|
+
"vue-amap": "0.5.10",
|
|
74
|
+
"vue-client": "1.24.102-test",
|
|
75
|
+
"vue-hot-reload-api": "^1.2.0",
|
|
76
|
+
"vue-html-loader": "^1.0.0",
|
|
77
|
+
"vue-loader": "8.2.1",
|
|
78
|
+
"vue-resource": "^1.5.0",
|
|
79
|
+
"vue-router": "^0.7.13",
|
|
80
|
+
"vue-strap": "^1.0.9",
|
|
81
|
+
"vue-style-loader": "^1.0.0",
|
|
82
|
+
"vue-validator": "2.1.7",
|
|
83
|
+
"webpack": "1.12.2",
|
|
84
|
+
"webpack-dev-middleware": "^1.4.0",
|
|
85
|
+
"webpack-hot-middleware": "^2.6.0",
|
|
86
|
+
"webpack-merge": "^0.8.3",
|
|
87
|
+
"webpack-parallel-uglify-plugin": "^1.0.0"
|
|
88
|
+
},
|
|
89
|
+
"scripts": {
|
|
90
|
+
"unit": "karma start test/unit/karma.conf.js --single-run",
|
|
91
|
+
"example": "node build/example-server.js",
|
|
92
|
+
"dev": "node build/dev-server.js",
|
|
93
|
+
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
94
|
+
"oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
|
|
95
|
+
"build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
96
|
+
"buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
97
|
+
"buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
98
|
+
"buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
99
|
+
"e2e": "node test/e2e/runner.js",
|
|
100
|
+
"release": "bash build/release.sh"
|
|
101
|
+
},
|
|
102
|
+
"repository": {
|
|
103
|
+
"type": "git",
|
|
104
|
+
"url": "https://gitee.com/aote/management_modules.git"
|
|
105
|
+
},
|
|
106
|
+
"keywords": [
|
|
107
|
+
"manage"
|
|
108
|
+
],
|
|
109
|
+
"author": "liuxudong",
|
|
110
|
+
"license": "ISC"
|
|
111
|
+
}
|
|
@@ -928,7 +928,7 @@
|
|
|
928
928
|
isSingleUser: null,
|
|
929
929
|
other:[],
|
|
930
930
|
footer:[],
|
|
931
|
-
model: new PagedList('rs/sql/compreQuery', 20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc'`},{f_yiguabiao:0,f_weiguabiao:0}),
|
|
931
|
+
model: new PagedList('rs/sql/compreQuery', 20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc,f_userfiles_id desc'`},{f_yiguabiao:0,f_weiguabiao:0}),
|
|
932
932
|
criteriaShow: false,
|
|
933
933
|
orgCondtionStr:'',
|
|
934
934
|
residentialArea: [],
|
|
@@ -944,7 +944,7 @@
|
|
|
944
944
|
tfoot: '',
|
|
945
945
|
defaultfield: [],
|
|
946
946
|
//排序
|
|
947
|
-
orderitem: 'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc',
|
|
947
|
+
orderitem: 'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc,f_userfiles_id desc',
|
|
948
948
|
orderFields: {
|
|
949
949
|
f_operate_date: 'no'
|
|
950
950
|
},
|
|
@@ -1141,7 +1141,6 @@
|
|
|
1141
1141
|
} else {
|
|
1142
1142
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
1143
1143
|
}
|
|
1144
|
-
this.conditon2 = args.condition
|
|
1145
1144
|
console.log("查看条件",this.conditon2)
|
|
1146
1145
|
if(this.card!=''){
|
|
1147
1146
|
args.condition +=` and f_card_id='${this.card}'`
|
|
@@ -1149,6 +1148,7 @@
|
|
|
1149
1148
|
if(this.IdCardInfo!=''){
|
|
1150
1149
|
args.condition+=` and f_idnumber='${this.IdCardInfo}'`
|
|
1151
1150
|
}
|
|
1151
|
+
this.conditon2 = args.condition
|
|
1152
1152
|
this.model.search(args.condition, args.model)
|
|
1153
1153
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
|
|
1154
1154
|
this.card=''
|
|
@@ -1305,7 +1305,7 @@
|
|
|
1305
1305
|
if (rule === 'no') {
|
|
1306
1306
|
this.model.paramSource.orderitem = `'${this.orderitem}'`
|
|
1307
1307
|
} else {
|
|
1308
|
-
this.model.paramSource.orderitem = `'${field} ${rule}'`
|
|
1308
|
+
this.model.paramSource.orderitem = `'${field} ${rule},f_userfiles_id desc'`
|
|
1309
1309
|
}
|
|
1310
1310
|
|
|
1311
1311
|
this.search()
|