From 2575e27d22d40ddab3c2f92e5beadbcf96310ff0 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 24 Feb 2025 14:20:31 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E3=80=81=E5=81=9C=E7=94=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/role/components/RoleForm.vue | 163 ++++++++++-------- src/views/system/role/index.vue | 128 ++++++++++---- 2 files changed, 186 insertions(+), 105 deletions(-) diff --git a/src/views/system/role/components/RoleForm.vue b/src/views/system/role/components/RoleForm.vue index bd79682a..dc1852d3 100644 --- a/src/views/system/role/components/RoleForm.vue +++ b/src/views/system/role/components/RoleForm.vue @@ -29,7 +29,18 @@ > - + + + + {{ $t("system:role:form:checkbox:menuExpand") }}{{ $t('system:role:form:checkbox:menuExpand') }} {{ $t("system:role:form:checkbox:menuNodeAll") }}{{ $t('system:role:form:checkbox:menuNodeAll') }} {{ - $t("system:role:form:checkbox:menuCheckStrictly") + $t('system:role:form:checkbox:menuCheckStrictly') }} diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index e2ff6b68..c31ae267 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -21,26 +21,90 @@ - {{ $t('common:button:search') }} - {{ $t('common:button:add') }} + {{ $t('common:button:search') }} + {{ $t('common:button:add') }} - + - - - + + + - - + + - + + + + @@ -87,36 +153,36 @@ export default { treeData: [], defaultProps: { label: 'MenuName', - children: 'Children' + children: 'Children', }, // 查询参数 queryParams: { GroupId: undefined, - SearchFilter: undefined + SearchFilter: undefined, }, dialogVisible: false, editRow: {}, expandedKeys: [], treeLoading: false, funcListLoading: false, - funcList: [] + funcList: [], } }, mounted() { this.getList() }, methods: { - getDictionary() { - - }, + getDictionary() {}, getList() { this.loading = true - getUserTypeRoleList(this.queryParams).then((res) => { - this.loading = false - this.list = res.Result - }).catch(() => { - this.loading = false - }) + getUserTypeRoleList(this.queryParams) + .then((res) => { + this.loading = false + this.list = res.Result + }) + .catch(() => { + this.loading = false + }) }, handleAddRole() { this.editRow = {} @@ -139,11 +205,13 @@ export default { this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', distinguishCancelAndClose: true, - }).then(() => { deleteUserTypeRole(row.Id).then((res) => { if (res.IsSuccess) { - this.list.splice(this.list.findIndex((item) => item.Id === row.Id), 1) + this.list.splice( + this.list.findIndex((item) => item.Id === row.Id), + 1 + ) this.$message.success(this.$t('common:message:deletedSuccessfully')) } }) @@ -152,8 +220,8 @@ export default { closeModal() { this.model_cfg.visible = false this.getList() - } - } + }, + }, } \ No newline at end of file diff --git a/src/views/dictionary/template/index.vue b/src/views/dictionary/template/index.vue index 6dd5e340..62f19a95 100644 --- a/src/views/dictionary/template/index.vue +++ b/src/views/dictionary/template/index.vue @@ -6,52 +6,84 @@ - + - + - + - + - + - + - + - + + + + + diff --git a/src/views/system/user/edit/index.vue b/src/views/system/user/edit/index.vue index 2be70da6..b481efe1 100644 --- a/src/views/system/user/edit/index.vue +++ b/src/views/system/user/edit/index.vue @@ -7,23 +7,31 @@ + + + From f4af0fc157eefb3723e6c71b49fba0705928c54b Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 25 Feb 2025 11:31:56 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E8=A7=92=E8=89=B2=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/list/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue index 81c1b10c..58b75ba4 100644 --- a/src/views/system/user/list/index.vue +++ b/src/views/system/user/list/index.vue @@ -55,9 +55,9 @@ {{ Array.isArray(scope.row.UserRoleList) && scope.row.UserRoleList.length > 0 - ? scope.row.UserRoleList.map((item) => item.UserTypeShortName).join( - ', ' - ) + ? scope.row.UserRoleList.filter((item) => !item.IsUserRoleDisabled) + .map((item) => item.UserTypeShortName) + .join(', ') : '' }} @@ -396,13 +396,13 @@ export default { label: this.$t('common:button:search'), type: 'primary', emitKey: 'search', - icon: 'el-icon-search' + icon: 'el-icon-search', }, { label: this.$t('common:button:reset'), type: 'primary', emitKey: 'reset', - icon: 'el-icon-refresh-left' + icon: 'el-icon-refresh-left', }, { label: this.$t('common:button:new'), From be95951f400e6471a7ffda1d95eb7988db32b32e Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 25 Feb 2025 16:58:26 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/components/Retrospect.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/system/user/components/Retrospect.vue b/src/views/system/user/components/Retrospect.vue index 09426651..43628c0c 100644 --- a/src/views/system/user/components/Retrospect.vue +++ b/src/views/system/user/components/Retrospect.vue @@ -299,11 +299,10 @@ export default { let res = await getUserJoinedTrialList(this.searchData) if (res.IsSuccess) { this.loading = false - res.OtherInfo = res.OtherInfo - ? res.OtherInfo - : Object.keys(this.otherInfo).forEach((key) => { - this.otherInfo[key] = res.OtherInfo[key] - }) + res.OtherInfo = res.OtherInfo ? res.OtherInfo : {} + Object.keys(this.otherInfo).forEach((key) => { + this.otherInfo[key] = res.OtherInfo[key] + }) this.list = res.Result.CurrentPageData this.total = res.Result.TotalCount }