diff --git a/apps/web-antd/src/views/license/customer/index.vue b/apps/web-antd/src/views/license/customer/index.vue index 1ccb16d..1f749ee 100644 --- a/apps/web-antd/src/views/license/customer/index.vue +++ b/apps/web-antd/src/views/license/customer/index.vue @@ -82,6 +82,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ formOptions: { schema: useGridFormSchema(), submitOnEnter: true, + wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-4', }, gridOptions: { columns: useGridColumns(), diff --git a/apps/web-antd/src/views/license/license/data.ts b/apps/web-antd/src/views/license/license/data.ts index 5b49742..b4daed1 100644 --- a/apps/web-antd/src/views/license/license/data.ts +++ b/apps/web-antd/src/views/license/license/data.ts @@ -250,6 +250,14 @@ export function useGridFormSchema(): VbenFormSchema[] { option.name.toLowerCase().includes(input.toLowerCase()), }, }, + { + fieldName: 'projectName', + label: $t('project.name'), + component: 'Input', + componentProps: { + allowClear: true, + }, + }, { fieldName: 'applicant', label: $t('license.applicant'), diff --git a/apps/web-antd/src/views/license/license/index.vue b/apps/web-antd/src/views/license/license/index.vue index 58d3da3..6dc8c91 100644 --- a/apps/web-antd/src/views/license/license/index.vue +++ b/apps/web-antd/src/views/license/license/index.vue @@ -135,6 +135,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ collapsedRows: 2, schema: useGridFormSchema(), submitOnEnter: true, + wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-4', }, gridOptions: { columns: useGridColumns(), diff --git a/apps/web-antd/src/views/license/project/data.ts b/apps/web-antd/src/views/license/project/data.ts index 7fe448d..b9e1fd4 100644 --- a/apps/web-antd/src/views/license/project/data.ts +++ b/apps/web-antd/src/views/license/project/data.ts @@ -286,12 +286,11 @@ export function useGridFormSchema(): VbenFormSchema[] { }, }, { - fieldName: 'status', - label: $t('project.status'), - component: 'Select', + fieldName: 'name', + label: $t('project.name'), + component: 'Input', componentProps: { allowClear: true, - options: getDictOptions(DICT_TYPE.LIC_PROJECT_STATUS, 'number'), }, }, { @@ -308,6 +307,29 @@ export function useGridFormSchema(): VbenFormSchema[] { }, }, }, + { + fieldName: 'businessOwner', + label: $t('project.businessOwner'), + component: 'Select', + componentProps: { + options: userList, + allowClear: true, + showSearch: true, + fieldNames: { label: 'nickname', value: 'id' }, + filterOption: (input: string, option: any) => { + return option.nickname.toLowerCase().includes(input.toLowerCase()); + }, + }, + }, + { + fieldName: 'status', + label: $t('project.status'), + component: 'Select', + componentProps: { + allowClear: true, + options: getDictOptions(DICT_TYPE.LIC_PROJECT_STATUS, 'number'), + }, + }, { fieldName: 'businessStatus', label: $t('project.businessStatus'), @@ -318,8 +340,8 @@ export function useGridFormSchema(): VbenFormSchema[] { }, }, { - fieldName: 'name', - label: $t('project.name'), + fieldName: 'customerOwner', + label: $t('project.customerOwner'), component: 'Input', componentProps: { allowClear: true, @@ -341,28 +363,6 @@ export function useGridFormSchema(): VbenFormSchema[] { allowClear: true, }, }, - { - fieldName: 'businessOwner', - label: $t('project.businessOwner'), - component: 'Select', - componentProps: { - options: userList, - allowClear: true, - showSearch: true, - fieldNames: { label: 'nickname', value: 'id' }, - filterOption: (input: string, option: any) => { - return option.nickname.toLowerCase().includes(input.toLowerCase()); - }, - }, - }, - { - fieldName: 'customerOwner', - label: $t('project.customerOwner'), - component: 'Input', - componentProps: { - allowClear: true, - }, - }, // { // fieldName: 'startTime', // label: $t('project.startTime'), diff --git a/apps/web-antd/src/views/license/project/index.vue b/apps/web-antd/src/views/license/project/index.vue index 5ec2635..7bef3fd 100644 --- a/apps/web-antd/src/views/license/project/index.vue +++ b/apps/web-antd/src/views/license/project/index.vue @@ -113,6 +113,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ collapsedRows: 2, schema: useGridFormSchema(), submitOnEnter: true, + wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-4', }, gridOptions: { columns: useGridColumns(onActionClick), diff --git a/apps/web-antd/src/views/report/expire/modules/expiring.vue b/apps/web-antd/src/views/report/expire/modules/expiring.vue index b88242f..0d6771d 100644 --- a/apps/web-antd/src/views/report/expire/modules/expiring.vue +++ b/apps/web-antd/src/views/report/expire/modules/expiring.vue @@ -11,6 +11,7 @@ const [Grid] = useVbenVxeGrid({ schema: useExpiringGridFormSchema(), submitOnEnter: true, fieldMappingTime: [['expiryDate', ['expiryDateStart', 'expiryDateEnd']]], + wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-4', }, gridOptions: { columns: useExpiringGridColumns(), diff --git a/apps/web-antd/src/views/report/expired/modules/expired.vue b/apps/web-antd/src/views/report/expired/modules/expired.vue index 5c7e218..71bcfad 100644 --- a/apps/web-antd/src/views/report/expired/modules/expired.vue +++ b/apps/web-antd/src/views/report/expired/modules/expired.vue @@ -11,6 +11,7 @@ const [Grid] = useVbenVxeGrid({ schema: useExpiredGridFormSchema(), submitOnEnter: true, fieldMappingTime: [['expiryDate', ['expiryDateStart', 'expiryDateEnd']]], + wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-4', }, gridOptions: { columns: useExpiredGridColumns(), diff --git a/apps/web-antd/src/views/report/member/modules/staff.vue b/apps/web-antd/src/views/report/member/modules/staff.vue index 07d3564..e4c91d7 100644 --- a/apps/web-antd/src/views/report/member/modules/staff.vue +++ b/apps/web-antd/src/views/report/member/modules/staff.vue @@ -11,6 +11,7 @@ const [Grid] = useVbenVxeGrid({ schema: useStaffGridFormSchema(), submitOnEnter: true, fieldMappingTime: [['updateTime', ['updateTimeStart', 'updateTimeEnd']]], + wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-4', }, gridOptions: { columns: useStaffGridColumns(), diff --git a/apps/web-antd/src/views/report/progress/modules/project.vue b/apps/web-antd/src/views/report/progress/modules/project.vue index 6f20302..04e13cb 100644 --- a/apps/web-antd/src/views/report/progress/modules/project.vue +++ b/apps/web-antd/src/views/report/progress/modules/project.vue @@ -11,6 +11,7 @@ const [Grid] = useVbenVxeGrid({ schema: useProjectGridFormSchema(), submitOnEnter: true, fieldMappingTime: [['updateTime', ['updateTimeStart', 'updateTimeEnd']]], + wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-4', }, gridOptions: { columns: useProjectGridColumns(),