From a6f0596a6365b3ebdfd32af7fa2a740577aaef9d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 10 Aug 2021 09:37:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

---
 src/views/feedbackReport/feedbackReport.vue |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/feedbackReport/feedbackReport.vue b/src/views/feedbackReport/feedbackReport.vue
index cd815ad..bd72cc1 100644
--- a/src/views/feedbackReport/feedbackReport.vue
+++ b/src/views/feedbackReport/feedbackReport.vue
@@ -34,7 +34,7 @@
 
       <template slot-scope="{type,size, row}" slot="menu">
         <el-button
-          v-if="row.type != 0"
+          v-if="row.type != 1"
           icon="el-icon-check" :size="size" :type="type" @click="setReal(row)">接收</el-button>
       </template>
 
@@ -431,8 +431,7 @@
       rowDel(row) {
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+          cancelButtonText: "取消",           type: "warning",
         })
           .then(() => {
             return remove(row.id);

--
Gitblit v1.9.3