jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-24 07:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitee.com/xlsea/ruoyi-plus-soybean into flow

Browse Source
This commit is contained in:
AN
2025-08-07 20:36:14 +08:00
parent 41c74db1cd 4e9839bd48
commit aaad817131
10 changed files with 65 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/system/config/modules/config-search.vue
View File

@ -21,9 +21,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null);
const model = defineModel<Api.System.ConfigSearchParams>('model', { required: true });
function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
if (value?.length) {
model.value.params!.beginTime = value[0];
model.value.params!.endTime = value[1];
const params = model.value.params!;
if (value && value.length === 2) {
[params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
}
}

9
src/views/system/oss/modules/oss-search.vue
View File

@ -21,9 +21,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null);
const model = defineModel<Api.System.OssSearchParams>('model', { required: true });
function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
if (value?.length) {
model.value.params!.beginCreateTime = value[0];
model.value.params!.endCreateTime = value[1];
const params = model.value.params!;
if (value && value.length === 2) {
[params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
}
}

9
src/views/system/role/modules/role-auth-user-drawer.vue
View File

@ -168,9 +168,12 @@ const dateRangeCreateTime = ref<[string, string] | null>(null);
const datePickerRef = ref<InstanceType<typeof NDatePicker>>();
function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
if (value?.length) {
searchParams.params!.beginTime = value[0];
searchParams.params!.endTime = value[1];
const params = searchParams.params!;
if (value && value.length === 2) {
[params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
}
}

9
src/views/system/role/modules/role-search.vue
View File

@ -24,9 +24,12 @@ const model = defineModel<Api.System.RoleSearchParams>('model', { required: true
const { options: sysNormalDisableOptions } = useDict('sys_normal_disable', false);
function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
if (value?.length) {
model.value.params!.beginTime = `${value[0]} 00:00:00`;
model.value.params!.endTime = `${value[1]} 23:59:59`;
const params = model.value.params!;
if (value && value.length === 2) {
[params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
}
}

4
src/views/system/user/modules/user-import-modal.vue
View File

@ -48,6 +48,7 @@ function closeDrawer() {
}
async function handleSubmit() {
console.log(data.value);
fileList.value.forEach(item => {
item.status = 'pending';
});
@ -91,6 +92,7 @@ function handleDownloadTemplate() {
watch(visible, () => {
if (visible.value) {
data.value.updateSupport = false;
fileList.value = [];
success.value = false;
message.value = '';
@ -140,7 +142,7 @@ watch(visible, () => {
</NUploadDragger>
</NUpload>
<div class="flex-center">
<NCheckbox v-model="data.updateSupport">{{ $t('common.updateExisting') }}</NCheckbox>
<NCheckbox v-model:checked="data.updateSupport">{{ $t('common.updateExisting') }}</NCheckbox>
</div>
<NAlert v-if="message" :title="$t('common.importResult')" :type="success ? 'success' : 'error'" :bordered="false">

17
src/views/system/user/modules/user-operate-drawer.vue
View File

@ -1,5 +1,5 @@
<script setup lang="ts">
import { computed, reactive, watch } from 'vue';
import { computed, reactive, ref, watch } from 'vue';
import { useLoading } from '@sa/hooks';
import { fetchCreateUser, fetchGetUserInfo, fetchUpdateUser } from '@/service/api/system';
import { useFormRules, useNaiveForm } from '@/hooks/common/form';
@ -49,6 +49,8 @@ type Model = Api.System.UserOperateParams;
const model: Model = reactive(createDefaultModel());
const roleOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
function createDefaultModel(): Model {
return {
deptId: null,
@ -82,6 +84,10 @@ async function getUserInfo() {
if (!error) {
model.roleIds = data.roleIds;
model.postIds = data.postIds;
roleOptions.value = data.roles.map(role => ({
label: role.roleName,
value: role.roleId
}));
}
endLoading();
}
@ -209,7 +215,14 @@ watch(visible, () => {
<PostSelect v-model:value="model.postIds" :dept-id="model.deptId" multiple clearable />
</NFormItem>
<NFormItem :label="$t('page.system.user.roleIds')" path="roleIds">
<RoleSelect v-model:value="model.roleIds" multiple clearable />
<NSelect
v-model:value="model.roleIds"
:loading="loading"
:options="roleOptions"
multiple
clearable
placeholder="请选择角色"
/>
</NFormItem>
<NFormItem :label="$t('page.system.user.status')" path="status">
<DictRadio v-model:value="model.status" dict-code="sys_normal_disable" />

9
src/views/system/user/modules/user-search.vue
View File

@ -24,9 +24,12 @@ const datePickerRef = ref<InstanceType<typeof NDatePicker>>();
const model = defineModel<Api.System.UserSearchParams>('model', { required: true });
function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
if (value?.length) {
model.value.params!.beginTime = value[0];
model.value.params!.endTime = value[1];
const params = model.value.params!;
if (value && value.length === 2) {
[params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
}
}