From ff803fa78dd8fe2daa5c232dda172993bbae14e5 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 29 May 2024 11:06:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=96=B9=E5=BC=8F=E6=9B=B4=E6=96=B0=EF=BC=8C=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E8=A7=86=E5=9B=BE=E9=A1=B5=E9=9D=A2=E5=8F=8A=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa_apply/detail.vue | 13 ++++++++++++-
 src/views/oa_apply/index.vue  |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/views/oa_apply/detail.vue b/src/views/oa_apply/detail.vue
index e130ac9..99f5296 100644
--- a/src/views/oa_apply/detail.vue
+++ b/src/views/oa_apply/detail.vue
@@ -21,6 +21,9 @@
                     <el-table-column label="报销金额" show-overflow-tooltip prop="amount">
                     </el-table-column>
                     <el-table-column label="报销项目" show-overflow-tooltip prop="cate_id">
+                        <template #default="{ row }">
+                            <dict-value :options="dictData.oa_approve_cate" :value="row.cate_id" />
+                        </template>
                     </el-table-column>
                     <el-table-column label="备注信息" show-overflow-tooltip prop="remark">
                     </el-table-column>
@@ -127,6 +130,15 @@ const personnel = ref(null);
 const userStore = useUserStore().userInfo;
 const showBackDialog = ref(false)
 
+
+
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    },
+})
+
 // 表单数据
 const formData = reactive({
     id: 0,
@@ -141,7 +153,6 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    console.log(formData)
 }
 
 
diff --git a/src/views/oa_apply/index.vue b/src/views/oa_apply/index.vue
index 7c92244..46ffff1 100644
--- a/src/views/oa_apply/index.vue
+++ b/src/views/oa_apply/index.vue
@@ -76,7 +76,7 @@
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :deptList="deptList" :dict-data="dictData" @success="getLists"
             @close="showEdit = false" />
-        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
+        <detailPopup v-if="showDetail" ref="detailRef" :dict-data="dictData" @success="showDetail = false, getLists()"
             @close="showDetail = false, getLists()" />
     </div>
 </template>