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

This commit is contained in:
aixianling
2022-06-13 22:27:40 +08:00

View File

@@ -63,19 +63,21 @@ export default {
riskType: this.riskType,
riskEliminationMethod: this.riskEliminationMethod,
}
// 0待纳入、1监测中、2待解除、3已解除、4已驳回
if(this.pass == 1) { // 网格长
if(this.status == 1) {
if(!this.riskEliminationMethod) {
return this.$u.toast('请选择风险消除方式')
}
if(this.status == 1) {
url = '/app/apppreventionreturntopoverty/relieve' // 解除
} else if (this.status == 4 || this.status == 3) {
} else if (this.status == 3 || this.status == 4) {
if(!this.riskType) {
return this.$u.toast('请选择风险因素')
}
url = `/app/apppreventionreturntopoverty/examine` // 纳入监测
}
} else { // 网格员
}
if (this.pass == '') { // 网格员
if(this.status == '0' || this.status == '3' || this.status == '4') {
if(!this.riskType) {
return this.$u.toast('请选择风险因素')