From 7407f7fd5b9d8e52edf4d1398eae710a0dd08ce9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 15 八月 2024 16:01:47 +0800
Subject: [PATCH] 整合代码
---
Source/plt-web/plt-web-ui/src/views/system/department/index.vue | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
index d56868a..c8f755e 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
@@ -25,9 +25,10 @@
</template>
<template slot="menuLeft" slot-scope="scope">
- <el-button icon="el-icon-school" plain size="small" type="primary" @click="assignMembersHandler">鍒嗛厤鎴愬憳</el-button>
+ <el-button icon="el-icon-school" plain size="small" type="primary" @click="assignMembersHandler">鍒嗛厤鎴愬憳
+ </el-button>
<el-button icon="el-icon-user" plain size="small" type="primary" @click="statisticsHandler">缁熻</el-button>
- <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="statisticsHandler">瀵煎叆閮ㄩ棬</el-button>
+ <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadHandler">瀵煎叆閮ㄩ棬</el-button>
<el-button icon="el-icon-download" plain size="small" type="primary" @click="downLoadHandler">涓嬭浇瀵煎叆妯℃澘</el-button>
</template>
</avue-crud>
@@ -36,7 +37,6 @@
<el-dialog
v-dialogDrag
v-loading="statisticsLoading"
- :destroy-on-close="true"
:visible.sync="statisticsVisible"
append-to-body="true"
class="avue-dialog"
@@ -62,6 +62,10 @@
:transferTitle="transferTitle" title="閮ㄩ棬娣诲姞鎴愬憳"
@transferSend="departTransferSend">
</transfer>
+
+ <!-- 瀵煎叆閮ㄩ棬 -->
+ <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆閮ㄩ棬"
+ @updata="getTableList"></upload-file>
</basic-container>
</template>
@@ -111,6 +115,7 @@
refreshBtn: false,
addBtn: false,
menu: false,
+ calcHeight:80,
column: [
{
label: '閮ㄩ棬',
@@ -131,12 +136,16 @@
label: '瑙掕壊',
prop: 'pkPersonName',
sortable: true,
+ overHidden: true,
},
]
},
leftTransferData: [],
rightTransferData: [],
transferTitle: ['寰呴�変汉鍛�', '宸查�変汉鍛�'],
+ tipList: ['瀵煎叆妯℃澘涓爣鏄庣孩鑹插瓧浣撶殑涓哄繀杈撻」', '瀵煎叆缁撴瀯涓烘爲缁撴瀯鏃惰淇濊瘉ID鍒椾笉鑳介噸澶�', '鐖禝D璇蜂娇鐢ㄧ晫闈笂閮ㄩ棬鐨勫敮涓�鏍囪瘑ID鎴栬�匛xcel涓墜鍔ㄨ緭鍏ョ殑ID', '鐖禝D鍒椾负绌烘椂锛屽鍏ョ殑閮ㄩ棬鍗充负椤跺眰閮ㄩ棬'],
+ upFileType: ['xls', 'xlsx'],
+ fileUrl: 'api/departmentQueryController/importDept',
}
},
methods: {
@@ -273,7 +282,6 @@
}
countSmUserByDeptOid({pkDepartment: this.departCurrenRow.ALLDept === 'ALLDept' ? null : this.departCurrenRow.oid}).then(res => {
- console.log(res);
if (res.data.code === 200) {
const data = res.data.data;
this.countData = data.map(item => {
@@ -339,13 +347,18 @@
},
// 涓嬭浇瀵煎叆妯℃澘
- downLoadHandler(){
+ downLoadHandler() {
download().then(res => {
func.downloadFileByBlobHandler(res);
this.$message.success('涓嬭浇鎴愬姛')
}).catch(err => {
this.$message.error(err);
})
+ },
+
+ // 瀵煎叆閮ㄩ棬
+ upLoadHandler() {
+ this.$refs.upload.visible = true;
}
}
}
--
Gitblit v1.9.3