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 13:41:42 +08:00
parent 47c52e3ef7 4c4240e3c8
commit 92853d3f5e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,6 +219,7 @@ export default {
idNumber: [{required: true, message: "请输入身份证号"}], idNumber: [{required: true, message: "请输入身份证号"}],
name: [{required: true, message: "请输入姓名"}], name: [{required: true, message: "请输入姓名"}],
sex: [{required: true, message: "请选择性别"}], sex: [{required: true, message: "请选择性别"}],
phone: [{required: true, message: "请输入联系方式"}],
currentAreaId: [ currentAreaId: [
{required: true, message: "请选择户籍地"}, {required: true, message: "请选择户籍地"},
{pattern: /[^0]0{0,2}$/, message: "请选择到村/社区"}, {pattern: /[^0]0{0,2}$/, message: "请选择到村/社区"},

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

@@ -11,17 +11,17 @@
<el-button type="primary" @click="handleRelieve(1)" v-if="isGridAdmin">解除风险</el-button> <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" @click="handleRelieve()" v-else>申请解除风险</el-button>
</template> </template>
<template v-if="/2/.test(detail.status)"> <template v-if="/2/.test(detail.status)&&isGridAdmin">
<el-button type="primary" @click="handleRelieve(1)" v-if="isGridAdmin">解除风险</el-button> <el-button type="primary" @click="handleRelieve(1)" >解除风险</el-button>
<el-button type="primary" @click="handleRelieve(0)">继续监测</el-button> <el-button type="primary" @click="handleRelieve(0)">继续监测</el-button>
</template> </template>
<template v-if="/3/.test(detail.status)"> <template v-if="/3/.test(detail.status)&&isGridAdmin">
<el-button type="primary" @click="handleAccept(1)">纳入监测</el-button> <el-button type="primary" @click="handleAccept(1)">纳入监测</el-button>
</template> </template>
<el-button v-if="/[1]/g.test(detail.status)" type="primary" icon="iconfont iconEdit" @click="gotoEdit"> <el-button v-if="/[1]/g.test(detail.status)" type="primary" icon="iconfont iconEdit" @click="gotoEdit">
编辑 编辑
</el-button> </el-button>
<el-button v-if="/[134]/g.test(detail.status)" icon="iconfont iconDelete" @click="handleDelete(detail.id)"> <el-button v-if="/[134]/g.test(detail.status)&&isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">
删除 删除
</el-button> </el-button>
</template> </template>