Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
		| @@ -63,19 +63,21 @@ export default { | |||||||
|         riskType: this.riskType, |         riskType: this.riskType, | ||||||
|         riskEliminationMethod: this.riskEliminationMethod, |         riskEliminationMethod: this.riskEliminationMethod, | ||||||
|       } |       } | ||||||
|  |       // 0:待纳入、1:监测中、2:待解除、3:已解除、4:已驳回  | ||||||
|       if(this.pass == 1) {  // 网格长 |       if(this.pass == 1) {  // 网格长 | ||||||
|  |         if(this.status == 1) { | ||||||
|           if(!this.riskEliminationMethod) { |           if(!this.riskEliminationMethod) { | ||||||
|             return this.$u.toast('请选择风险消除方式') |             return this.$u.toast('请选择风险消除方式') | ||||||
|           } |           } | ||||||
|         if(this.status == 1) { |  | ||||||
|           url = '/app/apppreventionreturntopoverty/relieve' // 解除 |           url = '/app/apppreventionreturntopoverty/relieve' // 解除 | ||||||
|         } else if (this.status == 4 || this.status == 3) { |         } else if (this.status == 3 || this.status == 4) { | ||||||
|           if(!this.riskType) { |           if(!this.riskType) { | ||||||
|             return this.$u.toast('请选择风险因素') |             return this.$u.toast('请选择风险因素') | ||||||
|           } |           } | ||||||
|           url = `/app/apppreventionreturntopoverty/examine` //  纳入监测 |           url = `/app/apppreventionreturntopoverty/examine` //  纳入监测 | ||||||
|         } |         } | ||||||
|       } else {   // 网格员 |       }  | ||||||
|  |       if (this.pass == '') {   // 网格员 | ||||||
|         if(this.status == '0' || this.status == '3' || this.status == '4') { |         if(this.status == '0' || this.status == '3' || this.status == '4') { | ||||||
|           if(!this.riskType) { |           if(!this.riskType) { | ||||||
|             return this.$u.toast('请选择风险因素') |             return this.$u.toast('请选择风险因素') | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user