diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index 4023cccd..9c25a3ba 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -36,7 +36,7 @@
- {{ $dict.getLabel('fpAssistanceMeasures',info.helpLog.operationDesc) }}
+ {{ info.helpLog? $dict.getLabel('fpAssistanceMeasures',info.helpLog.operationDesc): '-' }}
diff --git a/src/apps/AppMonitoringObject/MonitorAddView.vue b/src/apps/AppMonitoringObject/MonitorAddView.vue
index 47837c73..6f520c5b 100644
--- a/src/apps/AppMonitoringObject/MonitorAddView.vue
+++ b/src/apps/AppMonitoringObject/MonitorAddView.vue
@@ -56,18 +56,19 @@ export default {
submit() {
var url = ''
var params = {
- pass: this.pass,
+ pass: this.pass || '',
opinion: this.opinion,
files: this.filesList,
id: this.id,
+ riskType: this.riskType,
}
- if(this.pass == 1) {
- if(this.status == 1) { // 解除
- url = '/app/apppreventionreturntopoverty/relieve'
- } else if (this.status == 4 || this.status == 3 || this.status == 0) { // 纳入监测
- url = `/app/apppreventionreturntopoverty/examine`
+ if(this.pass == 1) { // 网格长
+ if(this.status == 1) {
+ url = '/app/apppreventionreturntopoverty/relieve' // 解除
+ } else if (this.status == 4 || this.status == 3) {
+ url = `/app/apppreventionreturntopoverty/examine` // 纳入监测
}
- } else {
+ } else { // 网格员
if(this.status == '0') {
if(!this.riskType) {
return this.$u.toast('请选择监测对象类型')
@@ -86,10 +87,10 @@ export default {
this.filesList = files.join(',')
}
- if(this.status == 0) { // 纳入监测
- url = `/app/apppreventionreturntopoverty/examine`
+ if(this.status == 0 || this.status == 3 || this.status == 4) {
+ url = `/app/apppreventionreturntopoverty/examine` // 纳入监测申请
} else {
- url = `/app/apppreventionreturntopoverty/relieve` // 驳回
+ url = `/app/apppreventionreturntopoverty/relieve` // 消除申请
}
}