From 7d312ba048cd9767286c6bc5b8c3f7e94c160c9f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 30 四月 2024 13:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/report/index.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index caa3d0a..3c0a06c 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -60,7 +60,8 @@
<div class="info-item">
<div class="info-label">涓婃姤鏉愭枡</div>
<div class="info-list">
- <div class="list-item" v-for="file in formatFileList(scope.row.reportMaterials)" :key="file" @click="showFile(file)">
+ <div class="list-item" v-for="file in formatFileList(scope.row.reportMaterials)" :key="file"
+ @click="showFile(file)">
<div class="item-icon">
<i class="el-icon-document"></i>
</div>
@@ -141,7 +142,7 @@
<editor v-model="form.reportContent" :min-height="192" />
</el-form-item>
<el-form-item label="涓婃姤鏉愭枡" prop="reportMaterials">
- <file-upload v-model="form.reportMaterials" />
+ <file-upload v-model="form.reportMaterials" :fileType='fileType' />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -211,6 +212,8 @@
name: "Report",
data() {
return {
+ fileType: ["doc", "xls", "xlsx", "ppt", "txt", "pdf", "png", "jpg"],
+
// 鐐逛綅list
pointList: [],
// 閬僵灞�
@@ -493,14 +496,14 @@
}
.info-text {
- width: 20%;
+ width: 30%;
padding: 20px;
border-radius: 10px;
border: 1px solid #c0c0c0;
}
.info-list {
- width: 20%;
+ width: 30%;
.list-item {
width: 100%;
--
Gitblit v1.8.0