From febface9683d1afadf5ae9a0b704747aa13f5707 Mon Sep 17 00:00:00 2001
From: Dragon <>
Date: Sun, 24 Mar 2024 10:02:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                             |  1 +
 src/components/NotPassed.vue                | 32 ++++++++++++---------
 src/views/final/content/Content.vue         |  2 +-
 src/views/worksheet/modal/ApprovalModal.vue |  5 +++-
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 896d6e9..615d417 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -17,6 +17,7 @@ declare module 'vue' {
     NCollapse: typeof import('naive-ui')['NCollapse']
     NCollapseItem: typeof import('naive-ui')['NCollapseItem']
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
+    NDataTable: typeof import('naive-ui')['NDataTable']
     NDatePicker: typeof import('naive-ui')['NDatePicker']
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
     NDivider: typeof import('naive-ui')['NDivider']
diff --git a/src/components/NotPassed.vue b/src/components/NotPassed.vue
index d88f94d..baef5f7 100644
--- a/src/components/NotPassed.vue
+++ b/src/components/NotPassed.vue
@@ -1,11 +1,13 @@
 <script lang="ts" setup>
 import { computed, onBeforeMount, reactive, ref, toRefs, unref } from 'vue'
+import { useDialog, useMessage } from 'naive-ui'
 import { useDictionary } from '@/store/modules/dictonary'
 import { audit } from '@/api/task/task'
 
 const emit = defineEmits<{
   (e: 'commit', rejectId: any, backId: any, isOther: boolean)
 }>()
+const message = useMessage()
 
 const dictonaryStore = useDictionary()
 const state: any = reactive({
@@ -20,6 +22,7 @@ const cardStyle = {
 }
 
 function showModal(value) {
+  console.log(value)
   state.detail = value
   show.value = true
 }
@@ -48,23 +51,24 @@ const comomitValue = computed(() => {
 
 async function handleSumbit(e: MouseEvent) {
   e.preventDefault()
-  closeModal()
+
   // selectRejectId.value === 'other'
   // emit('commit', unref(comomitValue), unref(selectBackId), showOther.value)
   console.log(state.detail)
-  // const param = {
-  //   formid: formIds,
-  //   taskId: taskIds,
-  //   approvd: false,
-  //   taskComment: idOrDesc,
-  //   taskname: isOther ? tasknames : ['其他'],
-  // }
-  // audit(param).then((res) => {
-  //   const { code } = res
-  //   if (code === 'OK')
-  //     reload()
-  //   else message.error(res.message)
-  // })
+  console.log(comomitValue)
+  const param = {
+    formid: [state.detail.id],
+    taskId: ['66b06dda-e673-11ee-a934-0242bc74e4f3'],
+    approvd: false,
+    taskComment: comomitValue.value,
+    taskname: showOther.value ? state.detail.detail.tasks : ['其他'],
+  }
+  audit(param).then((res) => {
+    const { code } = res
+    if (code === 'OK')
+      closeModal()
+    else message.error(res.message)
+  })
 }
 
 onBeforeMount(async () => {
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index d98651d..7da10d4 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -305,7 +305,7 @@ async function formatColumns() {
           return h(SvgIcon, { name: 'sort-3' })
       },
       render(row: any) {
-        return row.similarityscore ? `<span></span>${row.similarityscore}%` : ''
+        return row.similarityscore ? `${row.similarityscore}%` : ''
       },
     }
   }
diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue
index bb4aa11..5f60991 100644
--- a/src/views/worksheet/modal/ApprovalModal.vue
+++ b/src/views/worksheet/modal/ApprovalModal.vue
@@ -68,7 +68,10 @@ async function reject() {
 }
 
 async function viewRepeat(e: MouseEvent) {
-  emit('notPass', state.detail)
+  emit('notPass', {
+    id: state.taskId,
+    detail: state.detail,
+  })
   e.preventDefault()
   closeModal()
 }