elink-star
/
esua-epdc-admin
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

居民管理界面修改

master
尹作梅 6 years ago
parent
a51639a48c
commit
ae082d43f0
9 changed files with 194 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/views/modules/group/topic-list.vue
  2. 8
      src/views/modules/sys/deptmacode.vue
  3. 49
      src/views/modules/user/fail-authentication.vue
  4. 49
      src/views/modules/user/pass-authentication.vue
  5. 50
      src/views/modules/user/unauthorized.vue
  6. 14
      src/views/modules/user/user-add-or-update.vue
  7. 5
      src/views/modules/user/user-detail.vue
  8. 9
      src/views/modules/user/user-grid.vue
  9. 49
      src/views/modules/user/wait-authentication.vue

14
src/views/modules/group/topic-list.vue
View File

@ -149,14 +149,22 @@ export default {
}, },
watch: { watch: {
'ids': function (val) { 'ids': function (val) {
if (val.length === 1){ if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) {
this.dataForm.streetId = this.ids[0] this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
} }
if (val.length === 2){ if (val.length === 2) {
this.dataForm.streetId = this.ids[0] this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1] this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = ''
} }
if (val.length === 3){ if (val.length === 3) {
this.dataForm.streetId = this.ids[0] this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1] this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = this.ids[2] this.dataForm.gridId = this.ids[2]

8
src/views/modules/sys/deptmacode.vue
View File

@ -196,12 +196,20 @@ export default {
}, },
watch: { watch: {
'deptIdList': function (val) { 'deptIdList': function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) { if (val.length === 1) {
this.dataForm.streetId = this.deptIdList[0] this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
} }
if (val.length === 2) { if (val.length === 2) {
this.dataForm.streetId = this.deptIdList[0] this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1] this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = ''
} }
if (val.length === 3) { if (val.length === 3) {
this.dataForm.streetId = this.deptIdList[0] this.dataForm.streetId = this.deptIdList[0]

49
src/views/modules/user/fail-authentication.vue
View File

@ -4,7 +4,7 @@
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属机构"> <el-form-item label="所属机构">
<el-cascader <el-cascader
v-model="dataForm.deptIdList" v-model="deptIdList"
:options="options" :options="options"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
clearable> clearable>
@ -67,7 +67,7 @@ export default {
data () { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: 'app-user/user/query', getDataListURL: 'app-user/user/page',
getDataListIsPage: true, getDataListIsPage: true,
deleteURL: '/app-use/user', deleteURL: '/app-use/user',
deleteIsBatch: true, deleteIsBatch: true,
@ -84,11 +84,9 @@ export default {
startTime: '', startTime: '',
endTime: '', endTime: '',
partyFlag: '', partyFlag: '',
state: '2', state: '2'
page: 1,
limit: 10,
deptIdList: []
}, },
deptIdList: [],
options: [], options: [],
userDetailVisible: false, userDetailVisible: false,
streetOptions: [], streetOptions: [],
@ -112,6 +110,30 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
}, },
watch: {
'deptIdList': function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 2) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = ''
}
if (val.length === 3) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = this.deptIdList[2]
}
}
},
methods: { methods: {
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
@ -171,10 +193,17 @@ export default {
this.dataForm.endTime = '' this.dataForm.endTime = ''
} }
this.dataListLoading = true this.dataListLoading = true
this.dataForm.page = this.mixinViewModuleOptions.getDataListIsPage ? this.page : null this.$http.get(
this.dataForm.limit = this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null this.mixinViewModuleOptions.getDataListURL,
this.$http.post( {
this.mixinViewModuleOptions.getDataListURL, this.dataForm params: {
order: this.order,
orderField: this.orderField,
page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
...this.dataForm
}
}
).then(({ data: res }) => { ).then(({ data: res }) => {
this.dataListLoading = false this.dataListLoading = false
if (res.code !== 0) { if (res.code !== 0) {

49
src/views/modules/user/pass-authentication.vue
View File

@ -4,7 +4,7 @@
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属机构"> <el-form-item label="所属机构">
<el-cascader <el-cascader
v-model="dataForm.deptIdList" v-model="deptIdList"
:options="options" :options="options"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
clearable> clearable>
@ -76,7 +76,7 @@ export default {
data () { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: 'app-user/user/query', getDataListURL: 'app-user/user/page',
getDataListIsPage: true, getDataListIsPage: true,
deleteURL: '/app-use/user', deleteURL: '/app-use/user',
deleteIsBatch: true, deleteIsBatch: true,
@ -93,11 +93,9 @@ export default {
startTime: '', startTime: '',
endTime: '', endTime: '',
partyFlag: '', partyFlag: '',
state: '3', state: '3'
page: 1,
limit: 10,
deptIdList: []
}, },
deptIdList: [],
options: [], options: [],
userDetailVisible: false, userDetailVisible: false,
userGridVisible: false, userGridVisible: false,
@ -122,6 +120,30 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
}, },
watch: {
'deptIdList': function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 2) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = ''
}
if (val.length === 3) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = this.deptIdList[2]
}
}
},
methods: { methods: {
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
@ -181,10 +203,17 @@ export default {
this.dataForm.endTime = '' this.dataForm.endTime = ''
} }
this.dataListLoading = true this.dataListLoading = true
this.dataForm.page = this.mixinViewModuleOptions.getDataListIsPage ? this.page : null this.$http.get(
this.dataForm.limit = this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null this.mixinViewModuleOptions.getDataListURL,
this.$http.post( {
this.mixinViewModuleOptions.getDataListURL, this.dataForm params: {
order: this.order,
orderField: this.orderField,
page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
...this.dataForm
}
}
).then(({ data: res }) => { ).then(({ data: res }) => {
this.dataListLoading = false this.dataListLoading = false
if (res.code !== 0) { if (res.code !== 0) {

50
src/views/modules/user/unauthorized.vue
View File

@ -4,7 +4,7 @@
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属机构"> <el-form-item label="所属机构">
<el-cascader <el-cascader
v-model="dataForm.deptIdList" v-model="deptIdList"
:options="options" :options="options"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
clearable> clearable>
@ -67,7 +67,7 @@ export default {
data () { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: 'app-user/user/query', getDataListURL: 'app-user/user/page',
getDataListIsPage: true, getDataListIsPage: true,
deleteURL: '/app-use/user', deleteURL: '/app-use/user',
deleteIsBatch: true, deleteIsBatch: true,
@ -84,11 +84,9 @@ export default {
startTime: '', startTime: '',
endTime: '', endTime: '',
partyFlag: '', partyFlag: '',
state: '0', state: '0'
page: 1,
limit: 10,
deptIdList: []
}, },
deptIdList: [],
options: [], options: [],
userDetailVisible: false, userDetailVisible: false,
streetOptions: [], streetOptions: [],
@ -112,6 +110,30 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
}, },
watch: {
'deptIdList': function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 2) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = ''
}
if (val.length === 3) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = this.deptIdList[2]
}
}
},
methods: { methods: {
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
@ -171,11 +193,17 @@ export default {
this.dataForm.endTime = '' this.dataForm.endTime = ''
} }
this.dataListLoading = true this.dataListLoading = true
this.dataForm.page = this.mixinViewModuleOptions.getDataListIsPage ? this.page : null this.$http.get(
this.dataForm.limit = this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null this.mixinViewModuleOptions.getDataListURL,
this.$http.post( {
this.mixinViewModuleOptions.getDataListURL, this.dataForm params: {
).then(({ data: res }) => { order: this.order,
orderField: this.orderField,
page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
...this.dataForm
}
}).then(({ data: res }) => {
this.dataListLoading = false this.dataListLoading = false
if (res.code !== 0) { if (res.code !== 0) {
this.dataList = [] this.dataList = []

14
src/views/modules/user/user-add-or-update.vue
View File

@ -73,16 +73,22 @@
<el-form-item label="扫码网格"> <el-form-item label="扫码网格">
<el-table :data="userGridList" <el-table :data="userGridList"
style="width: 100%"> style="width: 100%">
<el-table-column prop="street" <!-- <el-table-column prop="street"
label="街道" label="街道"
width="180"> width="180"
v-if="false">
</el-table-column> </el-table-column>
<el-table-column prop="community" <el-table-column prop="community"
label="社区" label="社区"
width="180"> width="180"
v-if="false">
</el-table-column> </el-table-column>
<el-table-column prop="grid" <el-table-column prop="grid"
label="网格"> label="网格"
v-if="false">
</el-table-column> -->
<el-table-column prop="allDeptNames"
label="街道-社区-网格">
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form-item> </el-form-item>

5
src/views/modules/user/user-detail.vue
View File

@ -53,7 +53,7 @@
<el-form-item label="扫码网格"> <el-form-item label="扫码网格">
<el-table :data="userGridList" <el-table :data="userGridList"
style="width: 100%"> style="width: 100%">
<el-table-column prop="street" <!-- <el-table-column prop="street"
label="街道"> label="街道">
</el-table-column> </el-table-column>
<el-table-column prop="community" <el-table-column prop="community"
@ -61,6 +61,9 @@
</el-table-column> </el-table-column>
<el-table-column prop="grid" <el-table-column prop="grid"
label="网格"> label="网格">
</el-table-column> -->
<el-table-column prop="allDeptNames"
label="街道-社区-网格">
</el-table-column> </el-table-column>
<el-table-column prop="leaderFlag" <el-table-column prop="leaderFlag"
label="是否为网格长" label="是否为网格长"

9
src/views/modules/user/user-grid.vue
View File

@ -5,16 +5,17 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false"> :close-on-press-escape="false">
<el-table :data="userGridList" style="width: 100%"> <el-table :data="userGridList" style="width: 100%">
<el-table-column prop="street" label="街道"> </el-table-column> <!-- <el-table-column prop="street" label="街道" v-if="false"> </el-table-column>
<el-table-column prop="community" label="社区"> </el-table-column> <el-table-column prop="community" label="社区" v-if="false"> </el-table-column>
<el-table-column prop="grid" label="网格"> </el-table-column> <el-table-column prop="grid" label="网格" v-if="false"> </el-table-column>
<el-table-column <el-table-column
v-if="false" v-if="false"
prop="leaderFlag" prop="leaderFlag"
label="是否为网格长" label="是否为网格长"
:formatter="showLeaderFlagFormatter" :formatter="showLeaderFlagFormatter"
> >
</el-table-column> </el-table-column> -->
<el-table-column prop="allDeptNames" label="街道-社区-网格"> </el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="unbindGridHandle(scope.row.id,scope.row.userId)">解除</el-button> <el-button type="text" size="small" @click="unbindGridHandle(scope.row.id,scope.row.userId)">解除</el-button>

49
src/views/modules/user/wait-authentication.vue
View File

@ -4,7 +4,7 @@
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属机构"> <el-form-item label="所属机构">
<el-cascader <el-cascader
v-model="dataForm.deptIdList" v-model="deptIdList"
:options="options" :options="options"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
clearable> clearable>
@ -67,7 +67,7 @@ export default {
data () { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: 'app-user/user/query', getDataListURL: 'app-user/user/page',
getDataListIsPage: true, getDataListIsPage: true,
deleteURL: '/app-use/user', deleteURL: '/app-use/user',
deleteIsBatch: true, deleteIsBatch: true,
@ -84,11 +84,9 @@ export default {
startTime: '', startTime: '',
endTime: '', endTime: '',
partyFlag: '', partyFlag: '',
state: '1', state: '1'
page: 1,
limit: 10,
deptIdList: []
}, },
deptIdList: [],
options: [], options: [],
userDetailVisible: false, userDetailVisible: false,
streetOptions: [], streetOptions: [],
@ -112,6 +110,30 @@ export default {
}) })
.catch(() => {}) .catch(() => {})
}, },
watch: {
'deptIdList': function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 2) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = ''
}
if (val.length === 3) {
this.dataForm.streetId = this.deptIdList[0]
this.dataForm.communityId = this.deptIdList[1]
this.dataForm.gridId = this.deptIdList[2]
}
}
},
methods: { methods: {
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
@ -171,10 +193,17 @@ export default {
this.dataForm.endTime = '' this.dataForm.endTime = ''
} }
this.dataListLoading = true this.dataListLoading = true
this.dataForm.page = this.mixinViewModuleOptions.getDataListIsPage ? this.page : null this.$http.get(
this.dataForm.limit = this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null this.mixinViewModuleOptions.getDataListURL,
this.$http.post( {
this.mixinViewModuleOptions.getDataListURL, this.dataForm params: {
order: this.order,
orderField: this.orderField,
page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
...this.dataForm
}
}
).then(({ data: res }) => { ).then(({ data: res }) => {
this.dataListLoading = false this.dataListLoading = false
if (res.code !== 0) { if (res.code !== 0) {

Write Preview
Loading…
Cancel
Save