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

feat(projects): 补充搜索条件

Browse Source
This commit is contained in:
AN
2025-07-18 23:13:19 +08:00
parent b46f172637
commit b6c7b1b383
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/typings/api/workflow.api.d.ts vendored
View File

@ -40,7 +40,7 @@ declare namespace Api {
/** leave search params */ /** leave search params */
type LeaveSearchParams = CommonType.RecordNullable< type LeaveSearchParams = CommonType.RecordNullable<
Pick<Api.Workflow.Leave, 'leaveDays'> & Api.Common.CommonSearchParams { startLeaveDays: number; endLeaveDays: number } & Api.Common.CommonSearchParams
>; >;
/** leave operate params */ /** leave operate params */

3
src/views/workflow/leave/index.vue
View File

@ -43,7 +43,8 @@ const {
pageSize: 10, pageSize: 10,
// if you want to use the searchParams in Form, you need to define the following properties, and the value is null // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
// the value can not be undefined, otherwise the property in Form will not be reactive // the value can not be undefined, otherwise the property in Form will not be reactive
leaveDays: null, startLeaveDays: null,
endLeaveDays: null,
params: {} params: {}
}, },
columns: () => [ columns: () => [

10
src/views/workflow/leave/modules/leave-search.vue
View File

@ -35,10 +35,14 @@ async function search() {
<NCollapseItem :title="$t('common.search')" name="user-search"> <NCollapseItem :title="$t('common.search')" name="user-search">
<NForm ref="formRef" :model="model" label-placement="left" :label-width="80"> <NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
<NGrid responsive="screen" item-responsive> <NGrid responsive="screen" item-responsive>
<NFormItemGi span="24 s:12 m:6" label="请假天数" path="leaveDays" class="pr-24px"> <NFormItemGi span="24 s:12 m:16" label="请假天数" path="startLeaveDays" class="pr-24px">
<NInputNumber v-model:value="model.leaveDays" placeholder="请输入请假天数" /> <NSpace align="center" class="w-full">
<NInputNumber v-model:value="model.startLeaveDays" placeholder="开始天数" />
<span class="mx-2">至</span>
<NInputNumber v-model:value="model.endLeaveDays" placeholder="结束天数" />
</NSpace>
</NFormItemGi> </NFormItemGi>
<NFormItemGi span="24" class="pr-24px"> <NFormItemGi span="24 s:12 m:8" class="pr-24px">
<NSpace class="w-full" justify="end"> <NSpace class="w-full" justify="end">
<NButton @click="reset"> <NButton @click="reset">
<template #icon> <template #icon>