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

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

Browse Source
This commit is contained in:
yanran200730
2022-03-29 16:31:17 +08:00
parent 6aa4d5a6d8 abd55bd413
commit 6c338a5dd4
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/jianping/AppHelpedResident/hrAdd.vue
View File

@@ -221,7 +221,7 @@ export default {
sex: [{required: true, message: "请选择性别"}],
phone: [{required: true, message: "请输入联系方式"}],
currentAreaId: [
{required: true, message: "请选择户籍地"},
{required: true, message: "请选择现住址"},
{pattern: /[^0]0{0,2}$/, message: "请选择到村/社区"},
],
isHousehold: [{required: true, message: "请选择是否户主"}],

13
packages/jianping/AppHelpedResident/hrDetail.vue
View File

@@ -10,18 +10,18 @@
<template v-if="/1/.test(detail.status)">
<el-button type="primary" @click="handleRelieve(1)" v-if="isGridAdmin">解除风险</el-button>
<el-button type="primary" @click="handleRelieve()" v-else>申请解除风险</el-button>
<el-button type="primary" icon="iconfont iconEdit" @click="gotoEdit">编辑</el-button>
<el-button v-if="isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
</template>
<template v-if="/2/.test(detail.status)&&isGridAdmin">
<el-button type="primary" @click="handleRelieve(1)" >解除风险</el-button>
<el-button type="primary" @click="handleRelieve(1)">解除风险</el-button>
<el-button type="primary" @click="handleRelieve(0)">继续监测</el-button>
</template>
<template v-if="/3/.test(detail.status)&&isGridAdmin">
<el-button type="primary" @click="handleAccept(1)">纳入监测</el-button>
<el-button v-if="isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
</template>
<el-button v-if="/[1]/g.test(detail.status)" type="primary" icon="iconfont iconEdit" @click="gotoEdit">
编辑
</el-button>
<el-button v-if="/[134]/g.test(detail.status)&&isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">
<el-button v-if="/4/g.test(detail.status)" icon="iconfont iconDelete" @click="handleDelete(detail.id)">
删除
</el-button>
</template>
@@ -278,6 +278,9 @@ export default {
}).then(res => {
if (res?.data) {
this.detail = res.data
this.detail.family.map(e => {
e.householdRelation = e.householdRelation || "户主"
})
}
})
},