address-client 3.2.90 → 3.2.92
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/package.json +1 -1
- package/src/address.js +2 -0
- package/src/components/AddStreetOrPcd.vue +0 -1
- package/src/components/CommunityAreaList.vue +87 -0
- package/src/components/CommunityManage.vue +25 -13
- package/src/components/CommunityManageList.vue +18 -11
- package/src/filiale/tongchuan/StreetList.vue +6 -2
package/package.json
CHANGED
package/src/address.js
CHANGED
|
@@ -61,6 +61,8 @@ export default function (filiale) {
|
|
|
61
61
|
Vue.component('community-manage-list', (resolve) => { require(['./components/CommunityManageList'], resolve) })
|
|
62
62
|
// 新增/修改 街道办信息
|
|
63
63
|
Vue.component('add-community-manage-msg', (resolve) => { require(['./components/AddCommunityManageMsg'], resolve) })
|
|
64
|
+
// 新增/修改 街道办信息
|
|
65
|
+
Vue.component('community-area-list', (resolve) => { require(['./components/CommunityAreaList'], resolve) })
|
|
64
66
|
|
|
65
67
|
// 分公司特殊页面注册替换
|
|
66
68
|
if (filiale) {
|
|
@@ -230,7 +230,6 @@
|
|
|
230
230
|
initdata(){
|
|
231
231
|
if(this.areatype=='街道'){
|
|
232
232
|
this.initpcds(` f_filialeid = '${this.f_filialeids}'`)
|
|
233
|
-
this.initstreetmanage(` f_filialeid = '${this.f_filialeids}'`)
|
|
234
233
|
}
|
|
235
234
|
if(this.areatype=='小区'){
|
|
236
235
|
this.initpcds(` f_filialeid = '${this.f_filialeids}'`)
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="flex">
|
|
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-4 form-group">
|
|
8
|
+
<label class="font_normal_body">小区名称</label>
|
|
9
|
+
<input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
|
|
10
|
+
condition="f_residential_area like '%{}%'" placeholder="小区名称"/>
|
|
11
|
+
</div>
|
|
12
|
+
<div class="col-sm-4 form-group button-range">
|
|
13
|
+
<button class="button_search button_spacing" @click="search()" >查询</button>
|
|
14
|
+
<button class="button_clear button_spacing" @click="$parent.$parent.cancel()">返回</button>
|
|
15
|
+
</div>
|
|
16
|
+
</div>
|
|
17
|
+
</div>
|
|
18
|
+
</criteria>
|
|
19
|
+
<data-grid :model="model" partial='list' style="overflow: auto" class="list_area table_sy" v-ref:grid>
|
|
20
|
+
<template partial='head'>
|
|
21
|
+
<th>
|
|
22
|
+
<nobr>小区名称</nobr>
|
|
23
|
+
</th>
|
|
24
|
+
<th>
|
|
25
|
+
<nobr>小区地址</nobr>
|
|
26
|
+
</th>
|
|
27
|
+
</template>
|
|
28
|
+
<template partial='body'>
|
|
29
|
+
<td style="text-align:center">
|
|
30
|
+
<nobr>{{ row.f_residential_area }}</nobr>
|
|
31
|
+
</td>
|
|
32
|
+
<td style="text-align:center">
|
|
33
|
+
<nobr>{{ row.f_area_address }}</nobr>
|
|
34
|
+
</td>
|
|
35
|
+
</template>
|
|
36
|
+
<template partial='foot'></template>
|
|
37
|
+
</data-grid>
|
|
38
|
+
</criteria-paged>
|
|
39
|
+
</div>
|
|
40
|
+
</template>
|
|
41
|
+
|
|
42
|
+
<script>
|
|
43
|
+
import {PagedList} from 'vue-client'
|
|
44
|
+
|
|
45
|
+
export default {
|
|
46
|
+
data () {
|
|
47
|
+
return {
|
|
48
|
+
criteriaShow: false,
|
|
49
|
+
model: new PagedList('rs/sql/address_singleTableOrderBy', 20, {
|
|
50
|
+
tablename: `'t_area'`,
|
|
51
|
+
items: `'f_residential_area,f_area_address'`,
|
|
52
|
+
orderitem: `'f_area_address desc'`
|
|
53
|
+
})
|
|
54
|
+
}
|
|
55
|
+
},
|
|
56
|
+
title: '小区列表',
|
|
57
|
+
props: ['communityid'],
|
|
58
|
+
ready () {
|
|
59
|
+
this.search()
|
|
60
|
+
},
|
|
61
|
+
methods: {
|
|
62
|
+
hidden () {
|
|
63
|
+
this.criteriaShow = !this.criteriaShow
|
|
64
|
+
},
|
|
65
|
+
cancel () {
|
|
66
|
+
this.communityid = null
|
|
67
|
+
this.$dispatch('cancel')
|
|
68
|
+
},
|
|
69
|
+
search () {
|
|
70
|
+
this.$refs.paged.$refs.cri.search()
|
|
71
|
+
},
|
|
72
|
+
selfSearch (args) {
|
|
73
|
+
args.condition = args.condition + `and f_community_id = '${this.communityid}'`
|
|
74
|
+
this.model.search(args.condition, args.model)
|
|
75
|
+
}
|
|
76
|
+
},
|
|
77
|
+
events: {},
|
|
78
|
+
computed: {},
|
|
79
|
+
watch: {
|
|
80
|
+
'communityid' (val) {
|
|
81
|
+
if (val) {
|
|
82
|
+
this.search()
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
</script>
|
|
@@ -1,16 +1,21 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div id="unit" class="flex-row " :class="{'binary':
|
|
3
|
-
<div :class="{'basic-main'
|
|
4
|
-
<community-manage-list @
|
|
2
|
+
<div id="unit" class="flex-row " :class="{'binary':communityManageShow == 0}">
|
|
3
|
+
<div :class="{'basic-main':communityManageShow == 0,'binary-left':communityManageShow != 0}">
|
|
4
|
+
<community-manage-list @child-dblclick="selected"
|
|
5
5
|
:f_filialeids.sync="f_filialeids"
|
|
6
6
|
v-ref:communitymanage>
|
|
7
7
|
</community-manage-list>
|
|
8
8
|
</div>
|
|
9
|
-
<div v-show="
|
|
9
|
+
<div v-show="communityManageShow == 1" class="binary-right">
|
|
10
10
|
<add-community-manage-msg v-ref:addcommunitymanage
|
|
11
11
|
:f_filialeids.sync="f_filialeids">
|
|
12
12
|
</add-community-manage-msg>
|
|
13
13
|
</div>
|
|
14
|
+
<div v-show="communityManageShow == 2" style="width: 60%" class="binary-right">
|
|
15
|
+
<div class="flex">
|
|
16
|
+
<community-area-list v-if="communityid" :communityid="communityid"></community-area-list>
|
|
17
|
+
</div>
|
|
18
|
+
</div>
|
|
14
19
|
</div>
|
|
15
20
|
</template>
|
|
16
21
|
|
|
@@ -22,31 +27,37 @@ export default {
|
|
|
22
27
|
return {
|
|
23
28
|
// 分公司id串
|
|
24
29
|
f_filialeids: this.$login.f.orgid,
|
|
25
|
-
|
|
30
|
+
communityid: null,
|
|
31
|
+
communityManageShow: 0
|
|
26
32
|
}
|
|
27
33
|
},
|
|
28
34
|
props: {},
|
|
29
35
|
methods: {
|
|
30
36
|
selected (obj) {
|
|
31
|
-
if (obj
|
|
32
|
-
if (obj.
|
|
37
|
+
if (obj && obj.id) {
|
|
38
|
+
if (obj.f_filialeid != this.f_filialeids) {
|
|
33
39
|
this.refresh()
|
|
34
40
|
return
|
|
35
41
|
}
|
|
36
|
-
this.
|
|
37
|
-
this.$refs.addcommunitymanage.businesstype = '修改' + obj.
|
|
38
|
-
this.$refs.addcommunitymanage.communitymodel = Object.assign({}, obj
|
|
42
|
+
this.communityManageShow = 1
|
|
43
|
+
this.$refs.addcommunitymanage.businesstype = '修改' + obj.f_community_name
|
|
44
|
+
this.$refs.addcommunitymanage.communitymodel = Object.assign({}, obj)
|
|
39
45
|
}
|
|
40
46
|
},
|
|
41
47
|
refresh () {
|
|
42
|
-
this.
|
|
48
|
+
this.communityManageShow = 0
|
|
43
49
|
this.$refs.communitymanage.$refs.paged.$refs.cri.search()
|
|
44
50
|
}
|
|
45
51
|
},
|
|
46
52
|
events: {
|
|
53
|
+
'shouAllArea' (row) {
|
|
54
|
+
this.style = 'col-sm-3 form-group'
|
|
55
|
+
this.communityManageShow = 2
|
|
56
|
+
this.communityid = row.id
|
|
57
|
+
},
|
|
47
58
|
'add' (areatype) {
|
|
48
59
|
this.style = 'col-sm-3 '
|
|
49
|
-
this.
|
|
60
|
+
this.communityManageShow = 1
|
|
50
61
|
this.$refs.addcommunitymanage.businesstype = '新增'
|
|
51
62
|
this.$refs.addcommunitymanage.clearData()
|
|
52
63
|
},
|
|
@@ -56,7 +67,8 @@ export default {
|
|
|
56
67
|
},
|
|
57
68
|
'cancel' () {
|
|
58
69
|
this.style = 'col-sm-2 '
|
|
59
|
-
this.
|
|
70
|
+
this.communityManageShow = 0
|
|
71
|
+
this.communityid = null
|
|
60
72
|
this.$refs.communitymanage.$refs.paged.$refs.cri.search()
|
|
61
73
|
}
|
|
62
74
|
}
|
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="flex" @keyup.enter="search">
|
|
3
|
-
<criteria-paged :model="model" v-ref:paged>
|
|
4
|
-
<criteria partial='criteria' @condition-changed='$parent.selfSearch'
|
|
3
|
+
<criteria-paged :model="model" v-ref:paged @dblclick="handDblclick">
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
5
5
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
6
6
|
<div class="row">
|
|
7
|
-
<div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.
|
|
7
|
+
<div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.communityManageShow,'col-sm-2':!$parent.$parent.$parent.communityManageShow}">
|
|
8
8
|
<label class="font_normal_body">组织机构</label>
|
|
9
9
|
<res-select restype='organization'
|
|
10
10
|
@res-select="$parent.$parent.getorg"
|
|
11
11
|
:initresid='$parent.$parent.curorgid'>
|
|
12
12
|
</res-select>
|
|
13
13
|
</div>
|
|
14
|
-
<div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.
|
|
14
|
+
<div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.communityManageShow,'col-sm-2':!$parent.$parent.$parent.communityManageShow}">
|
|
15
15
|
<label class="font_normal_body">社区名称</label>
|
|
16
16
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_community_name"
|
|
17
17
|
condition="f_community_name like '%{}%'" placeholder="社区名称"/>
|
|
18
18
|
</div>
|
|
19
|
-
<div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.
|
|
19
|
+
<div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.communityManageShow,'col-sm-2':!$parent.$parent.$parent.communityManageShow}">
|
|
20
20
|
<label class="font_normal_body">街道/区县</label>
|
|
21
21
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_street"
|
|
22
22
|
condition="f_street like '%{}%'" placeholder="街道/区县"/>
|
|
23
23
|
</div>
|
|
24
|
-
<div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.
|
|
24
|
+
<div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.communityManageShow,'col-sm-2':!$parent.$parent.$parent.communityManageShow}">
|
|
25
25
|
<label class="font_normal_body">社区负责人</label>
|
|
26
26
|
<v-select :value.sync="model.f_community_director"
|
|
27
27
|
:value-single="true"
|
|
@@ -39,26 +39,26 @@
|
|
|
39
39
|
<export-excel :data="$parent.$parent.getCondition"
|
|
40
40
|
:field="$parent.$parent.getfield"
|
|
41
41
|
sqlurl="rs/logic/exportfile"
|
|
42
|
-
sql-name="
|
|
42
|
+
sql-name="manage_getCommunityManageList"
|
|
43
43
|
template-name='社区信息查询导出'
|
|
44
44
|
:choose-col="true"></export-excel>
|
|
45
45
|
<div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
|
|
46
46
|
</div>
|
|
47
47
|
</div>
|
|
48
48
|
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
49
|
-
<!-- <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.
|
|
49
|
+
<!-- <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.communityManageShow,'col-sm-2':!$parent.$parent.$parent.communityManageShow}">-->
|
|
50
50
|
<!-- <label class="font_normal_body">省  份</label>-->
|
|
51
51
|
<!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_province"-->
|
|
52
52
|
<!-- condition="f_province like '%{}%'" placeholder="省份"-->
|
|
53
53
|
<!-- :size="model.f_province ? model.f_province.length*2 : 6"/>-->
|
|
54
54
|
<!-- </div>-->
|
|
55
|
-
<!-- <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.
|
|
55
|
+
<!-- <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.communityManageShow,'col-sm-2':!$parent.$parent.$parent.communityManageShow}">-->
|
|
56
56
|
<!-- <label class="font_normal_body">城  市</label>-->
|
|
57
57
|
<!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_city"-->
|
|
58
58
|
<!-- condition="f_city like '%{}%'" placeholder="城市"-->
|
|
59
59
|
<!-- :size="model.f_city ? model.f_city.length*2 : 6"/>-->
|
|
60
60
|
<!-- </div>-->
|
|
61
|
-
<!-- <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.
|
|
61
|
+
<!-- <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.communityManageShow,'col-sm-2':!$parent.$parent.$parent.communityManageShow}">-->
|
|
62
62
|
<!-- <label class="font_normal_body">区  县</label>-->
|
|
63
63
|
<!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_district"-->
|
|
64
64
|
<!-- condition="f_district like '%{}%'" placeholder="区县"-->
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
<td style="text-align:center"><nobr>{{row.f_community_director}}</nobr></td>
|
|
90
90
|
<td style="text-align:center"><nobr>{{row.f_director_phone}}</nobr></td>
|
|
91
91
|
<td style="text-align:center"><nobr>{{row.f_orgname}}</nobr></td>
|
|
92
|
-
<td style="text-align:center"><nobr>{{row.areanum}}</nobr></td>
|
|
92
|
+
<td style="text-align:center"><nobr><span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.areanum}}</a></span></nobr></td>
|
|
93
93
|
<td style="text-align:center"><nobr>{{row.f_comments}}</nobr></td>
|
|
94
94
|
<td style="text-align:center">
|
|
95
95
|
<nobr>
|
|
@@ -152,6 +152,13 @@
|
|
|
152
152
|
this.search()
|
|
153
153
|
},
|
|
154
154
|
methods: {
|
|
155
|
+
handDblclick(row){
|
|
156
|
+
console.log('row',row)
|
|
157
|
+
this.$dispatch("child-dblclick",row)
|
|
158
|
+
},
|
|
159
|
+
dealmsg (row) {
|
|
160
|
+
this.$dispatch('shouAllArea',row)
|
|
161
|
+
},
|
|
155
162
|
hidden() {
|
|
156
163
|
this.criteriaShow = !this.criteriaShow
|
|
157
164
|
},
|
|
@@ -116,12 +116,14 @@
|
|
|
116
116
|
data () {
|
|
117
117
|
return {
|
|
118
118
|
criteriaShow: false,
|
|
119
|
-
model: new PagedList('rs/sql/address_getstreetlist',20),
|
|
119
|
+
model: new PagedList('rs/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
|
|
120
120
|
addflag: false,
|
|
121
121
|
getfield: {},
|
|
122
122
|
addtitle:'',
|
|
123
123
|
// 公司下拉
|
|
124
124
|
curorgid: [this.$login.f.orgid],
|
|
125
|
+
//排序
|
|
126
|
+
orderitem:'f_city,f_district,f_iscity,f_street desc',
|
|
125
127
|
f_orgid: '',
|
|
126
128
|
config: {
|
|
127
129
|
// 导出列要和查询列相同
|
|
@@ -204,7 +206,9 @@
|
|
|
204
206
|
computed: {
|
|
205
207
|
getCondition() {
|
|
206
208
|
return {
|
|
207
|
-
condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'
|
|
209
|
+
condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'`,
|
|
210
|
+
orderitem: this.orderitem ? `${this.orderitem}` : " id desc"
|
|
211
|
+
}
|
|
208
212
|
}
|
|
209
213
|
}
|
|
210
214
|
}
|