From 5201cc9c05669fae462d70dafcf7b6d46c554f4f Mon Sep 17 00:00:00 2001
From: laishajiang <12977614+laishajiang@user.noreply.gitee.com>
Date: Tue, 19 Mar 2024 11:19:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=BB=A1=E6=84=8F=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/work/components/ConfirmedCompletion.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/work/components/ConfirmedCompletion.vue b/src/views/work/components/ConfirmedCompletion.vue
index 0634a94..e72a0b0 100644
--- a/src/views/work/components/ConfirmedCompletion.vue
+++ b/src/views/work/components/ConfirmedCompletion.vue
@@ -253,7 +253,13 @@ function isSatisfactionNonConsistent() {
     if (!props.mail.satisfaction || !props.mail.verifyFeedback) {
         return false
     }
-    return getSatisfaction() !== props.mail.verifyFeedback
+    if(getSatisfaction()!== props.mail.verifyFeedback){
+        if(getSatisfaction()=="满意"&&props.mail.verifyFeedback=="非常满意"){
+            return false;
+        }else{
+            return true;
+        }
+    }
 }
 </script>
 <style lang="scss" scoped>

From ce53d09492bae65707e9e432d66f2c19ace4baaa Mon Sep 17 00:00:00 2001
From: laishajiang <12977614+laishajiang@user.noreply.gitee.com>
Date: Tue, 19 Mar 2024 16:11:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=AA=E4=B8=8A=E4=BC=A0=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E6=9C=BA=E6=9E=84=E7=9A=84=E4=BF=A1=E4=BB=B6=E5=8F=AF?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mail.ts          |  4 ++++
 src/views/work/Query.vue | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/api/mail.ts b/src/api/mail.ts
index 146e683..c7d648d 100644
--- a/src/api/mail.ts
+++ b/src/api/mail.ts
@@ -22,4 +22,8 @@ export function addMail(body) {
 
 export function addCoHandling(body) {
     return request.post({ url: '/mail/coHandling/add', body})
+}
+
+export function deleteMail(body) {
+    return request.post({ url: '/mail/delete', body})
 }
\ No newline at end of file
diff --git a/src/views/work/Query.vue b/src/views/work/Query.vue
index 0521c44..7d7817c 100644
--- a/src/views/work/Query.vue
+++ b/src/views/work/Query.vue
@@ -188,6 +188,8 @@
                             <el-button type="primary" link @click="handleMailLabel(row.id)">标签</el-button>
                             <el-button type="primary" link @click="handleTodoByChange(row.id)"
                                 v-show="handleMailCategory(row)">转为待办</el-button>
+                            <el-button type="primary" link @click="handleDelete(row.id)"
+                                v-show="IsdeleteMail(row)">删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -234,6 +236,8 @@ import { getToken } from '@/utils/auth'
 import axios from 'axios'
 import { useRouterParamsStore } from "@/stores/modules/routerParams";
 import { useRoute } from "vue-router";
+import feedback from "@/utils/feedback";
+import {deleteMail} from "@/api/mail";
 
 const rowKey = "id";
 const loading = ref(false)
@@ -505,12 +509,31 @@ const handleTodoByChange = (mailId: any) => {
     showTodoByChange.value = true
     activeMailId.value = mailId
 }
+
+
+const handleDelete = async (mailId: any) => {
+    if(mailId == ""||mailId == null){
+        return;
+    }
+    await feedback.confirm("确定要删除？");
+    await deleteMail({id:mailId});
+    feedback.msgSuccess("删除成功");
+    getList()
+};
+
+
+
 const handleMailCategory = (row: any) => {
     const allowChangeList = ['终止类', '无效类']
     return allowChangeList.includes(row.mailCategory)
 }
 
 
+const IsdeleteMail = (row: any) => {
+    const allowChangeList = ['first_sign', 'first_distribute']
+    return allowChangeList.includes(row.flowKey)
+}
+
 getList()
 </script>