From 80e119478b7d4f804384558c9b558cadb44654e2 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 30 May 2024 18:09:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E6=8F=90=E9=AB=98=E6=93=8D=E4=BD=9C=E6=95=88?=
 =?UTF-8?q?=E7=8E=87=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa_CopyMe/index.vue | 12 ++++++------
 src/views/oa_Deal/index.vue   |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/views/oa_CopyMe/index.vue b/src/views/oa_CopyMe/index.vue
index 677670c..06fc077 100644
--- a/src/views/oa_CopyMe/index.vue
+++ b/src/views/oa_CopyMe/index.vue
@@ -14,7 +14,7 @@
                     <el-table-column label="备注" prop="remarks" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                            <el-button type="primary" link @click="handDetail(row.id)">
+                            <el-button type="primary" link @click="handDetail(row)">
                                 详情
                             </el-button>
                         </template>
@@ -26,7 +26,7 @@
             </div>
         </el-card>
         <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
-            @close="showDetail = false, getLists()" />
+            @close="showDetail = false, getLists()" :typeName="typeName" />
     </div>
 </template>
 
@@ -34,8 +34,6 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiOaoaApproveCopy } from '@/api/oa_Initiate'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
 import detailPopup from '@/views/oa_Initiate/detail.vue'
 import { apiOaoaApproveDetail } from "@/api/oa_Initiate"
 
@@ -49,6 +47,7 @@ const queryParams = reactive({
     title: '',
     status: ''
 })
+const typeName = ref('')
 
 // 选中数据
 const selectData = ref<any[]>([])
@@ -67,8 +66,9 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
     params: queryParams
 })
 
-const handDetail = async (id: any) => {
-    let res = await apiOaoaApproveDetail({ id })
+const handDetail = async (row: any) => {
+    typeName.value = row.type_name
+    let res = await apiOaoaApproveDetail({ id: row.id })
     showDetail.value = true
     await nextTick()
     detailRef.value?.open()
diff --git a/src/views/oa_Deal/index.vue b/src/views/oa_Deal/index.vue
index d6f377f..0395420 100644
--- a/src/views/oa_Deal/index.vue
+++ b/src/views/oa_Deal/index.vue
@@ -47,8 +47,6 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiOaoaApprovelst } from '@/api/oa_Initiate'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
 import detailPopup from '@/views/oa_Initiate/detail.vue'
 import { apiOaoaApproveDetail } from "@/api/oa_Initiate"