address-client 3.2.28 → 3.2.31
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 +125 -125
- package/package.json +1 -1
- package/src/components/AddressList.vue +3 -1
- package/src/components/AddressModel.vue +95 -95
- package/src/components/AreaList.vue +435 -435
- package/src/components/CityManage.vue +76 -76
- package/src/filiale/dongguan/AddStreetOrPcd.vue +422 -0
- package/src/filiale/dongguan/sale.js +7 -0
- package/src/filiale/macheng/AddressList.vue +355 -48
- package/src/filiale/macheng/AreaList.vue +318 -279
- package/src/filiale/shanggao/AddAreaMsg.vue +752 -752
- package/src/filiale/shanggao/AddressList.vue +613 -613
- package/src/filiale/shanggao/AreaList.vue +436 -436
- package/src/filiale/shanggao/sale.js +16 -16
- package/src/filiale/zhongyi/AddAreaMsg.vue +757 -757
- package/src/filiale/zhongyi/sale.js +12 -12
- package/src/main.js +1 -1
- package/.gradle/4.4/fileChanges/last-build.bin +0 -0
- package/.gradle/4.4/fileHashes/fileHashes.bin +0 -0
- package/.gradle/4.4/fileHashes/fileHashes.lock +0 -0
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://127.0.0.1:
|
|
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
|
-
})
|
|
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://127.0.0.1:8090', str2= 'http://192.168.50.4: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
|
@@ -127,7 +127,7 @@
|
|
|
127
127
|
<v-select :value.sync="model.f_state"
|
|
128
128
|
class="select_list select"
|
|
129
129
|
v-model="model.f_state"
|
|
130
|
-
condition="a.f_state {}"
|
|
130
|
+
condition="(a.f_state {} )"
|
|
131
131
|
:options='$parent.$parent.getstate' placeholder='地址状态'
|
|
132
132
|
close-on-select>
|
|
133
133
|
</v-select>
|
|
@@ -151,6 +151,7 @@
|
|
|
151
151
|
<th><nobr>地址状态</nobr></th>
|
|
152
152
|
<th><nobr>状态</nobr></th>
|
|
153
153
|
<th><nobr>时间</nobr></th>
|
|
154
|
+
<th><nobr>备注</nobr></th>
|
|
154
155
|
<th><nobr>操作</nobr></th>
|
|
155
156
|
</template>
|
|
156
157
|
<template partial='body'>
|
|
@@ -168,6 +169,7 @@
|
|
|
168
169
|
<td style="text-align:center"><nobr>{{row.f_address_state}}</nobr></td>
|
|
169
170
|
<td style="text-align:center"><nobr>{{row.f_state ==='作废'?'作废':'有效'}}</nobr></td>
|
|
170
171
|
<td style="text-align:center"><nobr>{{row.f_create_date}}</nobr></td>
|
|
172
|
+
<td style="text-align:center"><nobr>{{row.f_comments}}</nobr></td>
|
|
171
173
|
<td style="text-align:center">
|
|
172
174
|
<!-- <button type="button" name="button" class="btn btn-link"
|
|
173
175
|
@click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
|
|
@@ -1,95 +1,95 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<modal :show.sync="isshow" :width='width' v-ref:modal backdrop="false">
|
|
3
|
-
<header slot="modal-header" class="modal-header">
|
|
4
|
-
<button type="button" class="close" @click="closeTree"><span>×</span></button>
|
|
5
|
-
<h4 class="modal-title">地址管理</h4>
|
|
6
|
-
</header>
|
|
7
|
-
<article slot="modal-body" class="modal-body">
|
|
8
|
-
<div class="from-group" style="height: 450px;overflow: auto;">
|
|
9
|
-
<address-tree :f_location="f_location" :isquery="isquery" :isinspect="true" :isbasch="isbasch" v-ref:addresstree></address-tree>
|
|
10
|
-
<!--<address-select v-if="isselect" :f_location="f_location" v-ref:addressSelect :show="showType" :value="value" @re-ref="selectclick"></address-select>-->
|
|
11
|
-
</div>
|
|
12
|
-
</article>
|
|
13
|
-
<footer slot="modal-footer">
|
|
14
|
-
<button type="button" class="btn btn-success" @click='confirm'>确认</button>
|
|
15
|
-
</footer>
|
|
16
|
-
</modal>
|
|
17
|
-
</template>
|
|
18
|
-
|
|
19
|
-
<script>
|
|
20
|
-
export default {
|
|
21
|
-
name: "AddressModel",
|
|
22
|
-
title: '地址管理弹窗',
|
|
23
|
-
props: {
|
|
24
|
-
// 地址查询方式
|
|
25
|
-
isquery: {
|
|
26
|
-
type: Boolean,
|
|
27
|
-
default: true,
|
|
28
|
-
},
|
|
29
|
-
//位置信息
|
|
30
|
-
f_location: {
|
|
31
|
-
type: Object,
|
|
32
|
-
default: {
|
|
33
|
-
f_locationId: '1535',
|
|
34
|
-
f_locationType: 't_organization',
|
|
35
|
-
}
|
|
36
|
-
},
|
|
37
|
-
//是否显示
|
|
38
|
-
isshow: {
|
|
39
|
-
type: Boolean,
|
|
40
|
-
default : false,
|
|
41
|
-
},
|
|
42
|
-
// 是否选中
|
|
43
|
-
isselect: {
|
|
44
|
-
type: Boolean,
|
|
45
|
-
default: false,
|
|
46
|
-
},
|
|
47
|
-
// 默认显示地址
|
|
48
|
-
value:{
|
|
49
|
-
type: Object
|
|
50
|
-
},
|
|
51
|
-
// 下拉选择 || 树选择
|
|
52
|
-
showType: {
|
|
53
|
-
type: Boolean,
|
|
54
|
-
default: false
|
|
55
|
-
},
|
|
56
|
-
// 是否显示批量添加
|
|
57
|
-
isbasch: {
|
|
58
|
-
type: Boolean,
|
|
59
|
-
default: true,
|
|
60
|
-
}
|
|
61
|
-
},
|
|
62
|
-
data(){
|
|
63
|
-
return{
|
|
64
|
-
width: '90%'
|
|
65
|
-
}
|
|
66
|
-
},
|
|
67
|
-
methods:{
|
|
68
|
-
confirm(){
|
|
69
|
-
this.$emit('addressno')
|
|
70
|
-
},
|
|
71
|
-
// 关闭 弹窗
|
|
72
|
-
closeTree() {
|
|
73
|
-
this.isshow = false
|
|
74
|
-
this.$emit('addressno')
|
|
75
|
-
}
|
|
76
|
-
// 选中
|
|
77
|
-
// selectclick(newobj, address) {
|
|
78
|
-
// this.$emit('re-ref', newobj, address)
|
|
79
|
-
// }
|
|
80
|
-
},
|
|
81
|
-
watch:{
|
|
82
|
-
//显示改变且为true
|
|
83
|
-
'isshow'(val){
|
|
84
|
-
if(val){
|
|
85
|
-
//刷新数据
|
|
86
|
-
this.$refs.addresstree.init()
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
</script>
|
|
92
|
-
|
|
93
|
-
<style scoped>
|
|
94
|
-
|
|
95
|
-
</style>
|
|
1
|
+
<template>
|
|
2
|
+
<modal :show.sync="isshow" :width='width' v-ref:modal backdrop="false">
|
|
3
|
+
<header slot="modal-header" class="modal-header">
|
|
4
|
+
<button type="button" class="close" @click="closeTree"><span>×</span></button>
|
|
5
|
+
<h4 class="modal-title">地址管理</h4>
|
|
6
|
+
</header>
|
|
7
|
+
<article slot="modal-body" class="modal-body">
|
|
8
|
+
<div class="from-group" style="height: 450px;overflow: auto;">
|
|
9
|
+
<address-tree :f_location="f_location" :isquery="isquery" :isinspect="true" :isbasch="isbasch" v-ref:addresstree></address-tree>
|
|
10
|
+
<!--<address-select v-if="isselect" :f_location="f_location" v-ref:addressSelect :show="showType" :value="value" @re-ref="selectclick"></address-select>-->
|
|
11
|
+
</div>
|
|
12
|
+
</article>
|
|
13
|
+
<footer slot="modal-footer">
|
|
14
|
+
<button type="button" class="btn btn-success" @click='confirm'>确认</button>
|
|
15
|
+
</footer>
|
|
16
|
+
</modal>
|
|
17
|
+
</template>
|
|
18
|
+
|
|
19
|
+
<script>
|
|
20
|
+
export default {
|
|
21
|
+
name: "AddressModel",
|
|
22
|
+
title: '地址管理弹窗',
|
|
23
|
+
props: {
|
|
24
|
+
// 地址查询方式
|
|
25
|
+
isquery: {
|
|
26
|
+
type: Boolean,
|
|
27
|
+
default: true,
|
|
28
|
+
},
|
|
29
|
+
//位置信息
|
|
30
|
+
f_location: {
|
|
31
|
+
type: Object,
|
|
32
|
+
default: {
|
|
33
|
+
f_locationId: '1535',
|
|
34
|
+
f_locationType: 't_organization',
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
//是否显示
|
|
38
|
+
isshow: {
|
|
39
|
+
type: Boolean,
|
|
40
|
+
default : false,
|
|
41
|
+
},
|
|
42
|
+
// 是否选中
|
|
43
|
+
isselect: {
|
|
44
|
+
type: Boolean,
|
|
45
|
+
default: false,
|
|
46
|
+
},
|
|
47
|
+
// 默认显示地址
|
|
48
|
+
value:{
|
|
49
|
+
type: Object
|
|
50
|
+
},
|
|
51
|
+
// 下拉选择 || 树选择
|
|
52
|
+
showType: {
|
|
53
|
+
type: Boolean,
|
|
54
|
+
default: false
|
|
55
|
+
},
|
|
56
|
+
// 是否显示批量添加
|
|
57
|
+
isbasch: {
|
|
58
|
+
type: Boolean,
|
|
59
|
+
default: true,
|
|
60
|
+
}
|
|
61
|
+
},
|
|
62
|
+
data(){
|
|
63
|
+
return{
|
|
64
|
+
width: '90%'
|
|
65
|
+
}
|
|
66
|
+
},
|
|
67
|
+
methods:{
|
|
68
|
+
confirm(){
|
|
69
|
+
this.$emit('addressno')
|
|
70
|
+
},
|
|
71
|
+
// 关闭 弹窗
|
|
72
|
+
closeTree() {
|
|
73
|
+
this.isshow = false
|
|
74
|
+
this.$emit('addressno')
|
|
75
|
+
}
|
|
76
|
+
// 选中
|
|
77
|
+
// selectclick(newobj, address) {
|
|
78
|
+
// this.$emit('re-ref', newobj, address)
|
|
79
|
+
// }
|
|
80
|
+
},
|
|
81
|
+
watch:{
|
|
82
|
+
//显示改变且为true
|
|
83
|
+
'isshow'(val){
|
|
84
|
+
if(val){
|
|
85
|
+
//刷新数据
|
|
86
|
+
this.$refs.addresstree.init()
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
</script>
|
|
92
|
+
|
|
93
|
+
<style scoped>
|
|
94
|
+
|
|
95
|
+
</style>
|