From 0a1d2fe85a280f5543b9b3241aaf8d8a39a32f8c Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 27 十月 2022 18:26:40 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/systemSetting/baseSetting/department/index.vue | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/department/index.vue b/src/views/systemSetting/baseSetting/department/index.vue
index 84044b8..cec4db5 100644
--- a/src/views/systemSetting/baseSetting/department/index.vue
+++ b/src/views/systemSetting/baseSetting/department/index.vue
@@ -53,13 +53,12 @@
</el-table-column>
<el-table-column prop="departTypeName" label="閮ㄩ棬绫诲瀷" min-width="10">
</el-table-column>
- <el-table-column prop="departDes" label="閮ㄩ棬鎻忚堪" min-width="10">
+ <el-table-column prop="parentDepartName" label="涓婄骇閮ㄩ棬" min-width="10">
</el-table-column>
- <!-- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
- </el-table-column> -->
+ <el-table-column prop="departDes" label="閮ㄩ棬鎻忚堪" min-width="30">
+ </el-table-column>
<el-table-column prop="status" label="鍚敤" min-width="5">
<template slot-scope="scope">
- <!-- @change="handleChangeStatus(scope.row)" -->
<el-switch
class="switchStyle"
v-model="scope.row.status"
@@ -93,7 +92,7 @@
<updateUser
:updateFlag="updateFlag"
:userInfo="userInfo"
- :getUserList="context === '' ? getUserList : search"
+ :getDepartList="context === '' ? getUserList : search"
@changeDialog="changMyDialog"
/>
</el-dialog>
@@ -250,8 +249,6 @@
this.$refs.multipleTable.toggleAllSelection();
},
disSame(list) {
- // console.log(this.$refs.multipleTable);
- // const row = this.$refs.table.data
list.forEach((row) => {
this.$refs.multipleTable.toggleRowSelection(row);
});
--
Gitblit v1.8.0