From babaf8f4306af29f94ea2a6fa40b5aea70143b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Wed, 24 Jul 2024 10:38:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E3=80=81?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E3=80=81=E8=A7=92=E8=89=B2=E3=80=81=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scExport/index.vue     |  2 +-
 src/components/scImport/index.vue     |  7 ++++---
 src/views/order/dataConfirm/index.vue | 14 ++++++++++++--
 src/views/order/orderList/index.vue   | 14 ++++++++++++--
 src/views/order/orderPlan/index.vue   | 14 ++++++++++++--
 src/views/setting/company/index.vue   | 14 ++++++++++++--
 src/views/setting/log/index.vue       |  2 +-
 src/views/setting/role/index.vue      | 16 ++++++++--------
 src/views/setting/user/index.vue      | 16 +++++++++++++---
 9 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/src/components/scExport/index.vue b/src/components/scExport/index.vue
index 067a950..d003471 100644
--- a/src/components/scExport/index.vue
+++ b/src/components/scExport/index.vue
@@ -10,7 +10,7 @@
 	>
 		<template #reference>
 			<slot></slot>
-<!--			<el-button :size="size" v-auths="['organizationExport','userExport']" icon="sc-icon-Download" @click="exportClick">下载</el-button>-->
+			<!--<el-button :size="size" v-auths="['organizationExport','userExport']" icon="sc-icon-Download" @click="exportClick">下载</el-button>-->
 		</template>
 		<template #default>
 			<div v-for="item in list" :key="item">
diff --git a/src/components/scImport/index.vue b/src/components/scImport/index.vue
index efb9ff9..6c78af3 100644
--- a/src/components/scImport/index.vue
+++ b/src/components/scImport/index.vue
@@ -1,5 +1,6 @@
 <template>
-	<el-button v-auths="['organizationImport','userImport']" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
+	<slot name="header"></slot>
+	<!--<el-button v-auths="['organizationImport','userImport']" type="primary" :size="size" plain @click="importFile">批量导入</el-button>-->
 
 	<el-dialog v-bind="$attrs" :title="title" v-model="visible" :width="560" destroy-on-close draggable @closed="visible=false">
 		<div class="importBody">
@@ -35,10 +36,10 @@
 				<template #tip>
 					<div class="el-upload__tip">
 						<span class="tip">
-<!--							如果数据导入中途业务出错，请不要刷新页面，修改后继续点击导入-->
+						<!--如果数据导入中途业务出错，请不要刷新页面，修改后继续点击导入-->
 						</span>
 						<span class="btn">
-							<slot></slot>
+							<slot name="download"></slot>
 						</span>
 					</div>
 					<div class="importBox" v-if="progressShow">
diff --git a/src/views/order/dataConfirm/index.vue b/src/views/order/dataConfirm/index.vue
index f8a1d95..b2b902a 100644
--- a/src/views/order/dataConfirm/index.vue
+++ b/src/views/order/dataConfirm/index.vue
@@ -3,8 +3,13 @@
 		<el-header>
 			<div class="left-panel">
 				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增工单</el-button>
-				<scImport :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
-					<div @click="importTemplate">下载导入模版</div>
+				<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
+					<template #header>
+						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
+					</template>
+					<template #download>
+						<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>
+					</template>
 				</scImport>
 			</div>
 			<div class="right-panel">
@@ -157,6 +162,11 @@ export default {
 		},
 
 		// 批量导入
+		importFile(){
+			this.$nextTick(()=>{
+				this.$refs.scImport.importFile();
+			})
+		},
 		async importTemplate() {
 			const res = await this.$API.orders.order.maintenance.template.post();
 			const blob = new Blob([res]);
diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue
index 04a8cb2..dc9fca2 100644
--- a/src/views/order/orderList/index.vue
+++ b/src/views/order/orderList/index.vue
@@ -3,8 +3,13 @@
 		<el-header>
 			<div class="left-panel">
 				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增工单</el-button>
-				<scImport :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
-					<div @click="importTemplate">下载导入模版</div>
+				<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
+					<template #header>
+						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
+					</template>
+					<template #download>
+						<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>
+					</template>
 				</scImport>
 			</div>
 			<div class="right-panel">
@@ -156,6 +161,11 @@ export default {
 		},
 
 		// 批量导入
+		importFile(){
+			this.$nextTick(()=>{
+				this.$refs.scImport.importFile();
+			})
+		},
 		async importTemplate() {
 			const res = await this.$API.orders.order.maintenance.template.post();
 			const blob = new Blob([res]);
diff --git a/src/views/order/orderPlan/index.vue b/src/views/order/orderPlan/index.vue
index 6993b8b..6eb9e19 100644
--- a/src/views/order/orderPlan/index.vue
+++ b/src/views/order/orderPlan/index.vue
@@ -3,8 +3,13 @@
 		<el-header>
 			<div class="left-panel">
 				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增工单</el-button>
-				<scImport :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
-					<div @click="importTemplate">下载导入模版</div>
+				<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
+					<template #header>
+						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
+					</template>
+					<template #download>
+						<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>
+					</template>
 				</scImport>
 			</div>
 			<div class="right-panel">
@@ -156,6 +161,11 @@ export default {
 		},
 
 		// 批量导入
+		importFile(){
+			this.$nextTick(()=>{
+				this.$refs.scImport.importFile();
+			})
+		},
 		async importTemplate() {
 			const res = await this.$API.orders.order.maintenance.template.post();
 			const blob = new Blob([res]);
diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue
index f153192..fe2b696 100644
--- a/src/views/setting/company/index.vue
+++ b/src/views/setting/company/index.vue
@@ -3,8 +3,13 @@
 		<el-header>
 			<div class="left-panel">
 				<el-button type="primary" v-auth="'addCompany'" :size="size" icon="el-icon-plus" @click="add">新增公司</el-button>
-				<scImport :size="size" title="批量导入公司组织" @parentParams="importUpload" @importSuccess="importSuccess">
-					<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>
+				<scImport ref="scImport" :size="size" title="批量导入公司组织" @parentParams="importUpload" @importSuccess="importSuccess">
+					<template #header>
+						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
+					</template>
+					<template #download>
+						<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>
+					</template>
 				</scImport>
 			</div>
 			<div class="right-panel">
@@ -162,6 +167,11 @@ export default {
 		},
 
 		// 批量导入
+		importFile(){
+			this.$nextTick(()=>{
+				this.$refs.scImport.importFile();
+			})
+		},
 		async importTemplate() {
 			const res = await this.$API.system.company.template.post();
 			const blob = new Blob([res]);
diff --git a/src/views/setting/log/index.vue b/src/views/setting/log/index.vue
index 1d5b206..1cca487 100644
--- a/src/views/setting/log/index.vue
+++ b/src/views/setting/log/index.vue
@@ -8,7 +8,7 @@
 					<el-button :size="size" type="primary" icon="el-icon-search" @click="upSearch">查询</el-button>
 					<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
 					<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="8">
-						<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>
+						<el-button v-auth="'sysLogExport'" :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>
 					</scExport>
 				</div>
 			</div>
diff --git a/src/views/setting/role/index.vue b/src/views/setting/role/index.vue
index 405a98e..fe9a328 100644
--- a/src/views/setting/role/index.vue
+++ b/src/views/setting/role/index.vue
@@ -2,9 +2,9 @@
 	<el-container class="mainBox">
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增角色</el-button>
-<!--				<el-button type="danger" :size="size" plain icon="el-icon-delete" :disabled="roleCheckList.length==0" @click="batch_del"></el-button>-->
-<!--				<el-button type="primary" :size="size" plain :disabled="roleCheckList.length!=1" @click="permission">权限设置</el-button>-->
+				<el-button type="primary" v-auth="'addRoles'" :size="size" icon="el-icon-plus" @click="add">新增角色</el-button>
+				<!--<el-button type="danger" :size="size" plain icon="el-icon-delete" :disabled="roleCheckList.length==0" @click="batch_del"></el-button>-->
+				<!--<el-button type="primary" :size="size" plain :disabled="roleCheckList.length!=1" @click="permission">权限设置</el-button>-->
 			</div>
 			<div class="right-panel">
 
@@ -22,8 +22,8 @@
 								<span class="custom-tree-node">
 								  <span>{{ node.label }}</span>
 								  <span class="btnBox">
-									  <el-icon class="btn" @click="table_edit(data)"><sc-icon-Edit/></el-icon>
-									  <el-icon class="btn" @click="table_del(data)"><sc-icon-Delete/></el-icon>
+									  <el-icon class="btn" v-auth="'disableRoles'" @click="table_edit(data)"><sc-icon-Edit/></el-icon>
+									  <el-icon class="btn" v-auth="'delRoles'" @click="table_del(data)"><sc-icon-Delete/></el-icon>
 								  </span>
 								</span>
 							</template>
@@ -34,11 +34,11 @@
 			<el-container>
 				<el-main class="nopadding">
 					<div class="btnPot" v-if="activeNum==0">
-						<el-button type="primary" plain :size="size" :loading="isSave" @click="submit">保存权限</el-button>
+						<el-button type="primary" v-auth="'addRoleAuth'" plain :size="size" :loading="isSave" @click="submit">保存权限</el-button>
 					</div>
 					<div class="btnPot" v-if="activeNum==2">
-						<el-button type="danger" plain :size="size" @click="deleteMember">移除成员</el-button>
-						<el-button type="primary" plain :size="size" @click="getDeptTree">添加成员</el-button>
+						<el-button type="danger" v-auth="'roleRemovedUsers'" plain :size="size" @click="deleteMember">移除成员</el-button>
+						<el-button type="primary" v-auth="'roleAddedUsers'" plain :size="size" @click="getDeptTree">添加成员</el-button>
 					</div>
 					<el-tabs class="role_tabs" tab-position="top" @tab-change="activeClick">
 						<el-tab-pane label="功能权限">
diff --git a/src/views/setting/user/index.vue b/src/views/setting/user/index.vue
index 3903099..e55e24a 100644
--- a/src/views/setting/user/index.vue
+++ b/src/views/setting/user/index.vue
@@ -17,14 +17,19 @@
 					<el-button type="danger" v-auth="'delUser'" plain :size="size" icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
 					<el-button type="primary" v-auth="'addUserRoles'" plain :size="size" :disabled="selection.length==0" @click="role">分配角色</el-button>
 					<el-button type="primary" plain :size="size" :disabled="selection.length==0" @click="rePwd">密码重置</el-button>
-					<scImport :size="size" title="批量导入用户" @parentParams="importUpload" @importSuccess="importSuccess">
-						<div v-auth="'userImportTemplate'" @click="importTemplate">下载导入模版</div>
+					<scImport ref="scImport" :size="size" title="批量导入用户" @parentParams="importUpload" @importSuccess="importSuccess">
+						<template #header>
+							<el-button v-auth="'userImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
+						</template>
+						<template #download>
+							<div v-auth="'userImportTemplate'" @click="importTemplate">下载导入模版</div>
+						</template>
 					</scImport>
 				</div>
 				<div class="right-panel">
 					<div class="right-panel-search">
 						<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="7">
-							<el-button :size="size" v-auths="'userExport'" icon="sc-icon-Download" @click="exportData">下载</el-button>
+							<el-button :size="size" v-auth="'userExport'" icon="sc-icon-Download" @click="exportData">下载</el-button>
 						</scExport>
 					</div>
 				</div>
@@ -197,6 +202,11 @@
 			},
 
 			// 批量导入
+			importFile(){
+				this.$nextTick(()=>{
+					this.$refs.scImport.importFile();
+				})
+			},
 			async importTemplate() {
 				const res = await this.$API.system.user.template.post();
 				const blob = new Blob([res]);