From a8d27205b3971fd23b7ea64815a0dd6939702a44 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 28 四月 2024 17:04:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/system/report/index.vue |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index 3bdc812..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: [],
       // 閬僵灞�

--
Gitblit v1.8.0