优化

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/PatentFeatures.vue

@@ -134,7 +134,7 @@
           <el-table-column v-if="this.taskWorkRemakA==0" prop="compareResult2" align="center" label="协同比对结果" width="300px">
             <template slot-scope="scope">
               <div v-if="scope.row">
-                  <span v-if="scope.row.compareResult.toString()!=''">{{ options.filter(item=>item.value==scope.row.compareResult)[0].label }}</span> 
+                  <span v-if="scope.row.compareResult2.toString()!=''">{{ options.filter(item=>item.value==scope.row.compareResult2)[0].label }}</span> 
                </div>
               <!-- <el-select v-model="scope.row.compareResult2" placeholder="请选择">
                 <el-option

RMS-FrontEnd/src/views/report/index.vue

@@ -225,7 +225,16 @@ export default {
           this.handleImportPatent(row)
           break
         case '7':
-          this.handleDelete(row)
+            this.$confirm('此操作将永久删除该报告, 是否继续?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.handleDelete(row)
+              this.$message.success("删除报告成功")
+            }).catch(() => {
+              this.$message.info("已取消删除")         
+            });
           break
         case 'e':
           this.handleEdit(row)

RMS-FrontEnd/src/views/task/MyInitiate.vue

@@ -213,11 +213,19 @@ export default {
         }
         
       } else {
-        console.log("完成任务");
-        this.$api.taskFinish({id:row.id}).then((res) => {
-          this.$message.success("任务已完成")
-          this.getList()
-        })
+        this.$confirm('确认任务完成, 是否继续?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.$api.taskFinish({id:row.id}).then((res) => {
+                this.$message.success("任务已完成")
+                this.getList()
+              })
+            }).catch(() => {
+              this.$message.info("已取消")         
+        });
+        
       }
        
     },