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/filesDia.vue | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/views/personnelManagement/contractManagement/filesDia.vue b/src/views/personnelManagement/contractManagement/filesDia.vue
index b797d2f..4734717 100644
--- a/src/views/personnelManagement/contractManagement/filesDia.vue
+++ b/src/views/personnelManagement/contractManagement/filesDia.vue
@@ -6,7 +6,7 @@
width="50%"
@close="closeDia"
>
- <div style="margin-bottom: 10px;text-align: right">
+ <!-- <div style="margin-bottom: 10px;text-align: right">
<el-upload
v-model:file-list="fileList"
class="upload-demo"
@@ -20,6 +20,7 @@
>
<el-button type="primary">涓婁紶闄勪欢</el-button>
</el-upload>
+
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
<PIMTable
@@ -39,12 +40,20 @@
:total="total"
:page="page.current"
:limit="page.size"
- />
+ /> -->
<template #footer>
<div class="dialog-footer">
<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>
<filePreview ref="filePreviewRef" />
</div>
@@ -62,6 +71,7 @@
fileListPage
} from "@/api/financialManagement/revenueManagement.js";
import Pagination from "@/components/PIMTable/Pagination.vue";
+import fileUpload from "@/components/FileUpload/index.vue";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
@@ -108,7 +118,7 @@
const headers = ref({
Authorization: "Bearer " + getToken(),
});
-const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 涓婁紶鐨勫浘鐗囨湇鍔″櫒鍦板潃
+// const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 涓婁紶鐨勫浘鐗囨湇鍔″櫒鍦板潃
// 鎵撳紑寮规
const openDialog = (row,type) => {
--
Gitblit v1.9.3