OMC/fe.ems.vue3
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 修复用户表单中的角色和部门ID逻辑，并调整表单项的显示条件

Browse Source
This commit is contained in:
TsMask
2025-02-28 19:47:55 +08:00
parent 6d2945c506
commit 7099bd7349
1 changed files with 75 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
src/views/system/user/index.vue
View File

@@ -385,8 +385,8 @@ function fnModalVisibleByEdit(userId?: string | number) {
modalState.options.posts = posts;
const { user, roleIds, postIds } = res.data;
modalState.from = Object.assign(modalState.from, user);
modalState.from.roleIds = roleIds;
modalState.from.postIds = postIds;
modalState.from.roleIds = [2]; //roleIds;
modalState.from.postIds = [2]; // postIds;
modalState.from.deptId = deptTreeData.value[0].id;
modalState.title =
t('common.addText') + t('views.system.user.userInfo');
@@ -753,7 +753,7 @@ function fnGetList(pageNum?: number) {
queryParams.beginTime = queryRangePicker.value[0];
queryParams.endTime = queryRangePicker.value[1];
listUser(toRaw(queryParams)).then(res => {
if (res.code === RESULT_CODE_SUCCESS) {
if (res.code === RESULT_CODE_SUCCESS) {
// 取消勾选
if (tableState.selectedRowKeys.length > 0) {
tableState.selectedRowKeys = [];
@@ -809,7 +809,62 @@ onMounted(() => {
<!-- 表格搜索栏 -->
<a-form :model="queryParams" name="queryParams" layout="horizontal">
<a-row :gutter="16">
<a-col :lg="18" :md="12" :xs="24">
<a-col :lg="6" :md="12" :xs="24">
<a-form-item
:label="t('views.system.user.account')"
name="userName"
>
<a-input
v-model:value="queryParams.userName"
allow-clear
:maxlength="30"
:placeholder="t('common.inputPlease')"
></a-input>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :xs="24">
<a-form-item :label="t('views.system.user.phone')" name="phone">
<a-input
v-model:value="queryParams.phone"
allow-clear
:maxlength="11"
:placeholder="t('common.inputPlease')"
></a-input>
</a-form-item>
</a-col>
<a-col :lg="4" :md="12" :xs="24">
<a-form-item
:label="t('views.system.user.status')"
name="statusFlag"
>
<a-select
v-model:value="queryParams.statusFlag"
allow-clear
:options="dict.sysNormalDisable"
:placeholder="t('common.selectPlease')"
>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="8" :md="12" :xs="24">
<a-form-item
:label="t('views.system.user.loginTime')"
name="queryRangePicker"
>
<a-range-picker
v-model:value="queryRangePicker"
allow-clear
bordered
:show-time="{ format: 'HH:mm:ss' }"
format="YYYY-MM-DD HH:mm:ss"
value-format="x"
style="width: 100%"
></a-range-picker>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="16">
<a-col :lg="18" :md="12" :xs="24" v-if="false">
<a-form-item
:label="t('views.system.user.className')"
name="deptId"
@@ -848,61 +903,6 @@ onMounted(() => {
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="16">
<a-col :lg="6" :md="12" :xs="24">
<a-form-item
:label="t('views.system.user.account')"
name="userName"
>
<a-input
v-model:value="queryParams.userName"
allow-clear
:maxlength="30"
:placeholder="t('common.inputPlease')"
></a-input>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :xs="24">
<a-form-item
:label="t('views.system.user.phone')"
name="phone"
>
<a-input
v-model:value="queryParams.phone"
allow-clear
:maxlength="11"
:placeholder="t('common.inputPlease')"
></a-input>
</a-form-item>
</a-col>
<a-col :lg="4" :md="12" :xs="24">
<a-form-item :label="t('views.system.user.status')" name="statusFlag">
<a-select
v-model:value="queryParams.statusFlag"
allow-clear
:options="dict.sysNormalDisable"
:placeholder="t('common.selectPlease')"
>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="8" :md="12" :xs="24">
<a-form-item
:label="t('views.system.user.loginTime')"
name="queryRangePicker"
>
<a-range-picker
v-model:value="queryRangePicker"
allow-clear
bordered
:show-time="{ format: 'HH:mm:ss' }"
format="YYYY-MM-DD HH:mm:ss"
value-format="x"
style="width: 100%"
></a-range-picker>
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-card>
@@ -932,6 +932,7 @@ onMounted(() => {
type="dashed"
@click.prevent="fnModalUploadImportOpen()"
v-perms:has="['system:user:import']"
v-if="false"
>
<template #icon><ImportOutlined /></template>
{{ t('common.import') }}
@@ -940,6 +941,7 @@ onMounted(() => {
type="dashed"
@click.prevent="fnExportList()"
v-perms:has="['system:user:export']"
v-if="false"
>
<template #icon><ExportOutlined /></template>
{{ t('common.export') }}
@@ -1170,7 +1172,10 @@ onMounted(() => {
</a-form-item>
</a-col>
<a-col :lg="12" :md="12" :xs="24">
<a-form-item :label="t('views.system.user.status')" name="statusFlag">
<a-form-item
:label="t('views.system.user.status')"
name="statusFlag"
>
<DictTag
:options="dict.sysNormalDisable"
:value="modalState.from.statusFlag"
@@ -1181,10 +1186,7 @@ onMounted(() => {
<a-row>
<a-col :lg="12" :md="12" :xs="24">
<a-form-item
:label="t('views.system.user.phone')"
name="phone"
>
<a-form-item :label="t('views.system.user.phone')" name="phone">
{{ modalState.from.phone }}
</a-form-item>
</a-col>
@@ -1200,6 +1202,7 @@ onMounted(() => {
name="deptId"
:label-col="{ span: 3 }"
:label-wrap="true"
v-if="false"
>
<a-tree-select
:value="modalState.from.deptId"
@@ -1218,7 +1221,7 @@ onMounted(() => {
</a-tree-select>
</a-form-item>
<a-row>
<a-row v-if="false">
<a-col :lg="12" :md="12" :xs="24">
<a-form-item
:label="t('views.system.user.userWork')"
@@ -1352,6 +1355,7 @@ onMounted(() => {
:md="12"
:xs="24"
v-perms:has="['system:user:editPost']"
v-if="false"
>
<a-form-item
:label="t('views.system.user.userWork')"
@@ -1425,7 +1429,10 @@ onMounted(() => {
modalState.from.userId !== userStore.userId
"
>
<a-form-item :label="t('views.system.user.status')" name="statusFlag">
<a-form-item
:label="t('views.system.user.status')"
name="statusFlag"
>
<a-select
v-model:value="modalState.from.statusFlag"
default-value="0"
@@ -1442,6 +1449,7 @@ onMounted(() => {
name="roleIds"
:label-col="{ span: 3 }"
v-perms:has="['system:user:editRole']"
v-if="false"
>
<a-select
v-model:value="modalState.from.roleIds"
@@ -1461,6 +1469,7 @@ onMounted(() => {
:label="t('views.system.user.fromClass')"
name="deptId"
:label-col="{ span: 3 }"
v-if="false"
>
<a-tree-select
v-model:value="modalState.from.deptId"