From 7485e589e42104cb543952bc5b68d246ba8ce669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Sat, 14 Sep 2024 16:14:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E5=8F=B8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cost/feeRecords/index.vue         | 1 +
 src/views/cost/shipmentStatistics/index.vue | 3 +++
 src/views/setting/company/index.vue         | 1 +
 src/views/setting/company/save.vue          | 3 ---
 src/views/setting/role/index.vue            | 4 +++-
 src/views/setting/role/roleSort.vue         | 1 +
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/cost/feeRecords/index.vue b/src/views/cost/feeRecords/index.vue
index b5695c9..4a46123 100644
--- a/src/views/cost/feeRecords/index.vue
+++ b/src/views/cost/feeRecords/index.vue
@@ -1,6 +1,7 @@
 <template>
 	<el-container class="mainBox mainHeaderNoBorderPadding">
 		<el-header>
+			<!--v-auths="['addCost','deleteCost','costFlowImport','costFlowExport']"-->
 			<div class="left-panel">
 				<el-button type="primary" v-auth="'addCost'" :size="size" icon="el-icon-plus" @click="add">新增</el-button>
 				<el-button type="danger" plain v-auth="'deleteCost'" :disabled="selection.length>0?false:true" :size="size" icon="el-icon-delete" @click="all_del"></el-button>
diff --git a/src/views/cost/shipmentStatistics/index.vue b/src/views/cost/shipmentStatistics/index.vue
index 02ab34b..2588d73 100644
--- a/src/views/cost/shipmentStatistics/index.vue
+++ b/src/views/cost/shipmentStatistics/index.vue
@@ -274,4 +274,7 @@ export default {
 	height: 20px;
 	margin: 0 auto;
 }
+.mainMiddle{
+	min-height: 600px;
+}
 </style>
diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue
index 12ecd24..10b952d 100644
--- a/src/views/setting/company/index.vue
+++ b/src/views/setting/company/index.vue
@@ -329,6 +329,7 @@ export default {
 	.logoCell{
 		display: flex;
 		align-items: center;
+		justify-content: center;
 		height: 20px;
 		margin: 0 auto;
 	}
diff --git a/src/views/setting/company/save.vue b/src/views/setting/company/save.vue
index 3f4a4cd..55d8b04 100644
--- a/src/views/setting/company/save.vue
+++ b/src/views/setting/company/save.vue
@@ -129,9 +129,6 @@ export default {
 				name:[
 					{required: true, message: '公司简称不能为空', trigger: 'blur'}
 				],
-				domain:[
-					{required: true, message: '入口地址不能为空', trigger: 'blur'}
-				],
 				company_type:[
 					{required: true, message: '公司类型不能为空', trigger: 'change'}
 				],
diff --git a/src/views/setting/role/index.vue b/src/views/setting/role/index.vue
index 4a85a16..703b2bb 100644
--- a/src/views/setting/role/index.vue
+++ b/src/views/setting/role/index.vue
@@ -17,7 +17,9 @@
 <!--						<el-input placeholder="输入关键字进行过滤" :size="size" v-model="groupFilterText" clearable></el-input>-->
 <!--					</el-header>-->
 					<el-main class="treeMain nopadding">
-						<role-sort ref="roleSort" :role_id="role_id" :column="group" @roleChange="groupChange" @roleClick="roleClick" @roleEdit="table_edit" @roleDelete="table_del"></role-sort>
+						<el-scrollbar>
+							<role-sort ref="roleSort" :role_id="role_id" :column="group" @roleChange="groupChange" @roleClick="roleClick" @roleEdit="table_edit" @roleDelete="table_del"></role-sort>
+						</el-scrollbar>
 					</el-main>
 				</el-container>
 			</el-aside>
diff --git a/src/views/setting/role/roleSort.vue b/src/views/setting/role/roleSort.vue
index c01f5cc..e04a9fc 100644
--- a/src/views/setting/role/roleSort.vue
+++ b/src/views/setting/role/roleSort.vue
@@ -95,6 +95,7 @@ export default {
 .setting-column__list li .name_b{margin-left: 10px;flex: 1;}
 .setting-column__list li.liCheck{background: #E7F3FF;}
 .setting-column__list li:hover{background: #E7F3FF;cursor: pointer;}
+.setting-column__list li.liCheck .btnBox{display: flex;align-items: center;}
 .setting-column__list li:hover .btnBox{display: flex;align-items: center;}
 
 .btnBox{