From 129e151f68e215ff592bb36ef52eb1ed5c15740d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 17:50:22 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/systemSetting/baseSetting/department/index.vue | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/department/index.vue b/src/views/systemSetting/baseSetting/department/index.vue
index eb02119..1ae0aa0 100644
--- a/src/views/systemSetting/baseSetting/department/index.vue
+++ b/src/views/systemSetting/baseSetting/department/index.vue
@@ -51,15 +51,14 @@
</el-table-column>
<el-table-column prop="departName" label="閮ㄩ棬鍚嶇О" min-width="10">
</el-table-column>
- <el-table-column prop="departType" label="閮ㄩ棬绫诲瀷" min-width="10">
+ <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>
@@ -160,7 +159,7 @@
dialogUpdate: false,
updateFlag: false,
userInfo: "",
- totalNum: 200,
+ totalNum: 0,
pageSize: 10,
currentPage: 1,
context: "",
@@ -265,7 +264,6 @@
id,
},
}).then((res) => {
- console.log(res);
this.$message({
type: res.code === 404 ? "warning" : "success",
message: res.message,
--
Gitblit v1.8.0