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

Merge remote-tracking branch 'origin/dev' into vite

Browse Source
This commit is contained in:
aixianling
2022-04-28 08:56:10 +08:00
parent bd512c3caa 7c13051ce1
commit 2174909bb8
2 changed files with 65 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/jianping/AppHelpedResident/detail/hrLog.vue
View File

@@ -14,7 +14,7 @@
<p>操作类型：{{row.operationDesc}}</p>
<div class="content" v-text="row.detail"/>
<ai-uploader v-model="row.files" disabled/>
<div class="btns">
<div class="btns" v-if="row.bizType == 0">
<el-button type="text" @click="handleEdit(row)" v-if="$permissions('app_apppreventionreturntopovertylog_edit')">编辑</el-button>
<el-button type="text" @click="handleDelete(row.id)" v-if="$permissions('app_apppreventionreturntopovertylog_del')">删除</el-button>
</div>

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

@@ -7,15 +7,18 @@
<template v-if="isGridAdmin">
<el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 0 && girdAdminApplyStatus != 1">纳入监测</el-button>
<el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="detail.status == 0 && girdAdminApplyStatus == 1">纳入监测审批</el-button>
<el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 4 && girdAdminApplyStatus != 1">纳入监测</el-button>
<el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="detail.status == 4 && girdAdminApplyStatus == 1">纳入监测审批</el-button>
<el-button type="primary" @click="applyMonitor('解除风险', 4)" v-if="detail.status == 1">解除风险</el-button>
<el-button type="primary" @click="examine('解除风险审批', 5)" v-if="detail.status == 2">解除风险审批</el-button>
<el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 3">纳入监测</el-button>
</template>
<template v-else>
<template v-if="user.info.girdCheckType == 1">
<el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 3">申请纳入监测</el-button>
<el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 4">申请纳入监测</el-button>
<el-button type="primary" @click="applyMonitor('申请解除风险', 3)" v-if="detail.status == 1">申请解除风险</el-button>
</template>
<el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && /4/g.test(detail.status)" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
<el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && /4/g.test(detail.status) && user.info.girdCheckType != 0" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
</template>
</ai-title>
<template #content>
@@ -122,7 +125,9 @@
</div>
<el-form-item label="义务阶段未上学原因">{{detail.dropOutOfSchoolReason}}</el-form-item>
<el-form-item label="备注说明">{{detail.detail}}</el-form-item>
<el-form-item label="图片" ><ai-uploader disabled v-model="detail.files"></ai-uploader></el-form-item>
<el-form-item label="图片">
<ai-uploader disabled v-model="detail.files"></ai-uploader>
</el-form-item>
</template>
</ai-card>
<ai-card title="家庭收支情况">
@@ -694,12 +699,8 @@ export default {
if (this.changeStatus == 1 || this.changeStatus == 4) { //网格长直接纳入监测/解除风险
this.applyInfo.pass = 1
}
var url = ''
if (this.changeStatus == 0 || this.changeStatus == 1) { //纳入监测
url = `/app/apppreventionreturntopoverty/examine`
}
if (this.changeStatus == 3 || this.changeStatus == 4) { //解除风险
var url = `/app/apppreventionreturntopoverty/examine` //0, 1纳入监测
if (this.changeStatus == 3 || this.changeStatus == 4) { //3, 4解除风险
url = `/app/apppreventionreturntopoverty/relieve`
}
@@ -739,7 +740,11 @@ export default {
this.examineFrom.files = ids.join(',')
}
this.examineFrom.id = this.detail.id
this.instance.post(`/app/apppreventionreturntopoverty/relieve`, null, { params: this.examineFrom }).then(res => {
var url = `/app/apppreventionreturntopoverty/examine` //2 纳入监测
if (this.changeStatus == 5) { //5 解除风险
url = `/app/apppreventionreturntopoverty/relieve`
}
this.instance.post(url, null, { params: this.examineFrom }).then(res => {
if (res.code == 0) {
this.getDetail()
this.$message.success('提交成功!');
@@ -759,66 +764,15 @@ export default {
}
this.isShowExamine = false
},
handleDelete(ids) {
this.$confirm("是否要删除监测对象")
.then(() => {
this.instance
.post("/app/apppreventionreturntopoverty/delete", null, {
params: { ids: ids?.toString() },
})
.then((res) => {
this.$confirm("是否要删除监测对象").then(() => {
this.instance.post("/app/apppreventionreturntopoverty/delete", null, { params: { ids: ids?.toString() }, }).then((res) => {
if (res?.code == 0) {
this.$message.success("删除成功!");
this.back();
}
});
})
.catch(() => 0);
},
handleAccept(pass) {
let msg =
pass == 0
? "是否驳回纳入监测对象申请?"
: `是否${isNaN(pass) ? "(申请)" : ""}纳入监测对象?`,
{ id } = this.detail;
this.$confirm(msg)
.then(() => {
this.instance
.post("/app/apppreventionreturntopoverty/examine", null, {
params: { pass, id },
})
.then((res) => {
if (res?.code == 0) {
this.$message.success("审批提交成功!");
this.back();
}
});
})
.catch(() => 0);
},
handleRelieve(pass) {
let { id } = this.detail,
msg =
pass == 0
? `是否继续监测对象`
: `是否${isNaN(pass) ? "(申请)" : ""}解除监测对象`;
this.$confirm(msg)
.then(() => {
this.instance
.post("/app/apppreventionreturntopoverty/relieve", null, {
params: { pass, id },
})
.then((res) => {
if (res?.code == 0) {
this.$message.success("审批提交成功!");
this.back();
}
});
})
.catch(() => 0);
},
},
created() {
@@ -860,6 +814,7 @@ export default {
font-size: 100px;
}
p {
text-align: center;
font-size: 16px;
padding-top: 20px;
color: #000;