address-client 3.1.1 → 3.1.4
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/buildOutputCleanup/cache.properties +2 -2
- package/build/dev-server.js +125 -125
- package/package.json +1 -1
- package/src/components/CityList.vue +133 -133
- package/src/components/UserAddress.vue +3 -0
- package/src/filiale/WEINAN/AddAreaMsg.vue +656 -656
- package/src/filiale/tongchuan/CityList.vue +133 -133
- package/src/filiale/tongchuan/UserAddress.vue +824 -824
- package/src/filiale/tongchuan/sale.js +19 -19
- package/src/filiale/zhoukou/AddAreaMsg.vue +671 -0
- package/src/filiale/zhoukou/AddressList.vue +391 -391
- package/src/filiale/zhoukou/AddressManage.vue +114 -0
- package/src/filiale/zhoukou/AreaList.vue +317 -0
- package/src/filiale/zhoukou/AreaManage.vue +100 -0
- package/src/filiale/zhoukou/UserAddress.vue +928 -833
- package/src/filiale/zhoukou/sale.js +11 -1
- package/src/main.js +1 -1
- package/.gradle/3.5/file-changes/last-build.bin +0 -0
- package/.gradle/3.5/taskHistory/taskHistory.lock +0 -0
- package/.gradle/buildOutputCleanup/built.bin +0 -0
- package/.gradle/buildOutputCleanup/cache.properties.lock +0 -1
- package/AddressClient.iml +0 -13
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
#
|
|
2
|
-
gradle.version=
|
|
1
|
+
#Mon Dec 07 15:35:10 CST 2020
|
|
2
|
+
gradle.version=5.2.1
|
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: 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://192.168.20.28:8400', str2= 'http://192.168.20.28: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,133 +1,133 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<div class="flex" @keyup.enter="search">
|
|
3
|
-
<criteria-paged :model="model" v-ref:paged>
|
|
4
|
-
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
5
|
-
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
6
|
-
<div class="row">
|
|
7
|
-
<div class="col-sm-6 form-group">
|
|
8
|
-
<label class="font_normal_body">省份</label>
|
|
9
|
-
<input type="text" class="input_search" v-model="model.f_province"
|
|
10
|
-
condition="f_province like '%{}%'" placeholder="省份"
|
|
11
|
-
:size="model.f_province ? model.f_province.length*2 : 6"/>
|
|
12
|
-
</div>
|
|
13
|
-
<div class="col-sm-4 form-group button-range">
|
|
14
|
-
<button class="button_search button_spacing" @click="search()" >查询</button>
|
|
15
|
-
</div>
|
|
16
|
-
</div>
|
|
17
|
-
</div>
|
|
18
|
-
</criteria>
|
|
19
|
-
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
|
|
20
|
-
<template partial='head'>
|
|
21
|
-
<tr>
|
|
22
|
-
<th><nobr>序号</nobr></th>
|
|
23
|
-
<th><nobr>省份</nobr></th>
|
|
24
|
-
<th><nobr>城市</nobr></th>
|
|
25
|
-
<th><nobr>区/县</nobr></th>
|
|
26
|
-
<th><nobr>省市区编码</nobr></th>
|
|
27
|
-
<th title="该区域下现有的街道数"><nobr>街道数量</nobr></th>
|
|
28
|
-
<th><nobr>操作</nobr></th>
|
|
29
|
-
</tr>
|
|
30
|
-
</template>
|
|
31
|
-
<template partial='body'>
|
|
32
|
-
<tr @click="$parent.$parent.changestyle()">
|
|
33
|
-
<td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
|
|
34
|
-
<td style="text-align:center"><nobr>{{row.f_province}}</nobr></td>
|
|
35
|
-
<td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
|
|
36
|
-
<td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
|
|
37
|
-
<td style="text-align:center"><nobr>{{row.f_pcd_number}}</nobr></td>
|
|
38
|
-
<td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>
|
|
39
|
-
<td style="text-align:center"><nobr>
|
|
40
|
-
<button v-if="row.streenum === 0" type="button" name="button" class="btn btn-danger"
|
|
41
|
-
style="padding: 5px 12px"
|
|
42
|
-
@click.stop="$parent.$parent.$parent.delete(row)">删除</button>
|
|
43
|
-
</nobr></td>
|
|
44
|
-
</tr>
|
|
45
|
-
</template>
|
|
46
|
-
<template partial='foot'></template>
|
|
47
|
-
</data-grid>
|
|
48
|
-
</criteria-paged>
|
|
49
|
-
</div>
|
|
50
|
-
</template>
|
|
51
|
-
|
|
52
|
-
<script>
|
|
53
|
-
import { PagedList } from 'vue-client'
|
|
54
|
-
let readyGen = async function (self) {
|
|
55
|
-
self.getfield = self.config.excelHeaders
|
|
56
|
-
}
|
|
57
|
-
export default {
|
|
58
|
-
data () {
|
|
59
|
-
return {
|
|
60
|
-
model: new PagedList('rs/sql/address_getcitylist',20),
|
|
61
|
-
addflag: false,
|
|
62
|
-
getfield: {},
|
|
63
|
-
f_orgid: ''
|
|
64
|
-
}
|
|
65
|
-
},
|
|
66
|
-
props:{
|
|
67
|
-
f_filialeids:{
|
|
68
|
-
type: String
|
|
69
|
-
}
|
|
70
|
-
},
|
|
71
|
-
ready(){
|
|
72
|
-
readyGen(this)
|
|
73
|
-
this.search()
|
|
74
|
-
},
|
|
75
|
-
methods: {
|
|
76
|
-
search () {
|
|
77
|
-
this.$refs.paged.$refs.cri.search()
|
|
78
|
-
},
|
|
79
|
-
async delete(row){
|
|
80
|
-
if(row.id >= 0 ){
|
|
81
|
-
var id = row.id
|
|
82
|
-
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
83
|
-
{data: {
|
|
84
|
-
items: 'f_pcd_id',
|
|
85
|
-
tablename: 't_street',
|
|
86
|
-
condition: `f_pcd_id='${id}'`}
|
|
87
|
-
},
|
|
88
|
-
{resolveMsg: null, rejectMsg: null})
|
|
89
|
-
if(useraredss.data.length>0){
|
|
90
|
-
this.$showAlert('该区县下已有街道信息,无法删除!','warning',1000)
|
|
91
|
-
}else{
|
|
92
|
-
this.$resetdelete('rs/entity/t_pcd', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
93
|
-
this.$dispatch('cancel')
|
|
94
|
-
})
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
},
|
|
98
|
-
add(val){
|
|
99
|
-
if (this.f_filialeids) {
|
|
100
|
-
this.$refs.paged.$refs.grid.selectStore.selected = null
|
|
101
|
-
this.$dispatch('add',val)
|
|
102
|
-
} else {
|
|
103
|
-
this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
|
|
104
|
-
}
|
|
105
|
-
},
|
|
106
|
-
modify(val){
|
|
107
|
-
this.$refs.paged.$refs.grid.selectStore.selected = null
|
|
108
|
-
this.$dispatch('modify',val)
|
|
109
|
-
},
|
|
110
|
-
selfSearch (args) {
|
|
111
|
-
if (!this.f_orgid) {
|
|
112
|
-
this.getorg([this.$login.f.orgid])
|
|
113
|
-
}
|
|
114
|
-
args.condition = `${args.condition} and p.f_filialeid in ${this.f_orgid}`
|
|
115
|
-
this.model.search(args.condition, args.model)
|
|
116
|
-
},
|
|
117
|
-
//清空
|
|
118
|
-
clear(){
|
|
119
|
-
this.$refs.paged.$refs.cri.model = {}
|
|
120
|
-
},
|
|
121
|
-
getorg (val) {
|
|
122
|
-
this.f_orgid = this.$login.convertToIn(val)
|
|
123
|
-
this.f_filialeids = val[0]
|
|
124
|
-
}
|
|
125
|
-
},
|
|
126
|
-
computed: {
|
|
127
|
-
getCondition() {
|
|
128
|
-
return {
|
|
129
|
-
condition: `${this.$refs.paged.$refs.cri.condition}` + `and p.f_filialeid = '${this.f_filialeids}'`}
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
</script>
|
|
1
|
+
<template>
|
|
2
|
+
<div class="flex" @keyup.enter="search">
|
|
3
|
+
<criteria-paged :model="model" v-ref:paged>
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
5
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
6
|
+
<div class="row">
|
|
7
|
+
<div class="col-sm-6 form-group">
|
|
8
|
+
<label class="font_normal_body">省份</label>
|
|
9
|
+
<input type="text" class="input_search" v-model="model.f_province"
|
|
10
|
+
condition="f_province like '%{}%'" placeholder="省份"
|
|
11
|
+
:size="model.f_province ? model.f_province.length*2 : 6"/>
|
|
12
|
+
</div>
|
|
13
|
+
<div class="col-sm-4 form-group button-range">
|
|
14
|
+
<button class="button_search button_spacing" @click="search()" >查询</button>
|
|
15
|
+
</div>
|
|
16
|
+
</div>
|
|
17
|
+
</div>
|
|
18
|
+
</criteria>
|
|
19
|
+
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
|
|
20
|
+
<template partial='head'>
|
|
21
|
+
<tr>
|
|
22
|
+
<th><nobr>序号</nobr></th>
|
|
23
|
+
<th><nobr>省份</nobr></th>
|
|
24
|
+
<th><nobr>城市</nobr></th>
|
|
25
|
+
<th><nobr>区/县</nobr></th>
|
|
26
|
+
<th><nobr>省市区编码</nobr></th>
|
|
27
|
+
<th title="该区域下现有的街道数"><nobr>街道数量</nobr></th>
|
|
28
|
+
<th><nobr>操作</nobr></th>
|
|
29
|
+
</tr>
|
|
30
|
+
</template>
|
|
31
|
+
<template partial='body'>
|
|
32
|
+
<tr @click="$parent.$parent.changestyle()">
|
|
33
|
+
<td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
|
|
34
|
+
<td style="text-align:center"><nobr>{{row.f_province}}</nobr></td>
|
|
35
|
+
<td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
|
|
36
|
+
<td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
|
|
37
|
+
<td style="text-align:center"><nobr>{{row.f_pcd_number}}</nobr></td>
|
|
38
|
+
<td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>
|
|
39
|
+
<td style="text-align:center"><nobr>
|
|
40
|
+
<button v-if="row.streenum === 0" type="button" name="button" class="btn btn-danger"
|
|
41
|
+
style="padding: 5px 12px"
|
|
42
|
+
@click.stop="$parent.$parent.$parent.delete(row)">删除</button>
|
|
43
|
+
</nobr></td>
|
|
44
|
+
</tr>
|
|
45
|
+
</template>
|
|
46
|
+
<template partial='foot'></template>
|
|
47
|
+
</data-grid>
|
|
48
|
+
</criteria-paged>
|
|
49
|
+
</div>
|
|
50
|
+
</template>
|
|
51
|
+
|
|
52
|
+
<script>
|
|
53
|
+
import { PagedList } from 'vue-client'
|
|
54
|
+
let readyGen = async function (self) {
|
|
55
|
+
self.getfield = self.config.excelHeaders
|
|
56
|
+
}
|
|
57
|
+
export default {
|
|
58
|
+
data () {
|
|
59
|
+
return {
|
|
60
|
+
model: new PagedList('rs/sql/address_getcitylist',20),
|
|
61
|
+
addflag: false,
|
|
62
|
+
getfield: {},
|
|
63
|
+
f_orgid: ''
|
|
64
|
+
}
|
|
65
|
+
},
|
|
66
|
+
props:{
|
|
67
|
+
f_filialeids:{
|
|
68
|
+
type: String
|
|
69
|
+
}
|
|
70
|
+
},
|
|
71
|
+
ready(){
|
|
72
|
+
readyGen(this)
|
|
73
|
+
this.search()
|
|
74
|
+
},
|
|
75
|
+
methods: {
|
|
76
|
+
search () {
|
|
77
|
+
this.$refs.paged.$refs.cri.search()
|
|
78
|
+
},
|
|
79
|
+
async delete(row){
|
|
80
|
+
if(row.id >= 0 ){
|
|
81
|
+
var id = row.id
|
|
82
|
+
let useraredss = await this.$resetpost('rs/sql/address_singleTable',
|
|
83
|
+
{data: {
|
|
84
|
+
items: 'f_pcd_id',
|
|
85
|
+
tablename: 't_street',
|
|
86
|
+
condition: `f_pcd_id='${id}'`}
|
|
87
|
+
},
|
|
88
|
+
{resolveMsg: null, rejectMsg: null})
|
|
89
|
+
if(useraredss.data.length>0){
|
|
90
|
+
this.$showAlert('该区县下已有街道信息,无法删除!','warning',1000)
|
|
91
|
+
}else{
|
|
92
|
+
this.$resetdelete('rs/entity/t_pcd', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
93
|
+
this.$dispatch('cancel')
|
|
94
|
+
})
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
},
|
|
98
|
+
add(val){
|
|
99
|
+
if (this.f_filialeids) {
|
|
100
|
+
this.$refs.paged.$refs.grid.selectStore.selected = null
|
|
101
|
+
this.$dispatch('add',val)
|
|
102
|
+
} else {
|
|
103
|
+
this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
|
|
104
|
+
}
|
|
105
|
+
},
|
|
106
|
+
modify(val){
|
|
107
|
+
this.$refs.paged.$refs.grid.selectStore.selected = null
|
|
108
|
+
this.$dispatch('modify',val)
|
|
109
|
+
},
|
|
110
|
+
selfSearch (args) {
|
|
111
|
+
if (!this.f_orgid) {
|
|
112
|
+
this.getorg([this.$login.f.orgid])
|
|
113
|
+
}
|
|
114
|
+
args.condition = `${args.condition} and p.f_filialeid in ${this.f_orgid}`
|
|
115
|
+
this.model.search(args.condition, args.model)
|
|
116
|
+
},
|
|
117
|
+
//清空
|
|
118
|
+
clear(){
|
|
119
|
+
this.$refs.paged.$refs.cri.model = {}
|
|
120
|
+
},
|
|
121
|
+
getorg (val) {
|
|
122
|
+
this.f_orgid = this.$login.convertToIn(val)
|
|
123
|
+
this.f_filialeids = val[0]
|
|
124
|
+
}
|
|
125
|
+
},
|
|
126
|
+
computed: {
|
|
127
|
+
getCondition() {
|
|
128
|
+
return {
|
|
129
|
+
condition: `${this.$refs.paged.$refs.cri.condition}` + `and p.f_filialeid = '${this.f_filialeids}'`}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
</script>
|
|
@@ -429,6 +429,8 @@
|
|
|
429
429
|
methods: {
|
|
430
430
|
async changecity(){
|
|
431
431
|
this.areaslist = []
|
|
432
|
+
// this.model.f_residential_area_id = null
|
|
433
|
+
// this.model.f_residential_area = null
|
|
432
434
|
let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and a.f_orgid = '${this.f_filialeids}'`
|
|
433
435
|
let req = await this.$resetpost('rs/sql/address_getresidential', {
|
|
434
436
|
data: {
|
|
@@ -783,6 +785,7 @@
|
|
|
783
785
|
this.model= {
|
|
784
786
|
f_pcd_id: '',
|
|
785
787
|
f_street_id: '',
|
|
788
|
+
f_iscity:'市区',
|
|
786
789
|
f_residential_area_id: '',
|
|
787
790
|
f_pcd: '',
|
|
788
791
|
f_comments:'',
|