From bd380b7b401ea64581028d793a4529882d379c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Mon, 22 Jul 2024 20:00:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scExport/index.vue   | 7 +++++--
 src/components/scImport/index.vue   | 2 +-
 src/config/index.js                 | 2 +-
 src/style/fix.scss                  | 4 ++--
 src/views/order/orderList/index.vue | 6 +++---
 src/views/setting/role/index.vue    | 2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/components/scExport/index.vue b/src/components/scExport/index.vue
index 92ea18e..0f41249 100644
--- a/src/components/scExport/index.vue
+++ b/src/components/scExport/index.vue
@@ -41,7 +41,7 @@ export default {
 	},
 	data(){
 		return{
-			list:[{},{},{}],
+			list:[{},{},{},{}],
 		}
 	},
 	setup(){
@@ -56,7 +56,7 @@ export default {
 	},
 	methods:{
 		getWsResult(res){
-			if(res.data && (res.data.type == 6 || res.data.type == 7 || res.data.type == 8)){
+			if(res.data && (res.data.type == 6 || res.data.type == 7 || res.data.type == 8 || res.data.type == 11)){
 				let item = {
 					type:res.data.type,
 					type_desc:res.data.type_desc,
@@ -73,6 +73,9 @@ export default {
 				if(res.data.type == 8){
 					this.list[2] = item;
 				}
+				if(res.data.type == 11){
+					this.list[3] = item;
+				}
 				this.$emit('updateShow', item);
 
 				if(res.data.status==1){
diff --git a/src/components/scImport/index.vue b/src/components/scImport/index.vue
index bad3fb0..0caa511 100644
--- a/src/components/scImport/index.vue
+++ b/src/components/scImport/index.vue
@@ -108,7 +108,7 @@ export default {
 	},
 	methods:{
 		getWsResult(res){
-			if(res.data && (res.data.type == 4 || res.data.type == 5)){
+			if(res.data && (res.data.type == 4 || res.data.type == 5 || res.data.type == 10)){
 				this.importInfo = res.data;
 				this.progressShow = true;
 				if(res.data.status == 0){
diff --git a/src/config/index.js b/src/config/index.js
index a790059..9028d9d 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -43,7 +43,7 @@ const DEFAULT_CONFIG = {
 	LAYOUT: "menu",
 
 	//菜单是否折叠
-	MENU_IS_COLLAPSE: true,
+	MENU_IS_COLLAPSE: false,
 
 	//菜单是否启用手风琴效果
 	MENU_UNIQUE_OPENED: true,
diff --git a/src/style/fix.scss b/src/style/fix.scss
index 364efea..1988f29 100644
--- a/src/style/fix.scss
+++ b/src/style/fix.scss
@@ -53,12 +53,12 @@
 	--el-pagination-button-height-small:28px;
 }
 .el-tabs.role_tabs{
-	--el-tabs-header-height:60px;
+	--el-tabs-header-height:42px;
 	height: 100%;
 	display: flex;
 	flex-direction: column;
 	.el-tabs__active-bar{
-		bottom: 10px;
+		bottom: 0;
 	}
 	.el-tabs__header{
 		.el-tabs__nav{
diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue
index b6e36d0..b9f4a6c 100644
--- a/src/views/order/orderList/index.vue
+++ b/src/views/order/orderList/index.vue
@@ -8,7 +8,7 @@
 				</scImport>
 			</div>
 			<div class="right-panel">
-				<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="6"></scExport>
+				<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11"></scExport>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -168,7 +168,7 @@ export default {
 			document.body.removeChild(eLink);
 		},
 		async importUpload(params) {
-			const res = await this.$API.system.company.import.post(params);
+			const res = await this.$API.orders.order.maintenance.import.post(params);
 			if(res.code == 200){
 				this.$message.success('上传成功，开始导入数据');
 			}
@@ -248,7 +248,7 @@ export default {
 		},
 		// 下载导出
 		exportChangeShow(params){
-			if(params.type == 6){
+			if(params.type == 11){
 				this.exportShow = params.status==0?true:false
 			}
 		},
diff --git a/src/views/setting/role/index.vue b/src/views/setting/role/index.vue
index b307571..405a98e 100644
--- a/src/views/setting/role/index.vue
+++ b/src/views/setting/role/index.vue
@@ -450,7 +450,7 @@
 	}
 	.btnPot{
 		position: absolute;
-		top: 16px;
+		top: 6px;
 		right: 0;
 		z-index: 10;
 	}