From 4cc27f93a1901e12eb12a198029911c483dd991f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 27 八月 2025 14:30:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY

---
 src/views/personnelManagement/contractManagement/components/formDia.vue |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/views/personnelManagement/contractManagement/components/formDia.vue b/src/views/personnelManagement/contractManagement/components/formDia.vue
index fdea8ab..1770ad3 100644
--- a/src/views/personnelManagement/contractManagement/components/formDia.vue
+++ b/src/views/personnelManagement/contractManagement/components/formDia.vue
@@ -18,6 +18,14 @@
           <el-button @click="closeDia">鍙栨秷</el-button>
         </div>
       </template>
+      <fileUpload
+        ref="fileUploadRef"
+        :fileSize="1024"
+        :fileType="['pdf', 'docx', 'txt', 'xlsx', 'pptx....']"
+        :limit="10"
+        :drag="false"
+        v-model:modelValue="modelValue"
+    />
     </el-dialog>
   </div>
 </template>
@@ -26,6 +34,7 @@
 import {ref} from "vue";
 import {staffOnJobInfo} from "@/api/personnelManagement/employeeRecord.js";
 import PIMTable from "@/components/PIMTable/PIMTable.vue";
+import fileUpload from "@/components/FileUpload/index.vue";
 const { proxy } = getCurrentInstance()
 const emit = defineEmits(['close'])
 

--
Gitblit v1.9.3