address-client 3.2.32 → 3.2.33-1
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 +162 -125
- package/package.json +1 -1
- package/src/components/AddressList.vue +2 -2
- package/src/components/AreaList.vue +1 -1
- package/src/components/UserAddress.vue +4 -4
- package/src/filiale/dongguan/AddStreetOrPcd.vue +3 -3
- package/src/filiale/qianneng/AddressList.vue +21 -4
- package/src/filiale/qianneng/UserAddress.vue +1036 -984
- package/src/main.js +21 -21
package/build/dev-server.js
CHANGED
|
@@ -1,125 +1,162 @@
|
|
|
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 = '
|
|
14
|
-
var
|
|
15
|
-
|
|
16
|
-
'/rs/
|
|
17
|
-
target:
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
target:
|
|
21
|
-
},
|
|
22
|
-
'/
|
|
23
|
-
target:
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
target:
|
|
27
|
-
},
|
|
28
|
-
'/rs/
|
|
29
|
-
target:
|
|
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
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
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 = 'https://qnjtkf.cn:8400', str2= 'https://qnjtkf.cn:8400'
|
|
14
|
+
var str3= 'https://qnjtkf.cn:8400'
|
|
15
|
+
var proxyTable = {
|
|
16
|
+
'/rs/sql':{
|
|
17
|
+
target: str3,
|
|
18
|
+
secure:true,
|
|
19
|
+
changeOrigin:true
|
|
20
|
+
// target: 'http://127.0.0.1:8080'
|
|
21
|
+
},
|
|
22
|
+
'/webapps':{
|
|
23
|
+
target: str3,
|
|
24
|
+
secure:true,
|
|
25
|
+
changeOrigin:true
|
|
26
|
+
// target: 'http://127.0.0.1:8080'
|
|
27
|
+
},
|
|
28
|
+
'/rs/logic/getLogin': {
|
|
29
|
+
target: str3,
|
|
30
|
+
secure:true,
|
|
31
|
+
changeOrigin:true
|
|
32
|
+
},
|
|
33
|
+
'/rs/logic/getInitData': {
|
|
34
|
+
target: str3,
|
|
35
|
+
secure:true,
|
|
36
|
+
changeOrigin:true,
|
|
37
|
+
},
|
|
38
|
+
'/rs/logic/getSaleInitData': {
|
|
39
|
+
target: str3,
|
|
40
|
+
secure:true,
|
|
41
|
+
changeOrigin:true
|
|
42
|
+
},
|
|
43
|
+
'/rs/logic':{
|
|
44
|
+
target: str3,
|
|
45
|
+
secure:true,
|
|
46
|
+
changeOrigin:true
|
|
47
|
+
// target: 'http://127.0.0.1:8080'
|
|
48
|
+
},
|
|
49
|
+
'/rs/vue': {
|
|
50
|
+
target: str3,
|
|
51
|
+
secure:true,
|
|
52
|
+
changeOrigin:true
|
|
53
|
+
},
|
|
54
|
+
'/rs/user': {
|
|
55
|
+
target: str3,
|
|
56
|
+
secure:true,
|
|
57
|
+
changeOrigin:true
|
|
58
|
+
},
|
|
59
|
+
'/rs/db': {
|
|
60
|
+
target: str3,
|
|
61
|
+
secure:true,
|
|
62
|
+
changeOrigin:true
|
|
63
|
+
},
|
|
64
|
+
'/rs/search': {
|
|
65
|
+
target: str3,
|
|
66
|
+
secure:true,
|
|
67
|
+
changeOrigin:true
|
|
68
|
+
// target: 'http://127.0.0.1:8080'
|
|
69
|
+
},
|
|
70
|
+
'/rs/data': {
|
|
71
|
+
target: str3,
|
|
72
|
+
secure:true,
|
|
73
|
+
changeOrigin:true
|
|
74
|
+
},
|
|
75
|
+
'/rs': {
|
|
76
|
+
// target: 'http://192.168.50.199:8300'
|
|
77
|
+
target: str3,
|
|
78
|
+
secure:true,
|
|
79
|
+
changeOrigin:true
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
84
|
+
publicPath: config.output.publicPath,
|
|
85
|
+
stats: {
|
|
86
|
+
colors: true,
|
|
87
|
+
chunks: false
|
|
88
|
+
}
|
|
89
|
+
})
|
|
90
|
+
|
|
91
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
92
|
+
// force page reload when html-webpack-plugin template changes
|
|
93
|
+
compiler.plugin('compilation', function (compilation) {
|
|
94
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
95
|
+
hotMiddleware.publish({ action: 'reload' })
|
|
96
|
+
cb()
|
|
97
|
+
})
|
|
98
|
+
})
|
|
99
|
+
|
|
100
|
+
// proxy api requests
|
|
101
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
102
|
+
var options = proxyTable[context]
|
|
103
|
+
if (typeof options === 'string') {
|
|
104
|
+
options = { target: options }
|
|
105
|
+
}
|
|
106
|
+
app.use(proxyMiddleware(context, options))
|
|
107
|
+
})
|
|
108
|
+
|
|
109
|
+
// handle fallback for HTML5 history API
|
|
110
|
+
app.use(require('connect-history-api-fallback')())
|
|
111
|
+
|
|
112
|
+
// serve webpack bundle output
|
|
113
|
+
app.use(devMiddleware)
|
|
114
|
+
|
|
115
|
+
// enable hot-reload and state-preserving
|
|
116
|
+
// compilation error display
|
|
117
|
+
app.use(hotMiddleware)
|
|
118
|
+
|
|
119
|
+
// serve pure static assets
|
|
120
|
+
app.use('/static', express.static('./static'))
|
|
121
|
+
|
|
122
|
+
// app.all('/rs/*', function (req, res) {
|
|
123
|
+
// proxy.web(req, res, {
|
|
124
|
+
// target: 'http://127.0.0.1:8081/reports'
|
|
125
|
+
// })
|
|
126
|
+
// })
|
|
127
|
+
|
|
128
|
+
// app.all('/rs/*', function (req, res) {
|
|
129
|
+
// proxy.web(req, res, {
|
|
130
|
+
// target: 'http://127.0.0.1:8081/ldap'
|
|
131
|
+
// })
|
|
132
|
+
// })
|
|
133
|
+
// app.all('/excel/*', function (req, res) {
|
|
134
|
+
// proxy.web(req, res, {
|
|
135
|
+
// target: 'http://127.0.0.1:8081/charge'
|
|
136
|
+
// })
|
|
137
|
+
// })
|
|
138
|
+
|
|
139
|
+
// app.all('/rs/*', function (req, res) {
|
|
140
|
+
// proxy.web(req, res, {
|
|
141
|
+
// target: 'http://127.0.0.1:82/charge'
|
|
142
|
+
// })
|
|
143
|
+
// })
|
|
144
|
+
|
|
145
|
+
// app.all('/*', function (req, res) {
|
|
146
|
+
// proxy.web(req, res, {
|
|
147
|
+
// target: 'http://127.0.0.1:82'
|
|
148
|
+
// })
|
|
149
|
+
// })
|
|
150
|
+
// app.all('/rs/user', function (req, res) {
|
|
151
|
+
// proxy.web(req, res, {
|
|
152
|
+
// target: 'http://127.0.0.1:82'
|
|
153
|
+
// })
|
|
154
|
+
// })
|
|
155
|
+
|
|
156
|
+
module.exports = app.listen(8085, function (err) {
|
|
157
|
+
if (err) {
|
|
158
|
+
console.log(err)
|
|
159
|
+
return
|
|
160
|
+
}
|
|
161
|
+
console.log('Listening at http://localhost:8085')
|
|
162
|
+
})
|
package/package.json
CHANGED
|
@@ -436,11 +436,11 @@
|
|
|
436
436
|
this.userInfos = []
|
|
437
437
|
this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
|
|
438
438
|
this.userInfos[n] = {
|
|
439
|
-
|
|
439
|
+
addressid: row.id,
|
|
440
440
|
f_residential_area: row.f_residential_area,
|
|
441
441
|
f_street: row.f_street,
|
|
442
442
|
f_address: row.f_address,
|
|
443
|
-
f_address_rest:
|
|
443
|
+
f_address_rest: (row.f_building?row.f_building+row.f_building_suffix:'') + (row.f_unit?row.f_unit+row.f_unit_suffix:'') + (row.f_floor?row.f_floor+row.f_floor_suffix:'') + (row.f_room?row.f_room+row.f_room_suffix:'')
|
|
444
444
|
}
|
|
445
445
|
})
|
|
446
446
|
let modifyBatchData = {
|
|
@@ -321,7 +321,7 @@
|
|
|
321
321
|
if (this.f_filialeids) {
|
|
322
322
|
if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
|
|
323
323
|
this.showDelete = true
|
|
324
|
-
let condition = `a.f_orgid = '${this.
|
|
324
|
+
let condition = `a.f_orgid = '${this.$login.f.orgid}'`
|
|
325
325
|
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
326
326
|
data: {
|
|
327
327
|
condition: condition
|
|
@@ -431,7 +431,7 @@
|
|
|
431
431
|
this.areaslist = []
|
|
432
432
|
// this.model.f_residential_area_id = null
|
|
433
433
|
// this.model.f_residential_area = null
|
|
434
|
-
let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and a.f_orgid = '${this.
|
|
434
|
+
let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and a.f_orgid = '${this.$login.f.orgid}'`
|
|
435
435
|
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
436
436
|
data: {
|
|
437
437
|
condition: condition
|
|
@@ -466,9 +466,9 @@
|
|
|
466
466
|
this.model.f_address_state = '已通气'
|
|
467
467
|
this.initAreas(this.f_filialeids)
|
|
468
468
|
// 添加特殊地址选省市区
|
|
469
|
-
this.initpcds(` f_orgid = '${this.
|
|
470
|
-
this.initstreets(` f_orgid = '${this.
|
|
471
|
-
this.initareas(` f_orgid = '${this.
|
|
469
|
+
this.initpcds(` f_orgid = '${this.$login.f.orgid}'`)
|
|
470
|
+
this.initstreets(` f_orgid = '${this.$login.f.orgid}' `)
|
|
471
|
+
this.initareas(` f_orgid = '${this.$login.f.orgid}'`)
|
|
472
472
|
|
|
473
473
|
},
|
|
474
474
|
|
|
@@ -245,7 +245,7 @@
|
|
|
245
245
|
tablename: 'divisions_of_china',
|
|
246
246
|
condition: 'areaCode is null'
|
|
247
247
|
}
|
|
248
|
-
}).then(res => {
|
|
248
|
+
},{resolveMsg: null,rejectMsg: null}).then(res => {
|
|
249
249
|
this.provinceOptions = this.handleTree(res.data, 'code', 'parentcode')
|
|
250
250
|
})
|
|
251
251
|
},
|
|
@@ -364,7 +364,7 @@
|
|
|
364
364
|
this.pcdmodel.f_depid = this.$login.f.depids
|
|
365
365
|
this.pcdmodel.f_depname = this.$login.f.deps
|
|
366
366
|
this.pcdmodel.f_pcd = this.pcdmodel.f_province+this.pcdmodel.f_city+this.pcdmodel.f_district
|
|
367
|
-
await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel)
|
|
367
|
+
await this.$resetpost('rs/logic/address_updatepcd', this.pcdmodel,{resolveMsg: null,rejectMsg: null})
|
|
368
368
|
},
|
|
369
369
|
//保存街道
|
|
370
370
|
async savestreet(){
|
|
@@ -377,7 +377,7 @@
|
|
|
377
377
|
this.streetmodel.f_depname = this.$login.f.deps
|
|
378
378
|
this.streetmodel.f_pcd=this.findbyid(this.pcdslist,this.streetmodel.f_pcd_id).f_pcd
|
|
379
379
|
console.log('获取街道model', this.streetmodel)
|
|
380
|
-
await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel)
|
|
380
|
+
await this.$resetpost('rs/logic/address_updatestreet', this.streetmodel,{resolveMsg: null,rejectMsg: null})
|
|
381
381
|
},
|
|
382
382
|
cancel(){
|
|
383
383
|
this.cleardara()
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
</div>
|
|
35
35
|
<div class="col-sm-4 form-group button-range" >
|
|
36
36
|
<button class="button_search button_spacing" @click="search()" >查询</button>
|
|
37
|
-
<button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('民用')"
|
|
38
|
-
<button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button
|
|
37
|
+
<button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('民用')">添加地址</button>
|
|
38
|
+
<!-- <button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button>-->
|
|
39
39
|
<button class="button_new button_spacing" style="width: max-content" v-show="this.$login.r.includes('批量修改')" @click="$parent.$parent.modifyBatch()">批量修改</button>
|
|
40
40
|
<button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
|
|
41
41
|
<button class="button_export button_spacing" @click="$parent.$parent.importAddress('导入')">模板导入</button>
|
|
@@ -122,6 +122,17 @@
|
|
|
122
122
|
close-on-select>
|
|
123
123
|
</v-select>
|
|
124
124
|
</div>
|
|
125
|
+
<div :class="$parent.$parent.style">
|
|
126
|
+
<label class="font_normal_body">地区类型</label>
|
|
127
|
+
<v-select
|
|
128
|
+
class="select_list select"
|
|
129
|
+
:value.sync="model.f_iscity"
|
|
130
|
+
v-model="model.f_iscity"
|
|
131
|
+
:options='$parent.$parent.iscity' placeholder='地区类型'
|
|
132
|
+
condition="a.f_iscity = '{}'"
|
|
133
|
+
close-on-select>
|
|
134
|
+
</v-select>
|
|
135
|
+
</div>
|
|
125
136
|
<div :class="$parent.$parent.style" >
|
|
126
137
|
<label class="font_normal_body">状  态</label>
|
|
127
138
|
<v-select :value.sync="model.f_state"
|
|
@@ -154,6 +165,7 @@
|
|
|
154
165
|
<th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼层</nobr></th>
|
|
155
166
|
<th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>门牌号</nobr></th>
|
|
156
167
|
<th><nobr>详细地址</nobr></th>
|
|
168
|
+
<th><nobr>地区类型</nobr></th>
|
|
157
169
|
<th><nobr>地址状态</nobr></th>
|
|
158
170
|
<th><nobr>状态</nobr></th>
|
|
159
171
|
<th><nobr>入户证号</nobr></th>
|
|
@@ -172,6 +184,7 @@
|
|
|
172
184
|
<td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_floor}}{{row.f_floor_suffix}}</nobr></td>
|
|
173
185
|
<td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_room}}{{row.f_room_suffix}}</nobr></td>
|
|
174
186
|
<td style="text-align:center"><nobr>{{row.f_address}}</nobr></td>
|
|
187
|
+
<td style="text-align:center"><nobr>{{row.f_iscity}}</nobr></td>
|
|
175
188
|
<td style="text-align:center"><nobr>{{row.f_address_state}}</nobr></td>
|
|
176
189
|
<td style="text-align:center"><nobr>{{row.f_state ==='作废'?'作废':'有效'}}</nobr></td>
|
|
177
190
|
<td style="text-align:center"><nobr>{{row.f_enter_number}}</nobr></td>
|
|
@@ -261,7 +274,9 @@
|
|
|
261
274
|
data () {
|
|
262
275
|
return {
|
|
263
276
|
criteriaShow: false,
|
|
277
|
+
// rs/sql/address_singleTableOrderBy
|
|
264
278
|
model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
|
|
279
|
+
//address_getAddress params:{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}
|
|
265
280
|
config: {
|
|
266
281
|
// 导出列要和查询列相同
|
|
267
282
|
excelHeaders: {
|
|
@@ -277,11 +292,13 @@
|
|
|
277
292
|
'f_floor':'楼层',
|
|
278
293
|
'f_room':'门牌号',
|
|
279
294
|
'f_address':'详细地址',
|
|
295
|
+
'f_iscity':'地区类型',
|
|
280
296
|
'f_address_state':'地址状态',
|
|
281
297
|
'f_create_date':'时间',
|
|
282
298
|
'f_state':'状态'
|
|
283
299
|
},
|
|
284
300
|
},
|
|
301
|
+
iscity:[{label:'市区',value:'市区'},{label:'乡镇',value:'乡镇'},{label:'全部',value:''}],
|
|
285
302
|
isbusy:false,
|
|
286
303
|
addflag: false,
|
|
287
304
|
addtitle:'',
|
|
@@ -398,7 +415,7 @@
|
|
|
398
415
|
if (!this.f_orgid) {
|
|
399
416
|
this.getorg([this.$login.f.orgid])
|
|
400
417
|
}
|
|
401
|
-
args.condition = `${args.condition} and
|
|
418
|
+
args.condition = `${args.condition} and f_filialeid = '${this.f_filialeids}'`
|
|
402
419
|
this.model.search(args.condition, args.model)
|
|
403
420
|
},
|
|
404
421
|
|
|
@@ -613,7 +630,7 @@
|
|
|
613
630
|
},
|
|
614
631
|
getCondition() {
|
|
615
632
|
return {
|
|
616
|
-
condition: `${this.$refs.paged.$refs.cri.condition}` + `and
|
|
633
|
+
condition: `${this.$refs.paged.$refs.cri.condition}` + `and f_filialeid = '${this.f_filialeids}'`}
|
|
617
634
|
}
|
|
618
635
|
}
|
|
619
636
|
|