From 5f6d717c348b1ca9925110d8e6607800773d8102 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 29 Nov 2021 09:04:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys
---
src/views/system/user.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index b13577c..e3a987d 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -747,15 +747,21 @@
},
initData(tenantId) {
getRoleTree(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "roleId");
+ try {
+ const column = this.findObject(this.option.group, "roleId");
+ } catch (error) {}
column.dicData = res.data.data;
});
getDeptTree(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "deptId");
+ try {
+ const column = this.findObject(this.option.group, "deptId");
+ } catch (error) {}
column.dicData = res.data.data;
});
getPostList(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "postId");
+ try {
+ const column = this.findObject(this.option.group, "postId");
+ } catch (error) {}
column.dicData = res.data.data;
});
},
@@ -794,6 +800,7 @@
row.deptId = row.deptId.join(",");
row.roleId = row.roleId.join(",");
row.postId = row.postId.join(",");
+ delete row.rtime;
update(row).then(
() => {
this.initFlag = false;
--
Gitblit v1.9.3