diff --git a/src/pages/authority/organization/organizationedit.vue b/src/pages/authority/organization/organizationedit.vue index 4dda5d3fa5fe5fe13d3a12acbd0e918f0600f19b..23af1c8b0795ae41a940c244119653af6bd0ccdb 100644 --- a/src/pages/authority/organization/organizationedit.vue +++ b/src/pages/authority/organization/organizationedit.vue @@ -162,12 +162,16 @@ export default { } }, get_now_user() { - let userName = this.$store.state.userInfo.user_name; - - this.form = { - person: userName, - date: formatDateTime_date(new Date()), - }; + this.$api.user.getNowUser().then(({ data }) => { + if (data.success == 1) { + this.form = { + person: data.data.user_name, + date: formatDateTime_date(new Date()), + }; + } else { + console.log(data.errMsg); + } + }); }, get_user() { this.$http diff --git a/src/pages/authority/role/addroles.vue b/src/pages/authority/role/addroles.vue index 0b83d0184451f916364bf5d73259122787fa5623..ed878861a56c47b2de2dddaa9ff3ee8e16885308 100644 --- a/src/pages/authority/role/addroles.vue +++ b/src/pages/authority/role/addroles.vue @@ -39,7 +39,7 @@ - + 保存 @@ -76,8 +76,8 @@ export default { form: { name: "", desc: "", - person: this.$store.state.userInfo.user_name, - date: formatDateTime_date(new Date()), + person: "", + date: "", }, now_user: 2, //0:普通用户,1:组织管理员,2:超级管理员 permissionData: [], @@ -96,6 +96,7 @@ export default { watch: {}, computed: {}, created() { + this.get_now_user(); this.get_now_page(); console.log(this.$route); }, @@ -319,6 +320,18 @@ export default { console.log(values); console.log(this.permissionData); }, + get_now_user() { + this.$api.user.getNowUser().then(({ data }) => { + let baseinfo = { + person: data.data.user_name, + date: formatDateTime_date(new Date()), + }; + this.form = { + ...this.form, + ...baseinfo, + }; + }); + }, }, }; diff --git a/src/pages/authority/user/organizationuser.vue b/src/pages/authority/user/organizationuser.vue index d4789df63dda3b829c3fd41a078c621ce089c6c7..28c47036c1ad5bfb1a590e280bb39cd82504043c 100644 --- a/src/pages/authority/user/organizationuser.vue +++ b/src/pages/authority/user/organizationuser.vue @@ -110,7 +110,7 @@ - + { + if (data.success == 1) { + this.baseinfo = { + person: data.data.user_name, + date: formatDateTime_date(new Date()), + }; + this.form = { + ...this.form, + ...this.baseinfo, + }; + } else { + console.log(data.errMsg); + } + }); }, }, }; diff --git a/src/pages/authority/user/permission.vue b/src/pages/authority/user/permission.vue index b4ce7abf5db296e484d893c0ff1558a9757dfd5b..b8d10cacaac2ac423493ebbb13a502251ee6cbcc 100644 --- a/src/pages/authority/user/permission.vue +++ b/src/pages/authority/user/permission.vue @@ -77,9 +77,12 @@ export default { data: () => ({ listTotal: 0, listData: [], + tempFilter: null, }), methods: { listAction(filters) { + this.tempFilter = filters; + this.$http .get("/apaas/backmgt/user/userApply/list", { params: { @@ -109,10 +112,18 @@ export default { } ) .then(({ data }) => { - this.$message({ - message: `操作成功.`, - type: "success", - }); + if (data.success === 1) { + this.$message({ + message: `操作成功.`, + type: "success", + }); + this.listAction(this.tempFilter); + } else { + this.$message({ + message: `操作失败.`, + type: "warning", + }); + } }) .catch((error) => { this.$message({ diff --git a/src/pages/authority/user/useradd.vue b/src/pages/authority/user/useradd.vue deleted file mode 100644 index 42bcb0319f7667ae9ecf2ab4a3dea45883ccb381..0000000000000000000000000000000000000000 --- a/src/pages/authority/user/useradd.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue index 0a1edcdedf9d1be3338c7079500c3e15639b93f4..0cbd5a7572d32fd490ddf944bee645f6e35c3d34 100644 --- a/src/pages/workbench/fwgl/fwglList.vue +++ b/src/pages/workbench/fwgl/fwglList.vue @@ -542,11 +542,11 @@ export default { return item.service_apply_info.approval_status === 1; }, }, - { + /* { label: "删除", class: "warn", callback: this.deleteItem, - }, + }, */ ], }, ]; @@ -585,7 +585,7 @@ export default { }, ]; } - // TODO:组织管理员 --- 云资源管理 + // TODO: 组织管理员 --- 云资源管理 else if (level == 1 && type == 2) { this.listUrl = "xxxxxx"; this.listHeader = [ @@ -815,11 +815,11 @@ export default { return item.service_apply_info.approval_status === 1; }, }, - { + /* { label: "删除", class: "warn", callback: this.deleteItem, - }, + }, */ ], }, ]; @@ -858,7 +858,7 @@ export default { }, ]; } - // TODO:超级管理员 --- 云资源管理 + // TODO: 超级管理员 --- 云资源管理 else if (level == 2 && type == 2) { this.listUrl = "xxxxxx"; this.listHeader = [