29375

src/apps/AppMonitoringObject/Detail.vue

@@ -36,7 +36,7 @@
           </div>
           <div class="item-info">
             <label>采取措施</label>
-            <span>{{ $dict.getLabel('fpAssistanceMeasures',info.helpLog.operationDesc) }}</span>
+            <span>{{ info.helpLog? $dict.getLabel('fpAssistanceMeasures',info.helpLog.operationDesc): '-' }}</span>
           </div>
         </div>
         <div class="item-wrapper">

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.pass == 1) {  // 网格长
-        if(this.status == 1) {  // 解除
+        if(this.status == 1) {  
-          url = '/app/apppreventionreturntopoverty/relieve'
+          url = '/app/apppreventionreturntopoverty/relieve' // 解除
-        } else if (this.status == 4 || this.status == 3 || this.status == 0) {  //  纳入监测
+        } else if (this.status == 4 || this.status == 3) {  
-          url = `/app/apppreventionreturntopoverty/examine`
+          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) { // 纳入监测
+        if(this.status == 0 || this.status == 3 || this.status == 4) { 
-          url = `/app/apppreventionreturntopoverty/examine`
+          url = `/app/apppreventionreturntopoverty/examine` // 纳入监测申请
         } else {
-          url =  `/app/apppreventionreturntopoverty/relieve`     //  驳回
+          url =  `/app/apppreventionreturntopoverty/relieve`  // 消除申请
         }
       }