kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 30003

Browse Source
This commit is contained in:
aixianling
2022-06-06 11:22:15 +08:00
parent 34dd2fcbcc
commit 94331d6ba0
9 changed files with 274 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
project/grid/AppGridMember/AppGridMember.vue
View File

@@ -1,27 +1,7 @@
<template> <template>
<ai-list class="AppGridMember" v-if="!isShowDetail"> <keep-alive include="GmList">
<template slot="title"> <component :is="currentPage" v-bind="$props" @change="onChange"/>
<ai-title title="网格员管理" :isShowBottomBorder="false"></ai-title> </keep-alive>
</template>
<template slot="tabs">
<el-tabs v-model="currIndex">
<el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
<component :ref="String(i)" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance"
:dict="dict" :permissions="permissions"/>
</el-tab-pane>
</el-tabs>
</template>
</ai-list>
<Add v-else-if="component === 'Add'" :params="params" :instance="instance" :dict="dict" :permissions="permissions"
@change="onChange"></Add>
<Family v-else-if="component === 'Family'" :params="params" :instance="instance" :dict="dict"
:permissions="permissions" @change="onChange"></Family>
<MonitorUser v-else-if="component === 'MonitorUser'" :params="params" :instance="instance" :dict="dict"
:permissions="permissions" @change="onChange"></MonitorUser>
<ApplyDetail v-else-if="component === 'ApplyDetail'" :params="params" :instance="instance" :dict="dict"
:permissions="permissions" @change="onChange"></ApplyDetail>
<ApplyAdd v-else-if="component === 'ApplyAdd'" :params="params" :instance="instance" :dict="dict"
:permissions="permissions" @change="onChange"></ApplyAdd>
</template> </template>
<script> <script>
@@ -32,39 +12,29 @@ import ApplyDetail from './components/ApplyDetail'
import ApplyAdd from './components/ApplyAdd' import ApplyAdd from './components/ApplyAdd'
import Family from './components/Family' import Family from './components/Family'
import MonitorUser from './components/MonitorUser' import MonitorUser from './components/MonitorUser'
import GmList from "./components/gmList";
export default { export default {
name: "AppGridMember", name: "AppGridMember",
label: "网格管理员", label: "网格管理员",
props: { props: {
instance: Function, instance: Function,
dict: Object, dict: Object,
permissions: Function permissions: Function
}, },
data() {
return {
component: "List",
params: {},
include: [],
currIndex: '0',
isShowDetail: false
};
},
computed: { computed: {
tabs() { currentPage() {
return [ let {hash} = this.$route
{label: '网格员信息', name: 'List', comp: List, permission: ''}, return hash == "#Family" ? Family :
{label: '申报信息', name: 'ApplyList', comp: ApplyList, permission: 'app_appgirdmemberapply_detail'} hash == "#MonitorUser" ? MonitorUser :
].filter(item => { hash == "#Add" ? Add :
return item.name !== 'ApplyList' || this.permissions(item.permission) hash == "#ApplyAdd" ? ApplyAdd :
}) hash == "#ApplyDetail" ? ApplyDetail :
GmList
} }
}, },
components: { components: {
GmList,
Add, Add,
List, List,
Family, Family,
@@ -76,46 +46,9 @@ export default {
methods: { methods: {
onChange(data) { onChange(data) {
if (data.type === "Add") { let {type, params: query} = data,
this.component = "Add" hash = ["ApplyList", "list"].includes(type) ? "" : "#" + type
this.isShowDetail = true this.$router.push({hash, query})
this.params = data.params
}
if (data.type === "Family") {
this.component = "Family"
this.isShowDetail = true
this.params = data.params
}
if (data.type === "MonitorUser") {
this.component = "MonitorUser"
this.isShowDetail = true
this.params = data.params
}
if (data.type === "ApplyDetail") {
this.component = "ApplyDetail"
this.isShowDetail = true
this.params = data.params
}
if (data.type === "ApplyAdd") {
this.component = "ApplyAdd"
this.isShowDetail = true
this.params = data.params
}
if (data.type === "list") {
this.component = "List"
this.isShowDetail = false
this.params = data.params
}
if (data.type === "ApplyList") {
this.component = "ApplyList"
this.isShowDetail = false
this.params = data.params
}
} }
} }
} }

11
project/grid/AppGridMember/components/ApplyAdd.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<ai-detail class="content-add"> <ai-detail class="content-add">
<template slot="title"> <template slot="title">
<ai-title :title="params.id ? '编辑' : '添加'" isShowBack isShowBottomBorder @onBackClick="cancel(false)"> <ai-title :title="$route.query.id ? '编辑' : '添加'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
</ai-title> </ai-title>
</template> </template>
<template slot="content"> <template slot="content">
@@ -35,7 +35,6 @@
props: { props: {
instance: Function, instance: Function,
dict: Object, dict: Object,
params: Object
}, },
data () { data () {
@@ -51,9 +50,9 @@
}, },
created () { created () {
if (this.params && this.params.id) { if ( this.$route.query.id) {
this.id = this.params.id this.id = this.$route.query.id
this.getInfo(this.params.id) this.getInfo(this.$route.query.id)
} }
}, },
@@ -76,7 +75,7 @@
this.isLoading = true this.isLoading = true
this.instance.post(`/app/appgirdmemberapply/addOrUpdate`, { this.instance.post(`/app/appgirdmemberapply/addOrUpdate`, {
...this.form, ...this.form,
id: this.params.id || '' id: this.$route.query.id || ''
}).then(res => { }).then(res => {
if (res.code == 0) { if (res.code == 0) {
this.$message.success('提交成功') this.$message.success('提交成功')

69
project/grid/AppGridMember/components/ApplyDetail.vue
View File

@@ -19,46 +19,45 @@
</template> </template>
<script> <script>
export default { export default {
name: 'ApplyDetail', name: 'ApplyDetail',
props: { props: {
instance: Function, instance: Function,
dict: Object, dict: Object,
params: Object },
data() {
return {
info: {},
id: ''
}
},
created() {
if (this.$route.query.id) {
this.id = this.$route.query.id
this.getInfo(this.$route.query.id)
}
},
methods: {
getInfo(id) {
this.instance.post(`/app/appgirdmemberapply/queryDetailById?id=${id}`).then(res => {
if (res.code === 0) {
this.info = res.data
}
})
}, },
data () { cancel(isRefresh) {
return { this.$emit('change', {
info: {}, type: 'ApplyList',
id: '' isRefresh: !!isRefresh
} })
},
created () {
if (this.params && this.params.id) {
this.id = this.params.id
this.getInfo(this.params.id)
}
},
methods: {
getInfo (id) {
this.instance.post(`/app/appgirdmemberapply/queryDetailById?id=${id}`).then(res => {
if (res.code === 0) {
this.info = res.data
}
})
},
cancel (isRefresh) {
this.$emit('change', {
type: 'ApplyList',
isRefresh: !!isRefresh
})
}
} }
} }
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

10
project/grid/AppGridMember/components/ApplyList.vue
View File

@@ -144,18 +144,14 @@
add (id) { add (id) {
this.$emit('change', { this.$emit('change', {
type: 'ApplyAdd', type: 'ApplyAdd',
params: { params: {id}
id: id || ''
}
}) })
}, },
toDetail (id) { toDetail (id) {
this.$emit('change', { this.$emit('change', {
type: 'ApplyDetail', type: 'ApplyDetail',
params: { params: {id}
id
}
}) })
}, },
@@ -176,4 +172,4 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
</style> </style>

18
project/grid/AppGridMember/components/Family.vue
View File

@@ -65,7 +65,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<ai-table-select :instance="instance" :action="`/app/appresident/list?householdName=1&areaId=${areaId}`" <ai-table-select :instance="instance" :action="`/app/appresident/list?householdName=1&areaId=${areaId}`"
@select="v=>chooseUser=v"/> @select="v=>chooseUser=v" multiple/>
</el-form-item> </el-form-item>
</el-form> </el-form>
</ai-dialog> </ai-dialog>
@@ -81,7 +81,6 @@ export default {
props: { props: {
instance: Function, instance: Function,
dict: Object, dict: Object,
params: Object
}, },
data() { data() {
@@ -118,19 +117,16 @@ export default {
computed: { computed: {
...mapState(['user']) ...mapState(['user'])
}, },
created() { created() {
this.areaId = this.user.info.areaId this.areaId = this.user.info.areaId
this.disabledLevel = this.user.info.areaList.length this.disabledLevel = this.user.info.areaList.length
this.dict.load('epidemicDangerousAreaLevel').then(() => { this.getGirdList()
this.getGirdList() this.getList()
this.getList() this.dict.load('epidemicDangerousAreaLevel')
})
}, },
methods: { methods: {
getGirdList() { getGirdList() {
this.instance.post(`/app/appgirdmemberinfo/queryMyGirdListByLevel2?girdMemberId=${this.params.id}`).then(res => { this.instance.post(`/app/appgirdmemberinfo/queryMyGirdListByLevel2?girdMemberId=${this.$route.query.id}`).then(res => {
if (res.code == 0) { if (res.code == 0) {
this.girdList = res.data this.girdList = res.data
} }
@@ -144,7 +140,7 @@ export default {
this.instance.post(`/app/appgirdmemberresident/listByGirdMember`, null, { this.instance.post(`/app/appgirdmemberresident/listByGirdMember`, null, {
params: { params: {
...this.search, ...this.search,
girdMemberId: this.params.id, girdMemberId: this.$route.query.id,
areaId: this.areaId areaId: this.areaId
} }
}).then(res => { }).then(res => {
@@ -175,7 +171,7 @@ export default {
const residentList = this.chooseUser.map(v => { const residentList = this.chooseUser.map(v => {
return { return {
girdMemberId: this.params.id, girdMemberId: this.$route.query.id,
name: v.name, name: v.name,
residentId: v.id, residentId: v.id,
girdId: this.girdId girdId: this.girdId

43
project/grid/AppGridMember/components/MonitorUser.vue
View File

@@ -66,7 +66,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<ai-table-select :instance="instance" :action="`/app/appresident/list?householdName=1&areaId=${areaId}`" <ai-table-select :instance="instance" :action="`/app/appresident/list?householdName=1&areaId=${areaId}`"
@select="v=>chooseUser=v"/> @select="v=>chooseUser=v" multiple/>
</el-form-item> </el-form-item>
</el-form> </el-form>
</ai-dialog> </ai-dialog>
@@ -83,7 +83,6 @@ export default {
props: { props: {
instance: Function, instance: Function,
dict: Object, dict: Object,
params: Object
}, },
data() { data() {
@@ -94,9 +93,7 @@ export default {
name: '', name: '',
girdId: '' girdId: ''
}, },
isLoading: false,
form: {}, form: {},
userList: [],
name: '', name: '',
chooseUser: [], chooseUser: [],
isShow: false, isShow: false,
@@ -129,13 +126,12 @@ export default {
this.dict.load('epidemicDangerousAreaLevel').then(() => { this.dict.load('epidemicDangerousAreaLevel').then(() => {
this.getGirdList() this.getGirdList()
this.getList() this.getList()
this.getUserList()
}) })
}, },
methods: { methods: {
getGirdList() { getGirdList() {
this.instance.post(`/app/appgirdmemberinfo/queryMyGirdListByLevel2?girdMemberId=${this.params.id}`).then(res => { this.instance.post(`/app/appgirdmemberinfo/queryMyGirdListByLevel2?girdMemberId=${this.$route.query.id}`).then(res => {
if (res.code == 0) { if (res.code == 0) {
this.girdList = res.data this.girdList = res.data
} }
@@ -149,7 +145,7 @@ export default {
this.instance.post(`/app/appgirdmemberpoverty/listByGirdMemberByWeb`, null, { this.instance.post(`/app/appgirdmemberpoverty/listByGirdMemberByWeb`, null, {
params: { params: {
...this.search, ...this.search,
girdMemberId: this.params.id, girdMemberId: this.$route.query.id,
} }
}).then(res => { }).then(res => {
if (res.code == 0) { if (res.code == 0) {
@@ -168,11 +164,6 @@ export default {
handleSelectionChange(e) { handleSelectionChange(e) {
this.ids = e.map(v => v.gmpId) this.ids = e.map(v => v.gmpId)
}, },
clearAll() {
this.chooseUser = []
},
onConfirm() { onConfirm() {
if (!this.girdId) { if (!this.girdId) {
return this.$message.error('请选择网格') return this.$message.error('请选择网格')
@@ -184,7 +175,7 @@ export default {
const povertyList = this.chooseUser.map(v => { const povertyList = this.chooseUser.map(v => {
return { return {
girdMemberId: this.params.id, girdMemberId: this.$route.query.id,
name: v.split('~')[0], name: v.split('~')[0],
girdId: this.girdId, girdId: this.girdId,
povertyId: v.split('~')[1] povertyId: v.split('~')[1]
@@ -207,38 +198,12 @@ export default {
this.girdId = '' this.girdId = ''
this.name = '' this.name = ''
this.areaId = this.user.info.areaId this.areaId = this.user.info.areaId
this.getUserList()
}, },
del(e) {
this.chooseUser.splice(this.chooseUser.indexOf(e), 1)
},
getUserList() {
this.isLoading = true
this.instance.post(`/app/apppreventionreturntopoverty/list`, null, {
params: {
current: 1,
size: 200,
con: this.name,
isHousehold: 1,
areaId: this.areaId
}
}).then(res => {
if (res.code == 0) {
this.userList = res.data.records
}
this.isLoading = false
})
},
onBack() { onBack() {
this.$emit('change', { this.$emit('change', {
type: 'list' type: 'list'
}) })
}, },
remove(ids) { remove(ids) {
this.$confirm('确定删除该数据？').then(() => { this.$confirm('确定删除该数据？').then(() => {
this.instance.post(`/app/appgirdmemberpoverty/delete`, null, { this.instance.post(`/app/appgirdmemberpoverty/delete`, null, {

289
project/grid/AppGridMember/components/add.vue
View File

@@ -6,22 +6,24 @@
</template> </template>
<template #content> <template #content>
<el-form <el-form
ref="rules" ref="rules"
:model="forms" :model="forms"
:rules="formRules" :rules="formRules"
size="small" size="small"
label-suffix="：" label-suffix="："
label-width="136px"> label-width="136px">
<ai-card title="基础信息" > <ai-edit-card
<template #right v-if="title=='网格员详情'"> <ai-card title="基础信息">
<template #right v-if="title=='网格员详情'">
<span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="editOne==false" @click="editOne=true">修改</span> <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="editOne==false" @click="editOne=true">修改</span>
<span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="searchDetail(),editOne=false">取消</span> <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true"
@click="searchDetail(),editOne=false">取消</span>
<span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="save()">保存</span> <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="save()">保存</span>
</template> </template>
<template slot="content"> <template slot="content">
<div class="above" v-if="editOne==true"> <div class="above" v-if="editOne==true">
<div class="left"> <div class="left">
<el-form-item label="网格员姓名" prop="name" > <el-form-item label="网格员姓名" prop="name">
<el-input v-model="forms.name" placeholder="请选择网格员" disabled> <el-input v-model="forms.name" placeholder="请选择网格员" disabled>
<template #append> <template #append>
<ai-wechat-selecter :isMultiple="false" refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson"> <ai-wechat-selecter :isMultiple="false" refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson">
@@ -30,30 +32,30 @@
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="选用日期" prop="selectionDate" > <el-form-item label="选用日期" prop="selectionDate">
<el-date-picker <el-date-picker
v-model="forms.selectionDate" v-model="forms.selectionDate"
type="date" type="date"
style="width: 100%" style="width: 100%"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
size="medium" size="medium"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="idNumber" > <el-form-item label="身份证号" prop="idNumber">
<el-input v-model="forms.idNumber" placeholder="请输入…" maxlength="18" show-word-limit></el-input> <el-input v-model="forms.idNumber" placeholder="请输入…" maxlength="18" show-word-limit></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="right"> <div class="right">
<el-form-item label="照片" prop="photo"> <el-form-item label="照片" prop="photo">
<!-- <ai-uploader :instance="instance" v-model="photoList" :limit="1" @change="photoChange"></ai-uploader> --> <!-- <ai-uploader :instance="instance" v-model="photoList" :limit="1" @change="photoChange"></ai-uploader> -->
<ai-avatar :instance="instance" v-model="forms.photo"/> <ai-avatar :instance="instance" v-model="forms.photo"/>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div class="above" v-if="editOne==true"> <div class="above" v-if="editOne==true">
<div class="left"> <div class="left">
<el-form-item label="出生日期" prop="birthday" > <el-form-item label="出生日期" prop="birthday">
<el-date-picker <el-date-picker
v-model="forms.birthday" v-model="forms.birthday"
type="date" type="date"
@@ -63,70 +65,72 @@
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="phone" > <el-form-item label="联系电话" prop="phone">
<el-input v-model.number="forms.phone" placeholder="请输入…" maxlength="11" show-word-limit></el-input> <el-input v-model.number="forms.phone" placeholder="请输入…" maxlength="11" show-word-limit></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="right"> <div class="right">
<el-form-item label="性别" prop="sex" > <el-form-item label="性别" prop="sex">
<el-select size="medium" style="width: 100%" v-model="forms.sex" placeholder="请选择..." clearable> <el-select size="medium" style="width: 100%" v-model="forms.sex" placeholder="请选择..." clearable>
<el-option <el-option
v-for="(item,i) in dict.getDict('sex')" v-for="(item,i) in dict.getDict('sex')"
:key="i" :key="i"
:label="item.dictName" :label="item.dictName"
:value="item.dictValue" :value="item.dictValue"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="电子邮箱" prop="mail" > <el-form-item label="电子邮箱" prop="mail">
<el-input v-model="forms.mail" placeholder="请输入…"></el-input> <el-input v-model="forms.mail" placeholder="请输入…"></el-input>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<template v-if="editOne==false"> <template v-if="editOne==false">
<div class="above"> <div class="above">
<div class="left"> <div class="left">
<ai-wrapper label-width="120px" :columnsNumber="1" style="margin-top: 16px;"> <ai-wrapper label-width="120px" :columnsNumber="1" style="margin-top: 16px;">
<ai-info-item label="网格员姓名："><span >{{forms.name}}</span></ai-info-item> <ai-info-item label="网格员姓名："><span>{{ forms.name }}</span></ai-info-item>
<ai-info-item label="选用日期："><span >{{forms.selectionDate}}</span></ai-info-item> <ai-info-item label="选用日期："><span>{{ forms.selectionDate }}</span></ai-info-item>
<ai-info-item label="身份证号："><span >{{forms.idNumber}}</span></ai-info-item> <ai-info-item label="身份证号："><span>{{ forms.idNumber }}</span></ai-info-item>
<ai-info-item label="性别："><span >{{dict.getLabel('sex', forms.sex)}}</span></ai-info-item> <ai-info-item label="性别："><span>{{ dict.getLabel('sex', forms.sex) }}</span></ai-info-item>
<ai-info-item label="出生日期："><span >{{forms.birthday}}</span></ai-info-item> <ai-info-item label="出生日期："><span>{{ forms.birthday }}</span></ai-info-item>
<ai-info-item label="电子邮箱："><span >{{forms.mail}}</span></ai-info-item> <ai-info-item label="电子邮箱："><span>{{ forms.mail }}</span></ai-info-item>
</ai-wrapper> </ai-wrapper>
</div> </div>
<div class="right"> <div class="right">
<ai-wrapper label-width="120px" :columnsNumber="1" style="margin-top: 16px;"> <ai-wrapper label-width="120px" :columnsNumber="1" style="margin-top: 16px;">
<ai-info-item label="照片：" v-if="forms.photo"> <ai-info-item label="照片：" v-if="forms.photo">
<span > <span>
<ai-uploader :instance="instance" v-model="photoList" disabled :limit="1" @change="photoChange"></ai-uploader> <ai-uploader :instance="instance" v-model="photoList" disabled :limit="1" @change="photoChange"></ai-uploader>
</span> </span>
</ai-info-item> </ai-info-item>
<ai-info-item label="联系电话："><span >{{forms.phone}}</span></ai-info-item> <ai-info-item label="联系电话："><span>{{ forms.phone }}</span></ai-info-item>
</ai-wrapper> </ai-wrapper>
</div> </div>
</div> </div>
</template> </template>
</template> </template>
</ai-card> </ai-card>
<ai-card title="关联信息" > <ai-card title="关联信息">
<template #right v-if="title=='网格员详情'"> <template #right v-if="title=='网格员详情'">
<span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="editTwo==false" @click="editTwo=true">修改</span> <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="editTwo==false" @click="editTwo=true">修改</span>
<span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editTwo==true" @click="searchDetail(),editTwo=false">取消</span> <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editTwo==true"
@click="searchDetail(),editTwo=false">取消</span>
<span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editTwo==true" @click="save()">保存</span> <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editTwo==true" @click="save()">保存</span>
</template> </template>
<template slot="content"> <template slot="content">
<template v-if="editTwo==true"> <template v-if="editTwo==true">
<el-form-item label="责任网格" prop="girdInfoList" style="margin-top: 8px;"> <el-form-item label="责任网格" prop="girdInfoList" style="margin-top: 8px;">
<el-form-item style="width: 100%" label-width="80px" :label="'网格' + (index + 1)" v-for="(item, index) in forms.girdInfoList" :key="'选项' + (index + 1)"> <el-form-item style="width: 100%" label-width="80px" :label="'网格' + (index + 1)" v-for="(item, index) in forms.girdInfoList"
:key="'选项' + (index + 1)">
<div class="form-flex"> <div class="form-flex">
<el-select v-model="item.checkType" placeholder="请选择网格角色"> <el-select v-model="item.checkType" placeholder="请选择网格角色">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-input disabled v-model="item.girdName" :maxlength="200" size="small" placeholder="请选择责任网格"> <el-input disabled v-model="item.girdName" :maxlength="200" size="small" placeholder="请选择责任网格">
@@ -142,13 +146,13 @@
</el-form-item> </el-form-item>
<div class="above"> <div class="above">
<div class="left"> <div class="left">
<el-form-item label="是否特殊网格员" prop="isGirdMember" > <el-form-item label="是否特殊网格员" prop="isGirdMember">
<el-radio-group v-model="forms.isGirdMember"> <el-radio-group v-model="forms.isGirdMember">
<el-radio label="0">否</el-radio> <el-radio label="0">否</el-radio>
<el-radio label="1">是</el-radio> <el-radio label="1">是</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="政治面貌" prop="politicsStatus" > <el-form-item label="政治面貌" prop="politicsStatus">
<el-select v-model="forms.politicsStatus" size="small" style="width: 100%" placeholder="请选择..." clearable> <el-select v-model="forms.politicsStatus" size="small" style="width: 100%" placeholder="请选择..." clearable>
<el-option v-for="(item,i) in dict.getDict('politicsStatus')" :key="i" :label="item.dictName" :value="item.dictValue"></el-option> <el-option v-for="(item,i) in dict.getDict('politicsStatus')" :key="i" :label="item.dictName" :value="item.dictValue"></el-option>
</el-select> </el-select>
@@ -160,31 +164,31 @@
<el-option v-for="(item,i) in dict.getDict('girdMemberType')" :key="i" :label="item.dictName" :value="item.dictValue"></el-option> <el-option v-for="(item,i) in dict.getDict('girdMemberType')" :key="i" :label="item.dictName" :value="item.dictValue"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="学历" prop="education" > <el-form-item label="学历" prop="education">
<el-select v-model="forms.education" style="width: 100%" size="small" placeholder="请选择..." clearable> <el-select v-model="forms.education" style="width: 100%" size="small" placeholder="请选择..." clearable>
<el-option v-for="(item,i) in dict.getDict('education')" :key="i" :label="item.dictName" :value="item.dictValue"></el-option> <el-option v-for="(item,i) in dict.getDict('education')" :key="i" :label="item.dictName" :value="item.dictValue"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<el-form-item label="个人简介" prop="introduction" > <el-form-item label="个人简介" prop="introduction">
<el-input <el-input
type="textarea" type="textarea"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
:rows="4" :rows="4"
placeholder="请输入内容" placeholder="请输入内容"
v-model="forms.introduction"> v-model="forms.introduction">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="人生格言" prop="motto" > <el-form-item label="人生格言" prop="motto">
<el-input <el-input
type="textarea" type="textarea"
maxlength="200" maxlength="200"
show-word-limit show-word-limit
:rows="4" :rows="4"
placeholder="请输入内容" placeholder="请输入内容"
v-model="forms.motto"> v-model="forms.motto">
</el-input> </el-input>
</el-form-item> </el-form-item>
</template> </template>
@@ -194,39 +198,40 @@
<ai-info-item label="是否特殊网格员："> <ai-info-item label="是否特殊网格员：">
<span>{{ !forms.isGirdMember ? '-' : forms.isGirdMember === '0' ? '否' : '是' }}</span> <span>{{ !forms.isGirdMember ? '-' : forms.isGirdMember === '0' ? '否' : '是' }}</span>
</ai-info-item> </ai-info-item>
<ai-info-item label="特殊网格员：" v-if="forms.isGirdMember==1"><span >{{dict.getLabel('girdMemberType', forms.girdMemberType)}}</span></ai-info-item> <ai-info-item label="特殊网格员：" v-if="forms.isGirdMember==1"><span>{{ dict.getLabel('girdMemberType', forms.girdMemberType) }}</span>
<ai-info-item label="政治面貌："><span >{{dict.getLabel('politicsStatus', forms.politicsStatus)}}</span></ai-info-item> </ai-info-item>
<ai-info-item label="学历："><span >{{dict.getLabel('education', forms.education)}}</span></ai-info-item> <ai-info-item label="政治面貌："><span>{{ dict.getLabel('politicsStatus', forms.politicsStatus) }}</span></ai-info-item>
<ai-info-item label="人生格言：" style="width: 100%;"><span >{{forms.motto}}</span></ai-info-item> <ai-info-item label="学历："><span>{{ dict.getLabel('education', forms.education) }}</span></ai-info-item>
<ai-info-item label="个人简介：" style="width: 100%;"><span >{{forms.introduction}}</span></ai-info-item> <ai-info-item label="人生格言：" style="width: 100%;"><span>{{ forms.motto }}</span></ai-info-item>
<ai-info-item label="个人简介：" style="width: 100%;"><span>{{ forms.introduction }}</span></ai-info-item>
</ai-wrapper> </ai-wrapper>
</template> </template>
</template> </template>
</ai-card> </ai-card>
</el-form> </el-form>
<ai-dialog title="选择网格" :visible.sync="showGrid" :customFooter="true" :destroyOnClose="true" border width="720px"> <ai-dialog title="选择网格" :visible.sync="showGrid" :customFooter="true" :destroyOnClose="true" border width="720px">
<div class="grid"> <div class="grid">
<el-tree <el-tree
:data="treeObj.treeList" :data="treeObj.treeList"
:props="treeObj.defaultProps" :props="treeObj.defaultProps"
node-key="id" node-key="id"
ref="tree" ref="tree"
:check-strictly="true" :check-strictly="true"
show-checkbox show-checkbox
:default-checked-keys="currCheckedKeys" :default-checked-keys="currCheckedKeys"
default-expand-all default-expand-all
@check="onCheckChange"> @check="onCheckChange">
</el-tree> </el-tree>
</div> </div>
<div class="dialog-footer" slot="footer" > <div class="dialog-footer" slot="footer">
<el-button size="medium" @click="showGrid=false">取消</el-button> <el-button size="medium" @click="showGrid=false">取消</el-button>
<el-button type="primary" size="medium" @click="getCheckedTree()">确认</el-button> <el-button type="primary" size="medium" @click="getCheckedTree()">确认</el-button>
</div> </div>
</ai-dialog> </ai-dialog>
</template> </template>
<template #footer v-if="title=='添加网格员'"> <template #footer v-if="title=='添加网格员'">
<el-button @click="cancel(false)" class="delete-btn footer-btn" >取 消</el-button> <el-button @click="cancel(false)" class="delete-btn footer-btn">取 消</el-button>
<el-button type="primary" @click="save()" class="footer-btn">提 交</el-button> <el-button type="primary" @click="save()" class="footer-btn">提 交</el-button>
</template> </template>
</ai-detail> </ai-detail>
</section> </section>
@@ -239,7 +244,6 @@ export default {
instance: Function, instance: Function,
dict: Object, dict: Object,
permissions: Function, permissions: Function,
params: Object,
}, },
data() { data() {
return { return {
@@ -290,7 +294,7 @@ export default {
}, },
created() { created() {
this.beforeSelectTree() this.beforeSelectTree()
if (this.params.id) { if (this.$route.query.id) {
this.searchDetail(); this.searchDetail();
this.title = "网格员详情"; this.title = "网格员详情";
this.editOne = false; this.editOne = false;
@@ -302,7 +306,7 @@ export default {
} }
}, },
computed: { computed: {
currCheckedKeys () { currCheckedKeys() {
if (this.forms && this.forms.girdInfoList && this.forms.girdInfoList[this.currIndex] && this.forms.girdInfoList[this.currIndex].id) { if (this.forms && this.forms.girdInfoList && this.forms.girdInfoList[this.currIndex] && this.forms.girdInfoList[this.currIndex].id) {
return [this.forms.girdInfoList[this.currIndex].id] return [this.forms.girdInfoList[this.currIndex].id]
} }
@@ -324,14 +328,14 @@ export default {
}; };
return { return {
name: [ name: [
{ required: true, message: "请输入网格员姓名", trigger: "change" }, {required: true, message: "请输入网格员姓名", trigger: "change"},
], ],
selectionDate: [ selectionDate: [
{ required: true, message: "请选择选用日期", trigger: "change" }, {required: true, message: "请选择选用日期", trigger: "change"},
], ],
phone: [{ required: true, validator: phonePass, trigger: "blur" }], phone: [{required: true, validator: phonePass, trigger: "blur"}],
girdInfoList: [ girdInfoList: [
{ required: true, message: "请选择责任网络", trigger: "change" }, {required: true, message: "请选择责任网络", trigger: "change"},
], ],
mail: [ mail: [
{ {
@@ -344,14 +348,14 @@ export default {
}, },
}, },
methods: { methods: {
cancel (isRefresh) { cancel(isRefresh) {
this.$emit('change', { this.$emit('change', {
type: 'list', type: 'list',
isRefresh: !!isRefresh, isRefresh: !!isRefresh,
}) })
}, },
onCheckChange (e) { onCheckChange(e) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.tree.getCheckedKeys().forEach(v => { this.$refs.tree.getCheckedKeys().forEach(v => {
this.$refs.tree.setChecked(v, false) this.$refs.tree.setChecked(v, false)
@@ -360,11 +364,11 @@ export default {
}) })
}, },
removeGrid (index) { removeGrid(index) {
this.forms.girdInfoList.splice(index, 1) this.forms.girdInfoList.splice(index, 1)
}, },
addGrid () { addGrid() {
this.forms.girdInfoList.push({ this.forms.girdInfoList.push({
id: '', id: '',
girdName: '', girdName: '',
@@ -375,7 +379,7 @@ export default {
this.forms.photo = val[0].url; this.forms.photo = val[0].url;
}, },
getSelectPerson(val) { getSelectPerson(val) {
if(val.length){ if (val.length) {
this.forms.name = val[0].name; this.forms.name = val[0].name;
this.forms.phone = val[0].phone; this.forms.phone = val[0].phone;
this.forms.userId = val[0].sysUserId this.forms.userId = val[0].sysUserId
@@ -428,7 +432,7 @@ export default {
} }
} }
this.instance.post(`/app/appgirdmemberinfo/addOrUpdate`,{ this.instance.post(`/app/appgirdmemberinfo/addOrUpdate`, {
...this.forms, ...this.forms,
girdInfoListStr: this.forms.girdInfoList.map(v => v.girdName).join(',') girdInfoListStr: this.forms.girdInfoList.map(v => v.girdName).join(',')
}).then((res) => { }).then((res) => {
@@ -448,31 +452,30 @@ export default {
}); });
}, },
searchDetail() { searchDetail() {
this.instance let {id} = this.$route.query
.post(`/app/appgirdmemberinfo/queryDetailById`, null, { this.instance.post(`/app/appgirdmemberinfo/queryDetailById`, null, {
params: { id: this.params.id }, params: {id}
}) }).then((res) => {
.then((res) => { if (res.code == 0) {
if (res.code == 0) { this.forms = {
this.forms = { ...res.data,
...res.data, girdInfoList: res.data.girdInfoList || []
girdInfoList: res.data.girdInfoList || [] };
}; this.users = [{
this.users = [{ name: res.data.name,
name: res.data.name, phone: res.data.phone,
phone: res.data.phone, userId: res.data.id,
userId: res.data.id, id: res.data.wxUserId
id: res.data.wxUserId }]
}] this.girdInfoStr = ''
this.girdInfoStr = '' this.photoList = [{url: this.forms.photo}];
this.photoList = [{ url: this.forms.photo }]; if (res.data.girdInfoList) {
if (res.data.girdInfoList) { res.data.girdInfoList.forEach((e) => {
res.data.girdInfoList.forEach((e) => { this.girdInfoStr = this.girdInfoStr + `${e.checkType === '1' ? '网格员' : '网格长'}-${e.girdName}&emsp;`
this.girdInfoStr = this.girdInfoStr + `${e.checkType === '1' ? '网格员' : '网格长'}-${e.girdName}&emsp;` })
})
}
} }
}); }
});
}, },
}, },
}; };
@@ -482,26 +485,28 @@ export default {
.add { .add {
height: 100%; height: 100%;
.form-flex { .form-flex {
display: flex; display: flex;
align-items: center; align-items: center;
& > .el-button { & > .el-button {
margin-left: 20px; margin-left: 20px;
}
.el-input {
width: 300px;
margin-left: 20px;
}
::v-deep .el-form-item__content {
margin-left: 0!important;
}
} }
.el-input {
width: 300px;
margin-left: 20px;
}
::v-deep .el-form-item__content {
margin-left: 0 !important;
}
}
.ai-detail__title { .ai-detail__title {
background-color: #fff; background-color: #fff;
} }
.ai-detail__content { .ai-detail__content {
.ai-detail__content--wrapper { .ai-detail__content--wrapper {
.el-form { .el-form {
@@ -511,9 +516,11 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
.el-form-item { .el-form-item {
width: 48%; width: 48%;
} }
.buildingTypes { .buildingTypes {
width: 100%; width: 100%;
} }
@@ -521,16 +528,20 @@ export default {
} }
} }
} }
::v-deep .el-tag { ::v-deep .el-tag {
margin-right: 8px; margin-right: 8px;
color: #333333; color: #333333;
} }
.footer-btn { .footer-btn {
width: 92px; width: 92px;
} }
.above{
.above {
display: flex; display: flex;
.left, .right{
.left, .right {
flex: 1; flex: 1;
} }
} }

55
project/grid/AppGridMember/components/gmList.vue Normal file
View File

@@ -0,0 +1,55 @@
<template>
<section class="gmList">
<ai-list class="AppGridMember">
<template slot="title">
<ai-title title="网格员管理" :isShowBottomBorder="false"></ai-title>
</template>
<template slot="tabs">
<el-tabs v-model="currIndex">
<el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
<component :ref="String(i)" v-if="currIndex == i" :is="tab.comp" lazy :instance="instance"
:dict="dict" :permissions="permissions" v-on="$listeners"/>
</el-tab-pane>
</el-tabs>
</template>
</ai-list>
</section>
</template>
<script>
import List from "./list";
import ApplyList from "./ApplyList";
export default {
name: "gmList",
props: {
instance: Function,
dict: Object,
permissions: Function
},
computed: {
tabs() {
return [
{label: '网格员信息', name: 'List', comp: List, permission: ''},
{label: '申报信息', name: 'ApplyList', comp: ApplyList, permission: 'app_appgirdmemberapply_detail'}
].filter(item => {
return item.name !== 'ApplyList' || this.permissions(item.permission)
})
}
},
data() {
return {
currIndex: '0',
}
},
methods: {},
created() {
}
}
</script>
<style lang="scss" scoped>
.gmList {
height: 100%;
}
</style>

2
project/grid/AppGridMember/components/list.vue
View File

@@ -143,7 +143,6 @@ export default {
} }
}) })
}, },
toMonitorUser(id) { toMonitorUser(id) {
this.$emit('change', { this.$emit('change', {
type: 'MonitorUser', type: 'MonitorUser',
@@ -152,7 +151,6 @@ export default {
} }
}) })
}, },
toFamily(id) { toFamily(id) {
this.$emit('change', { this.$emit('change', {
type: 'Family', type: 'Family',