From b8a3ffdd9b32cb94c4566a2be3fbe205e9c43468 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Sat, 3 Feb 2024 14:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/roleapi/postrole.ts            |  2 +-
 .../DesignForm/public/form/formGroup.vue      |  1 +
 src/types/components.d.ts                     | 18 ++++
 src/views/hr/archives/archivescont.vue        |  1 +
 src/views/hr/archives/index.vue               | 99 ++++++++++++++++++-
 src/views/hr/archives/useronepage.vue         | 14 +++
 .../rolepower/setuprole/setuprolepower.vue    |  4 +-
 7 files changed, 136 insertions(+), 3 deletions(-)
 create mode 100644 src/views/hr/archives/useronepage.vue

diff --git a/src/api/system/roleapi/postrole.ts b/src/api/system/roleapi/postrole.ts
index da6ae07b6..f4f7afdd3 100644
--- a/src/api/system/roleapi/postrole.ts
+++ b/src/api/system/roleapi/postrole.ts
@@ -64,7 +64,7 @@ export function getSystemType(data: setupPage){
 /**
  * 获取指定角色授权
  */
- export function getGrantRolePowers(data: getSystemMenusForRole): AxiosPromise<string[]>{
+ export function getGrantRolePowers(data: getSystemMenusForRole): AxiosPromise{
 	return request({
 	  url: '/systemapi/grant/get_role_grant_powers',
 	  method: 'post',
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 31af08f56..00195d100 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -274,6 +274,7 @@ onMounted(()=>{
 	>
 	
 		<template #item="{ element, index }">
+		
 			<div
 				class="group"
 				:class="{
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 46ef24e14..204a38a0c 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -19,12 +19,16 @@ declare module '@vue/runtime-core' {
     DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
     DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
     ElAffix: typeof import('element-plus/es')['ElAffix']
+    ElAlert: typeof import('element-plus/es')['ElAlert']
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
     ElCard: typeof import('element-plus/es')['ElCard']
+    ElCarousel: typeof import('element-plus/es')['ElCarousel']
+    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
     ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
@@ -48,6 +52,7 @@ declare module '@vue/runtime-core' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
     ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
@@ -55,10 +60,12 @@ declare module '@vue/runtime-core' {
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSpace: typeof import('element-plus/es')['ElSpace']
     ElStep: typeof import('element-plus/es')['ElStep']
     ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
@@ -73,6 +80,7 @@ declare module '@vue/runtime-core' {
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    ElTransfer: typeof import('element-plus/es')['ElTransfer']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
@@ -97,14 +105,24 @@ declare module '@vue/runtime-core' {
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
     IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
+    IEpCollection: typeof import('~icons/ep/collection')['default']
     IEpDelete: typeof import('~icons/ep/delete')['default']
+    IEpDownload: typeof import('~icons/ep/download')['default']
     IEpEdit: typeof import('~icons/ep/edit')['default']
     IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+    IEpMinus: typeof import('~icons/ep/minus')['default']
     IEpOperation: typeof import('~icons/ep/operation')['default']
+    IEpPicture: typeof import('~icons/ep/picture')['default']
     IEpPlus: typeof import('~icons/ep/plus')['default']
+    IEpPosition: typeof import('~icons/ep/position')['default']
     IEpRefresh: typeof import('~icons/ep/refresh')['default']
+    IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default']
     IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSetting: typeof import('~icons/ep/setting')['default']
+    IEpTop: typeof import('~icons/ep/top')['default']
+    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
+    IEpUser: typeof import('~icons/ep/user')['default']
+    IEpView: typeof import('~icons/ep/view')['default']
     LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
     List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']
     ListTreeSide: typeof import('./../components/DesignForm/public/form/components/listTreeSide.vue')['default']
diff --git a/src/views/hr/archives/archivescont.vue b/src/views/hr/archives/archivescont.vue
index fb8934d65..f73878350 100644
--- a/src/views/hr/archives/archivescont.vue
+++ b/src/views/hr/archives/archivescont.vue
@@ -306,6 +306,7 @@ function editmvorg(){
 </script>
 <template>
 	<el-dialog v-model="boxShow" custom-class="dialog_box" :title="boxTitle" top="50px" :before-close="closeArchivesBox" width="80%">
+	
 		<el-row v-loading="rowLoading" :gutter="20" >
 			<el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
 				<el-card shadow="always" class="box-card-left">
diff --git a/src/views/hr/archives/index.vue b/src/views/hr/archives/index.vue
index 96d6005c7..71210933a 100644
--- a/src/views/hr/archives/index.vue
+++ b/src/views/hr/archives/index.vue
@@ -10,11 +10,14 @@ import { archivesCont,searchCriteriaForPeople } from '@/api/hr/people/type'
 import { emptypeOptions } from '@/api/hr/people/datacont'
 import { getArchivesListPage } from '@/api/hr/people/index'
 import UserRole from '@/assets/icons/user.svg'
+import { UploadFilled } from '@element-plus/icons-vue'
 /**
  * 引入页面
  */
  import ArchivesCont from '@/views/hr/archives/archivescont.vue'
 
+ const uploadFFurl = import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/uploadUserFiles"
+
 const searchOrgFormRef = ref(ElForm);
 const orgTreeRef = ref(ElTree);	//行政组织树
 const orgTreeLoading = ref(false);	//加载行政组织树
@@ -98,6 +101,52 @@ function lookPeopleCont(cont:archivesCont){
 function updateMyCont(cont:archivesCont){
 	peoplecont.value = cont
 }
+//批量导入数据相关操作
+const piLiangBox = ref(false)
+//打开批量导入面板
+const openPiliangBox = () =>{
+	piLiangBox.value = true	
+}
+//关闭导入
+const handleOpenClose = () =>{
+	piLiangBox.value = false	
+}
+const excelLoading = ref(false)
+
+/**
+ * Excel文件change事件
+ *
+ * @param file
+ */
+ function handleExcelChange(file: UploadFile) {
+	excelLoading.value = true
+	if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
+		ElMessage.warning("上传Excel只能为xlsx、xls格式");
+		excelLoading.value = false;
+		return false;
+	}
+}
+
+const peopleListAry = ref<any[]>();
+/**
+@ 作者: 秦东
+@ 时间: 2024-02-03 14:04:48
+@ 功能: 上传成功
+*/
+const uploadTrue = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+	excelLoading.value = false;
+	console.log("response",response);
+	console.log("uploadFile",uploadFile);
+	console.log("uploadFiles",uploadFiles);
+	peopleListAry.value = response.data.listAry
+}
+const uploadError = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+	excelLoading.value = false;
+	console.log("1response",response);
+	console.log("1uploadFile",uploadFile);
+	console.log("1uploadFiles",uploadFiles);
+}
+
 //加载数据
 onMounted(() => {
 	haveOrgTreeInfo();
@@ -166,7 +215,15 @@ onMounted(() => {
 								type="success" 
 								@click="addPeopleDialog()" 
 							>
-							<i-ep-plus />新增
+							<template #icon><i-ep-plus /></template>新增
+							</el-button>
+							<el-button 
+								v-hasPerm="['127710714914680832']"
+								type="warning" 
+								@click="openPiliangBox" 
+							>
+							<el-icon><MessageBox /></el-icon>
+							批量导入数据
 							</el-button>
 						</el-form-item>
 					</el-form>
@@ -228,6 +285,40 @@ onMounted(() => {
 				<ArchivesCont v-model:isShow="archivesBox" :archivesdata="peoplecont" @updatemyconting="updateMyCont" @getarchivespageclick="getArchivesPage" />
 			</div>
 		</el-main>
+		<el-dialog
+			v-model="piLiangBox"
+			title="批量导入人员信息"
+			width="800"
+			:before-close="handleOpenClose"
+		>
+			<el-row v-loading="excelLoading" element-loading-text="文档解析中，请稍候...">
+				<el-col :span="24">
+					<el-upload
+						class="upload-demo"
+						drag
+						:action="uploadFFurl"
+						:before-upload="handleExcelChange"
+						:on-success="uploadTrue"
+						:on-error = "uploadError"
+						multiple
+					>
+						<el-icon class="el-icon--upload"><upload-filled /></el-icon>
+						<div class="el-upload__text">
+							将电子表格拖到此处或 <em>单击上载</em>
+						</div>
+						
+					</el-upload>
+				</el-col>
+				
+			</el-row>
+			<div class="divBoxCont">
+				<el-row>
+					<el-col v-for="(item,index) in peopleListAry" :key="index" :span="24">
+						{{ item}}
+					</el-col>
+				</el-row>
+			</div>
+		</el-dialog>
 	</el-container>
 </template>
 <style  lang='scss' scoped>
@@ -250,4 +341,10 @@ onMounted(() => {
 .orgTree{
 	padding:5px 0;
 }
+.divBoxCont{
+	width: 100%;
+	height:300px;
+	overflow: hidden;
+	overflow-y: auto;
+}
 </style>
diff --git a/src/views/hr/archives/useronepage.vue b/src/views/hr/archives/useronepage.vue
new file mode 100644
index 000000000..8e8a618a3
--- /dev/null
+++ b/src/views/hr/archives/useronepage.vue
@@ -0,0 +1,14 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-01-24 10:08:14
+@ 备注: 人员信息单页（手机）
+-->
+<script lang='ts' setup>
+
+</script>
+<template>
+	<div></div>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/views/powermanage/rolepower/setuprole/setuprolepower.vue b/src/views/powermanage/rolepower/setuprole/setuprolepower.vue
index 7fe0f9675..ae28db572 100644
--- a/src/views/powermanage/rolepower/setuprole/setuprolepower.vue
+++ b/src/views/powermanage/rolepower/setuprole/setuprolepower.vue
@@ -125,8 +125,10 @@ function getSysMenuTree(sysKey:string){
 			systemPowerMenusTree.value = data;
 			getGrantRolePowers({name:sysKey,roleid:props.roleId})
 				.then(({data})=>{
+					// console.log("获取菜单====>",data);
+					manageScope.value = data.level
 					if(data != null){
-						gainPowerAry.value= data
+						gainPowerAry.value= data.powerList
 					}
 				})
 				.finally(()=>{