diff --git a/packages/jianping/AppHelpedResident/detail/hrLog.vue b/packages/jianping/AppHelpedResident/detail/hrLog.vue index 6d1735b9..7662a8a2 100644 --- a/packages/jianping/AppHelpedResident/detail/hrLog.vue +++ b/packages/jianping/AppHelpedResident/detail/hrLog.vue @@ -14,7 +14,7 @@

操作类型：{{row.operationDesc}}

-
+
编辑 删除
diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue index ff7ef4c0..073bb911 100644 --- a/packages/jianping/AppHelpedResident/hrDetail.vue +++ b/packages/jianping/AppHelpedResident/hrDetail.vue @@ -7,15 +7,18 @@ - @@ -186,38 +191,38 @@ - + - +
- + - + - + - + - + - + - + - +
@@ -230,7 +235,7 @@ - + @@ -245,48 +250,48 @@
- + - + - + - + - + - +
- +
- + - + - +
- + - + @@ -497,22 +502,22 @@ export default { }, guaranteeCheckList() { return [ - {label: '享受农村最低生活保障', value: 0}, - {label: '是否特困供养人员', value: 1}, - {label: '分散供养五保户转集中供养（减少）', value: 2}, - {label: '是否接受医疗救助', value: 3}, - {label: '是否接受其它健康扶贫', value: 4}, + { label: '享受农村最低生活保障', value: 0 }, + { label: '是否特困供养人员', value: 1 }, + { label: '分散供养五保户转集中供养（减少）', value: 2 }, + { label: '是否接受医疗救助', value: 3 }, + { label: '是否接受其它健康扶贫', value: 4 }, ] }, basicsCheckList() { return [ - {label: '城乡居民基本医疗保险', value: 0}, - {label: '城镇职工基本医疗保险', value: 1}, - {label: '大病保险', value: 2}, - {label: '商业补充医疗保险', value: 3}, - {label: '城乡居民基本养老保险', value: 4}, - {label: '城镇职工基本养老保险', value: 5}, - {label: '享受人身意外保险补贴', value: 6}, + { label: '城乡居民基本医疗保险', value: 0 }, + { label: '城镇职工基本医疗保险', value: 1 }, + { label: '大病保险', value: 2 }, + { label: '商业补充医疗保险', value: 3 }, + { label: '城乡居民基本养老保险', value: 4 }, + { label: '城镇职工基本养老保险', value: 5 }, + { label: '享受人身意外保险补贴', value: 6 }, ] }, }, @@ -521,7 +526,7 @@ export default { detail: {}, currentTab: "", isShowAdd: false, - form: { healthyStatusList: [],basicsList: [], guaranteeList: []}, + form: { healthyStatusList: [], basicsList: [], guaranteeList: [] }, isEdit: false, isShowDetail: false, familyInfo: {}, @@ -622,10 +627,10 @@ export default { if (this.form.healthyStatusList.length) { this.form.healthyStatus = this.form.healthyStatusList.join(',') } - if(this.form.basicsList.length) { + if (this.form.basicsList.length) { this.form.basicsCheck = this.form.basicsList.join(',') } - if(this.form.guaranteeList.length) { + if (this.form.guaranteeList.length) { this.form.guaranteeCheck = this.form.basicsList.join(',') } this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => { @@ -661,10 +666,10 @@ export default { if (this.detail.healthyStatus) { this.detail.healthyStatusList = this.detail.healthyStatus.split(',') } - if(this.detail.basicsCheck) { + if (this.detail.basicsCheck) { this.detail.basicsList = this.detail.basicsCheck.split(',') } - if(this.detail.guaranteeCheck) { + if (this.detail.guaranteeCheck) { this.detail.guaranteeList = this.detail.guaranteeCheck.split(',') } @@ -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) => { - 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); + 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(); + } + }); + }) }, }, created() { @@ -860,6 +814,7 @@ export default { font-size: 100px; } p { + text-align: center; font-size: 16px; padding-top: 20px; color: #000;