From 09d351ec5fe8b47efc3f9dbbbec9ad31f510a600 Mon Sep 17 00:00:00 2001
From: cqf
Date: 星期三, 22 六月 2022 15:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shf' into shf

---
 src/views/hiddenDangerRegistration/index.vue |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/hiddenDangerRegistration/index.vue b/src/views/hiddenDangerRegistration/index.vue
index dabdfb3..a49cc21 100644
--- a/src/views/hiddenDangerRegistration/index.vue
+++ b/src/views/hiddenDangerRegistration/index.vue
@@ -155,7 +155,7 @@
                             :before-upload="beforeUpload"
                             :auto-upload="false"
                         >
-                            <el-button type="primary" size="small" class="btns">选择文件</el-button>
+                            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
                             <el-button
                                 type="primary"
                                 class="btns"
@@ -468,11 +468,10 @@
         },
         beforeUpload(file) {
             var FileExt = file.name.replace(/.+\./, "");
-            //.jpg,.gif,.bmp,.png,.doc,.docx,.pdf,.ppt,.pptx,.xls,.xlsx,.rar,.zip
-            if (['jpg', 'png', 'bmp', 'gif', 'jpeg','doc','docx','pdf','ppt','xls','pptx','xls','xlsx','rar','zip'].indexOf(FileExt.toLowerCase()) === -1) {
+            if (['xls','xlsx'].indexOf(FileExt.toLowerCase()) === -1) {
                 this.$message({
                     type: 'warning',
-                    message: '请上传后缀名为jpg,gif,bmp,png,doc,docx,pdf,ppt,pptx,xls,xlsx,rar,zip的图片!'
+                    message: '请上传后缀名为xls,xlsx的图片!'
                 });
                 return false;
             }

--
Gitblit v1.9.2