From 81753f5a0cefdcd3df6d8d5f572e9bbbb4ba46ff Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 3 Jan 2025 09:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadModel/index.vue             | 3 ++-
 src/views/company-manage/components/add-form.vue | 5 ++++-
 src/views/company-manage/index.vue               | 1 +
 src/views/system/dept/index.vue                  | 8 ++++----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/UploadModel/index.vue b/src/components/UploadModel/index.vue
index 91831dbd..21de70e5 100644
--- a/src/components/UploadModel/index.vue
+++ b/src/components/UploadModel/index.vue
@@ -7,6 +7,7 @@
             :file-list="fileList"
             :on-remove="handleRemove"
             :on-preview="handlePreview"
+            :auto-upload="false"
         >
             <i class="el-icon-plus"></i>
         </el-upload>
@@ -21,7 +22,7 @@ export default {
     props: {
         uploadFileUrl: {
             type: String,
-            default: '',
+            default: '#',
         },
         uploadFileList: {
             type: Array,
diff --git a/src/views/company-manage/components/add-form.vue b/src/views/company-manage/components/add-form.vue
index 701bc36f..cb69cf17 100644
--- a/src/views/company-manage/components/add-form.vue
+++ b/src/views/company-manage/components/add-form.vue
@@ -28,7 +28,9 @@
                 </el-form-item>
                 <el-form-item label="LOGO设置：" prop="logo">
                     <div class="upload-container">
-                        <UploadModel />
+                        <UploadModel
+                            :uploadFileList.sync="addOrEditForm.fileList"
+                        />
                         <div>
                             1、上传图片文件格式仅支持SVG； <br />
                             2、LOGO图片大小不超过3MB,尺寸100px * 100px； <br />
@@ -96,6 +98,7 @@ export default {
                 phonenumber: '',
                 userName: '',
                 orderNum: 200,
+                fileList: [],
                 roles: '系统管理员',
             },
             addOrEditFormRef: {
diff --git a/src/views/company-manage/index.vue b/src/views/company-manage/index.vue
index d99c851a..9eaf4de8 100644
--- a/src/views/company-manage/index.vue
+++ b/src/views/company-manage/index.vue
@@ -96,6 +96,7 @@ export default {
 .company-list {
     display: flex;
     flex: 1;
+    height: 100%;
     flex-wrap: wrap;
     overflow-y: auto;
     .company-items {
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index f599eb66..23bad0d3 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -48,7 +48,7 @@
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <!-- <el-button
+                <el-button
                     type="primary"
                     plain
                     icon="el-icon-plus"
@@ -56,7 +56,7 @@
                     @click="handleAdd"
                     v-hasPermi="['system:dept:add']"
                     >新增
-                </el-button> -->
+                </el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button
@@ -117,7 +117,7 @@
                 class-name="small-padding fixed-width"
             >
                 <template slot-scope="scope">
-                    <!-- <el-button
+                    <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-edit"
@@ -132,7 +132,7 @@
                         @click="handleAdd(scope.row)"
                         v-hasPermi="['system:dept:add']"
                         >新增
-                    </el-button> -->
+                    </el-button>
                     <el-button
                         v-if="
                             config.isAddRootCompany