address-client 3.2.30 → 3.2.33
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/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/7.1/executionHistory/executionHistory.bin +0 -0
- package/.gradle/7.1/executionHistory/executionHistory.lock +0 -0
- package/.gradle/7.1/fileHashes/fileHashes.bin +0 -0
- package/.gradle/7.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +1 -1
- package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
- package/.gradle/checksums/checksums.lock +0 -0
- package/build/dev-server.js +125 -125
- package/package.json +99 -99
- package/src/components/AddAreaMsg.vue +2 -2
- package/src/components/AddStreetOrPcd.vue +2 -2
- package/src/components/AddressList.vue +18 -3
- package/src/components/BatchOrders.vue +328 -329
- package/src/filiale/dongguan/AddStreetOrPcd.vue +422 -0
- package/src/filiale/dongguan/sale.js +7 -0
- package/src/filiale/macheng/AddressList.vue +299 -48
- package/src/main.js +21 -21
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
#Wed
|
|
1
|
+
#Wed Sep 07 11:19:30 CST 2022
|
|
2
2
|
gradle.version=7.1
|
|
Binary file
|
|
Binary file
|
package/build/dev-server.js
CHANGED
|
@@ -1,125 +1,125 @@
|
|
|
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 str = 'http://
|
|
14
|
-
var proxyTable = {
|
|
15
|
-
|
|
16
|
-
'/rs/logic/getLogin': {
|
|
17
|
-
target: str2
|
|
18
|
-
},
|
|
19
|
-
'/rs/vue': {
|
|
20
|
-
target: str2
|
|
21
|
-
},
|
|
22
|
-
'/rs/user': {
|
|
23
|
-
target: str2
|
|
24
|
-
},
|
|
25
|
-
'/rs/db': {
|
|
26
|
-
target: str2
|
|
27
|
-
},
|
|
28
|
-
'/rs/search': {
|
|
29
|
-
target: str2
|
|
30
|
-
},
|
|
31
|
-
'/rs/data': {
|
|
32
|
-
target: str2
|
|
33
|
-
},
|
|
34
|
-
'/rs/logic/getInitData': {
|
|
35
|
-
target: str2
|
|
36
|
-
},
|
|
37
|
-
'/rs/logic/getSaleInitData': {
|
|
38
|
-
target: str2
|
|
39
|
-
},
|
|
40
|
-
'/rs': {
|
|
41
|
-
// target: 'http://192.168.50.199:8300'
|
|
42
|
-
target:
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
47
|
-
publicPath: config.output.publicPath,
|
|
48
|
-
stats: {
|
|
49
|
-
colors: true,
|
|
50
|
-
chunks: false
|
|
51
|
-
}
|
|
52
|
-
})
|
|
53
|
-
|
|
54
|
-
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
55
|
-
// force page reload when html-webpack-plugin template changes
|
|
56
|
-
compiler.plugin('compilation', function (compilation) {
|
|
57
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
58
|
-
hotMiddleware.publish({ action: 'reload' })
|
|
59
|
-
cb()
|
|
60
|
-
})
|
|
61
|
-
})
|
|
62
|
-
|
|
63
|
-
// proxy api requests
|
|
64
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
65
|
-
var options = proxyTable[context]
|
|
66
|
-
if (typeof options === 'string') {
|
|
67
|
-
options = { target: options }
|
|
68
|
-
}
|
|
69
|
-
app.use(proxyMiddleware(context, options))
|
|
70
|
-
})
|
|
71
|
-
|
|
72
|
-
// handle fallback for HTML5 history API
|
|
73
|
-
app.use(require('connect-history-api-fallback')())
|
|
74
|
-
|
|
75
|
-
// serve webpack bundle output
|
|
76
|
-
app.use(devMiddleware)
|
|
77
|
-
|
|
78
|
-
// enable hot-reload and state-preserving
|
|
79
|
-
// compilation error display
|
|
80
|
-
app.use(hotMiddleware)
|
|
81
|
-
|
|
82
|
-
// serve pure static assets
|
|
83
|
-
app.use('/static', express.static('./static'))
|
|
84
|
-
|
|
85
|
-
// app.all('/rs/*', function (req, res) {
|
|
86
|
-
// proxy.web(req, res, {
|
|
87
|
-
// target: 'http://127.0.0.1:8081/reports'
|
|
88
|
-
// })
|
|
89
|
-
// })
|
|
90
|
-
|
|
91
|
-
// app.all('/rs/*', function (req, res) {
|
|
92
|
-
// proxy.web(req, res, {
|
|
93
|
-
// target: 'http://127.0.0.1:8081/ldap'
|
|
94
|
-
// })
|
|
95
|
-
// })
|
|
96
|
-
// app.all('/excel/*', function (req, res) {
|
|
97
|
-
// proxy.web(req, res, {
|
|
98
|
-
// target: 'http://127.0.0.1:8081/charge'
|
|
99
|
-
// })
|
|
100
|
-
// })
|
|
101
|
-
|
|
102
|
-
// app.all('/rs/*', function (req, res) {
|
|
103
|
-
// proxy.web(req, res, {
|
|
104
|
-
// target: 'http://127.0.0.1:82/charge'
|
|
105
|
-
// })
|
|
106
|
-
// })
|
|
107
|
-
|
|
108
|
-
// app.all('/*', function (req, res) {
|
|
109
|
-
// proxy.web(req, res, {
|
|
110
|
-
// target: 'http://127.0.0.1:82'
|
|
111
|
-
// })
|
|
112
|
-
// })
|
|
113
|
-
// app.all('/rs/user', function (req, res) {
|
|
114
|
-
// proxy.web(req, res, {
|
|
115
|
-
// target: 'http://127.0.0.1:82'
|
|
116
|
-
// })
|
|
117
|
-
// })
|
|
118
|
-
|
|
119
|
-
module.exports = app.listen(8085, function (err) {
|
|
120
|
-
if (err) {
|
|
121
|
-
console.log(err)
|
|
122
|
-
return
|
|
123
|
-
}
|
|
124
|
-
console.log('Listening at http://localhost:8085')
|
|
125
|
-
})
|
|
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 str = 'http://39.108.82.124:8400', str2= 'http://39.108.82.124:8400'
|
|
14
|
+
var proxyTable = {
|
|
15
|
+
|
|
16
|
+
'/rs/logic/getLogin': {
|
|
17
|
+
target: str2
|
|
18
|
+
},
|
|
19
|
+
'/rs/vue': {
|
|
20
|
+
target: str2
|
|
21
|
+
},
|
|
22
|
+
'/rs/user': {
|
|
23
|
+
target: str2
|
|
24
|
+
},
|
|
25
|
+
'/rs/db': {
|
|
26
|
+
target: str2
|
|
27
|
+
},
|
|
28
|
+
'/rs/search': {
|
|
29
|
+
target: str2
|
|
30
|
+
},
|
|
31
|
+
'/rs/data': {
|
|
32
|
+
target: str2
|
|
33
|
+
},
|
|
34
|
+
'/rs/logic/getInitData': {
|
|
35
|
+
target: str2
|
|
36
|
+
},
|
|
37
|
+
'/rs/logic/getSaleInitData': {
|
|
38
|
+
target: str2
|
|
39
|
+
},
|
|
40
|
+
'/rs': {
|
|
41
|
+
// target: 'http://192.168.50.199:8300'
|
|
42
|
+
target: str
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
47
|
+
publicPath: config.output.publicPath,
|
|
48
|
+
stats: {
|
|
49
|
+
colors: true,
|
|
50
|
+
chunks: false
|
|
51
|
+
}
|
|
52
|
+
})
|
|
53
|
+
|
|
54
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
55
|
+
// force page reload when html-webpack-plugin template changes
|
|
56
|
+
compiler.plugin('compilation', function (compilation) {
|
|
57
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
58
|
+
hotMiddleware.publish({ action: 'reload' })
|
|
59
|
+
cb()
|
|
60
|
+
})
|
|
61
|
+
})
|
|
62
|
+
|
|
63
|
+
// proxy api requests
|
|
64
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
65
|
+
var options = proxyTable[context]
|
|
66
|
+
if (typeof options === 'string') {
|
|
67
|
+
options = { target: options }
|
|
68
|
+
}
|
|
69
|
+
app.use(proxyMiddleware(context, options))
|
|
70
|
+
})
|
|
71
|
+
|
|
72
|
+
// handle fallback for HTML5 history API
|
|
73
|
+
app.use(require('connect-history-api-fallback')())
|
|
74
|
+
|
|
75
|
+
// serve webpack bundle output
|
|
76
|
+
app.use(devMiddleware)
|
|
77
|
+
|
|
78
|
+
// enable hot-reload and state-preserving
|
|
79
|
+
// compilation error display
|
|
80
|
+
app.use(hotMiddleware)
|
|
81
|
+
|
|
82
|
+
// serve pure static assets
|
|
83
|
+
app.use('/static', express.static('./static'))
|
|
84
|
+
|
|
85
|
+
// app.all('/rs/*', function (req, res) {
|
|
86
|
+
// proxy.web(req, res, {
|
|
87
|
+
// target: 'http://127.0.0.1:8081/reports'
|
|
88
|
+
// })
|
|
89
|
+
// })
|
|
90
|
+
|
|
91
|
+
// app.all('/rs/*', function (req, res) {
|
|
92
|
+
// proxy.web(req, res, {
|
|
93
|
+
// target: 'http://127.0.0.1:8081/ldap'
|
|
94
|
+
// })
|
|
95
|
+
// })
|
|
96
|
+
// app.all('/excel/*', function (req, res) {
|
|
97
|
+
// proxy.web(req, res, {
|
|
98
|
+
// target: 'http://127.0.0.1:8081/charge'
|
|
99
|
+
// })
|
|
100
|
+
// })
|
|
101
|
+
|
|
102
|
+
// app.all('/rs/*', function (req, res) {
|
|
103
|
+
// proxy.web(req, res, {
|
|
104
|
+
// target: 'http://127.0.0.1:82/charge'
|
|
105
|
+
// })
|
|
106
|
+
// })
|
|
107
|
+
|
|
108
|
+
// app.all('/*', function (req, res) {
|
|
109
|
+
// proxy.web(req, res, {
|
|
110
|
+
// target: 'http://127.0.0.1:82'
|
|
111
|
+
// })
|
|
112
|
+
// })
|
|
113
|
+
// app.all('/rs/user', function (req, res) {
|
|
114
|
+
// proxy.web(req, res, {
|
|
115
|
+
// target: 'http://127.0.0.1:82'
|
|
116
|
+
// })
|
|
117
|
+
// })
|
|
118
|
+
|
|
119
|
+
module.exports = app.listen(8085, function (err) {
|
|
120
|
+
if (err) {
|
|
121
|
+
console.log(err)
|
|
122
|
+
return
|
|
123
|
+
}
|
|
124
|
+
console.log('Listening at http://localhost:8085')
|
|
125
|
+
})
|
package/package.json
CHANGED
|
@@ -1,99 +1,99 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "address-client",
|
|
3
|
-
"version": "3.2.
|
|
4
|
-
"description": "地址管理前台组件",
|
|
5
|
-
"author": "wanbochao",
|
|
6
|
-
"license": "ISC",
|
|
7
|
-
"main": "src/index.js",
|
|
8
|
-
"keywords": [
|
|
9
|
-
"sale"
|
|
10
|
-
],
|
|
11
|
-
"scripts": {
|
|
12
|
-
"unit": "karma start test/unit/karma.conf.js",
|
|
13
|
-
"example": "node build/example-server.js",
|
|
14
|
-
"dev": "node build/dev-server.js",
|
|
15
|
-
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
16
|
-
"build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
17
|
-
"e2e": "node test/e2e/runner.js",
|
|
18
|
-
"make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
|
|
19
|
-
"release": "bash build/release.sh"
|
|
20
|
-
},
|
|
21
|
-
"repository": {
|
|
22
|
-
"type": "git",
|
|
23
|
-
"url": "https://gitee.com/aote/address_management.git"
|
|
24
|
-
},
|
|
25
|
-
"dependencies": {
|
|
26
|
-
"less-loader": "^2.2.3",
|
|
27
|
-
"vue": "^1.0.17"
|
|
28
|
-
},
|
|
29
|
-
"devDependencies": {
|
|
30
|
-
"babel-core": "^6.0.0",
|
|
31
|
-
"babel-loader": "^6.0.0",
|
|
32
|
-
"babel-plugin-transform-runtime": "^6.0.0",
|
|
33
|
-
"babel-preset-es2015": "^6.0.0",
|
|
34
|
-
"babel-preset-stage-2": "^6.0.0",
|
|
35
|
-
"chai": "^3.5.0",
|
|
36
|
-
"co": "^4.6.0",
|
|
37
|
-
"connect-history-api-fallback": "^1.1.0",
|
|
38
|
-
"cross-env": "^1.0.7",
|
|
39
|
-
"cross-spawn": "^2.1.5",
|
|
40
|
-
"css-loader": "^0.23.0",
|
|
41
|
-
"echarts": "^4.1.0",
|
|
42
|
-
"eslint": "^2.0.0",
|
|
43
|
-
"eslint-config-standard": "^5.1.0",
|
|
44
|
-
"eslint-friendly-formatter": "^1.2.2",
|
|
45
|
-
"eslint-loader": "^1.3.0",
|
|
46
|
-
"eslint-plugin-html": "^1.3.0",
|
|
47
|
-
"eslint-plugin-promise": "^1.0.8",
|
|
48
|
-
"eslint-plugin-standard": "^1.3.2",
|
|
49
|
-
"eslint-plugin-vue": "^0.1.1",
|
|
50
|
-
"eventsource-polyfill": "^0.9.6",
|
|
51
|
-
"express": "^4.13.3",
|
|
52
|
-
"extract-text-webpack-plugin": "^1.0.1",
|
|
53
|
-
"file-loader": "^0.8.4",
|
|
54
|
-
"function-bind": "^1.0.2",
|
|
55
|
-
"html-webpack-plugin": "^2.8.1",
|
|
56
|
-
"http-proxy-middleware": "^0.11.0",
|
|
57
|
-
"inject-loader": "^2.0.1",
|
|
58
|
-
"isparta-loader": "^2.0.0",
|
|
59
|
-
"jasmine-core": "^2.4.1",
|
|
60
|
-
"jquery": "^3.3.1",
|
|
61
|
-
"json-loader": "^0.5.4",
|
|
62
|
-
"karma": "^1.4.1",
|
|
63
|
-
"karma-chrome-launcher": "^2.2.0",
|
|
64
|
-
"karma-coverage": "^1.1.1",
|
|
65
|
-
"karma-mocha": "^1.3.0",
|
|
66
|
-
"karma-sinon-chai": "^1.3.1",
|
|
67
|
-
"karma-sourcemap-loader": "^0.3.7",
|
|
68
|
-
"karma-spec-reporter": "0.0.31",
|
|
69
|
-
"karma-webpack": "^2.0.2",
|
|
70
|
-
"less": "^2.7.3",
|
|
71
|
-
"mkdirp": "^0.5.1",
|
|
72
|
-
"mocha": "^3.2.0",
|
|
73
|
-
"ncp": "^2.0.0",
|
|
74
|
-
"rimraf": "^2.5.0",
|
|
75
|
-
"sale-client": "3.2.11-17",
|
|
76
|
-
"selenium-server": "2.52.0",
|
|
77
|
-
"sinon": "^2.1.0",
|
|
78
|
-
"sinon-chai": "^2.8.0",
|
|
79
|
-
"style": "0.0.3",
|
|
80
|
-
"style-loader": "^0.20.3",
|
|
81
|
-
"system-clients": "3.1.88-5",
|
|
82
|
-
"url-loader": "^0.5.7",
|
|
83
|
-
"vue-client": "1.24.27",
|
|
84
|
-
"vue-hot-reload-api": "^1.2.0",
|
|
85
|
-
"vue-html-loader": "^1.0.0",
|
|
86
|
-
"vue-loader": "^8.2.1",
|
|
87
|
-
"vue-resource": "^1.5.0",
|
|
88
|
-
"vue-router": "^0.7.13",
|
|
89
|
-
"vue-strap": "^1.0.9",
|
|
90
|
-
"vue-style-loader": "^1.0.0",
|
|
91
|
-
"vue-validator": "2.1.7",
|
|
92
|
-
"webpack": "^1.12.2",
|
|
93
|
-
"webpack-dev-middleware": "^1.4.0",
|
|
94
|
-
"webpack-hot-middleware": "^2.6.0",
|
|
95
|
-
"webpack-merge": "^0.8.3",
|
|
96
|
-
"jsencrypt": "3.0.0-rc.1",
|
|
97
|
-
"axios": "0.15.3"
|
|
98
|
-
}
|
|
99
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "address-client",
|
|
3
|
+
"version": "3.2.33",
|
|
4
|
+
"description": "地址管理前台组件",
|
|
5
|
+
"author": "wanbochao",
|
|
6
|
+
"license": "ISC",
|
|
7
|
+
"main": "src/index.js",
|
|
8
|
+
"keywords": [
|
|
9
|
+
"sale"
|
|
10
|
+
],
|
|
11
|
+
"scripts": {
|
|
12
|
+
"unit": "karma start test/unit/karma.conf.js",
|
|
13
|
+
"example": "node build/example-server.js",
|
|
14
|
+
"dev": "node build/dev-server.js",
|
|
15
|
+
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
16
|
+
"build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
|
|
17
|
+
"e2e": "node test/e2e/runner.js",
|
|
18
|
+
"make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
|
|
19
|
+
"release": "bash build/release.sh"
|
|
20
|
+
},
|
|
21
|
+
"repository": {
|
|
22
|
+
"type": "git",
|
|
23
|
+
"url": "https://gitee.com/aote/address_management.git"
|
|
24
|
+
},
|
|
25
|
+
"dependencies": {
|
|
26
|
+
"less-loader": "^2.2.3",
|
|
27
|
+
"vue": "^1.0.17"
|
|
28
|
+
},
|
|
29
|
+
"devDependencies": {
|
|
30
|
+
"babel-core": "^6.0.0",
|
|
31
|
+
"babel-loader": "^6.0.0",
|
|
32
|
+
"babel-plugin-transform-runtime": "^6.0.0",
|
|
33
|
+
"babel-preset-es2015": "^6.0.0",
|
|
34
|
+
"babel-preset-stage-2": "^6.0.0",
|
|
35
|
+
"chai": "^3.5.0",
|
|
36
|
+
"co": "^4.6.0",
|
|
37
|
+
"connect-history-api-fallback": "^1.1.0",
|
|
38
|
+
"cross-env": "^1.0.7",
|
|
39
|
+
"cross-spawn": "^2.1.5",
|
|
40
|
+
"css-loader": "^0.23.0",
|
|
41
|
+
"echarts": "^4.1.0",
|
|
42
|
+
"eslint": "^2.0.0",
|
|
43
|
+
"eslint-config-standard": "^5.1.0",
|
|
44
|
+
"eslint-friendly-formatter": "^1.2.2",
|
|
45
|
+
"eslint-loader": "^1.3.0",
|
|
46
|
+
"eslint-plugin-html": "^1.3.0",
|
|
47
|
+
"eslint-plugin-promise": "^1.0.8",
|
|
48
|
+
"eslint-plugin-standard": "^1.3.2",
|
|
49
|
+
"eslint-plugin-vue": "^0.1.1",
|
|
50
|
+
"eventsource-polyfill": "^0.9.6",
|
|
51
|
+
"express": "^4.13.3",
|
|
52
|
+
"extract-text-webpack-plugin": "^1.0.1",
|
|
53
|
+
"file-loader": "^0.8.4",
|
|
54
|
+
"function-bind": "^1.0.2",
|
|
55
|
+
"html-webpack-plugin": "^2.8.1",
|
|
56
|
+
"http-proxy-middleware": "^0.11.0",
|
|
57
|
+
"inject-loader": "^2.0.1",
|
|
58
|
+
"isparta-loader": "^2.0.0",
|
|
59
|
+
"jasmine-core": "^2.4.1",
|
|
60
|
+
"jquery": "^3.3.1",
|
|
61
|
+
"json-loader": "^0.5.4",
|
|
62
|
+
"karma": "^1.4.1",
|
|
63
|
+
"karma-chrome-launcher": "^2.2.0",
|
|
64
|
+
"karma-coverage": "^1.1.1",
|
|
65
|
+
"karma-mocha": "^1.3.0",
|
|
66
|
+
"karma-sinon-chai": "^1.3.1",
|
|
67
|
+
"karma-sourcemap-loader": "^0.3.7",
|
|
68
|
+
"karma-spec-reporter": "0.0.31",
|
|
69
|
+
"karma-webpack": "^2.0.2",
|
|
70
|
+
"less": "^2.7.3",
|
|
71
|
+
"mkdirp": "^0.5.1",
|
|
72
|
+
"mocha": "^3.2.0",
|
|
73
|
+
"ncp": "^2.0.0",
|
|
74
|
+
"rimraf": "^2.5.0",
|
|
75
|
+
"sale-client": "3.2.11-17",
|
|
76
|
+
"selenium-server": "2.52.0",
|
|
77
|
+
"sinon": "^2.1.0",
|
|
78
|
+
"sinon-chai": "^2.8.0",
|
|
79
|
+
"style": "0.0.3",
|
|
80
|
+
"style-loader": "^0.20.3",
|
|
81
|
+
"system-clients": "3.1.88-5",
|
|
82
|
+
"url-loader": "^0.5.7",
|
|
83
|
+
"vue-client": "1.24.27",
|
|
84
|
+
"vue-hot-reload-api": "^1.2.0",
|
|
85
|
+
"vue-html-loader": "^1.0.0",
|
|
86
|
+
"vue-loader": "^8.2.1",
|
|
87
|
+
"vue-resource": "^1.5.0",
|
|
88
|
+
"vue-router": "^0.7.13",
|
|
89
|
+
"vue-strap": "^1.0.9",
|
|
90
|
+
"vue-style-loader": "^1.0.0",
|
|
91
|
+
"vue-validator": "2.1.7",
|
|
92
|
+
"webpack": "^1.12.2",
|
|
93
|
+
"webpack-dev-middleware": "^1.4.0",
|
|
94
|
+
"webpack-hot-middleware": "^2.6.0",
|
|
95
|
+
"webpack-merge": "^0.8.3",
|
|
96
|
+
"jsencrypt": "3.0.0-rc.1",
|
|
97
|
+
"axios": "0.15.3"
|
|
98
|
+
}
|
|
99
|
+
}
|
|
@@ -576,7 +576,7 @@
|
|
|
576
576
|
this.buildingmodel.f_orgname = this.$login.f.orgs
|
|
577
577
|
this.buildingmodel.f_depid = this.$login.f.depids
|
|
578
578
|
this.buildingmodel.f_depname = this.$login.f.deps
|
|
579
|
-
await this.$resetpost('rs/logic/address_savebuilding', this.buildingmodel)
|
|
579
|
+
await this.$resetpost('rs/logic/address_savebuilding', this.buildingmodel,{resolveMsg: null,rejectMsg: null})
|
|
580
580
|
this.$refs.buildinglist.search()
|
|
581
581
|
},
|
|
582
582
|
//保存小区
|
|
@@ -600,7 +600,7 @@
|
|
|
600
600
|
this.areamodel.f_pcd=this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd
|
|
601
601
|
this.areamodel.f_street=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
|
|
602
602
|
|
|
603
|
-
await this.$resetpost('rs/logic/address_updatearea', this.areamodel)
|
|
603
|
+
await this.$resetpost('rs/logic/address_updatearea', this.areamodel,{resolveMsg: null,rejectMsg: null})
|
|
604
604
|
},
|
|
605
605
|
cleardara(){
|
|
606
606
|
this.areamodel= {
|
|
@@ -262,7 +262,7 @@
|
|
|
262
262
|
this.pcdmodel.f_depid = this.$login.f.depids
|
|
263
263
|
this.pcdmodel.f_depname = this.$login.f.deps
|
|
264
264
|
this.pcdmodel.f_pcd = this.pcdmodel.f_province+this.pcdmodel.f_city+this.pcdmodel.f_district
|
|
265
|
-
await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
|
|
265
|
+
await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel,{resolveMsg: null,rejectMsg: null})
|
|
266
266
|
},
|
|
267
267
|
//保存街道
|
|
268
268
|
async savestreet(){
|
|
@@ -275,7 +275,7 @@
|
|
|
275
275
|
this.streetmodel.f_depname = this.$login.f.deps
|
|
276
276
|
this.streetmodel.f_pcd=this.findbyid(this.pcdslist,this.streetmodel.f_pcd_id).f_pcd
|
|
277
277
|
console.log('获取街道model', this.streetmodel)
|
|
278
|
-
await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel)
|
|
278
|
+
await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel,{resolveMsg: null,rejectMsg: null})
|
|
279
279
|
},
|
|
280
280
|
cancel(){
|
|
281
281
|
this.cleardara()
|
|
@@ -183,14 +183,16 @@
|
|
|
183
183
|
</criteria-paged>
|
|
184
184
|
</div>
|
|
185
185
|
<work-busy :is-busy='isbusy'></work-busy>
|
|
186
|
-
<modal :show.sync="showFile" width="
|
|
186
|
+
<modal :show.sync="showFile" width="600px" v-ref:modal backdrop="true">
|
|
187
187
|
<header slot="modal-header" class="modal-header">
|
|
188
188
|
<button type="button" class="close" @click="closeFile"><span>×</span></button>
|
|
189
189
|
<h4 class="modal-title">选择文件</h4>
|
|
190
190
|
</header>
|
|
191
191
|
<article slot="modal-body" class="modal-body">
|
|
192
192
|
<div class="form-group">
|
|
193
|
-
<file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
|
|
193
|
+
<file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
|
|
194
|
+
<button class="button_clear btn-gn" style="margin-top: 10px;background-color: #6aa6e2;" @click="downloadFiles()">模板下载
|
|
195
|
+
</button>
|
|
194
196
|
</div>
|
|
195
197
|
</article>
|
|
196
198
|
<footer slot="modal-footer" class="modal-footer" style="display: none"></footer>
|
|
@@ -327,6 +329,19 @@
|
|
|
327
329
|
//this.$refs.paged.$refs.grid.selectInit()
|
|
328
330
|
},
|
|
329
331
|
methods: {
|
|
332
|
+
downloadFiles(){
|
|
333
|
+
let downurl='rs/downloadfile/file?filename=地址导入Excel模板';
|
|
334
|
+
this.$resetget(downurl,{}).then(res=>{
|
|
335
|
+
var link = document.createElement('a');
|
|
336
|
+
link.target="_blank"
|
|
337
|
+
link.href =downurl ;
|
|
338
|
+
link.setAttribute("download", "地址导入Excel模板.xlsx"); //指定下载后的文件名，防跳转
|
|
339
|
+
document.body.appendChild(link);
|
|
340
|
+
link.click();
|
|
341
|
+
})
|
|
342
|
+
|
|
343
|
+
|
|
344
|
+
},
|
|
330
345
|
getotherfooter() {
|
|
331
346
|
// this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
|
|
332
347
|
// this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
|
|
@@ -441,7 +456,7 @@
|
|
|
441
456
|
f_depname: this.$login.f.deps,
|
|
442
457
|
f_filialeid: this.f_filialeids
|
|
443
458
|
}
|
|
444
|
-
this.$resetpost('rs/logic/modifyBatch',modifyBatchData)
|
|
459
|
+
this.$resetpost('rs/logic/modifyBatch',modifyBatchData,{resolveMsg: null,rejectMsg: null})
|
|
445
460
|
this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
|
|
446
461
|
this.showModify = false
|
|
447
462
|
this.$refs.paged.$refs.grid.selectInit()
|