diff --git a/apps/web-antd/src/views/erp/purchase/supplier/data.ts b/apps/web-antd/src/views/erp/purchase/supplier/data.ts index 846cebcc..eed9d72d 100644 --- a/apps/web-antd/src/views/erp/purchase/supplier/data.ts +++ b/apps/web-antd/src/views/erp/purchase/supplier/data.ts @@ -163,13 +163,12 @@ export function useGridFormSchema(): VbenFormSchema[] { }, }, { - fieldName: 'status', - label: '状态', - component: 'Select', + fieldName: 'telephone', + label: '联系电话', + component: 'Input', componentProps: { - placeholder: '请选择状态', + placeholder: '请输入联系电话', allowClear: true, - options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'), }, }, ]; diff --git a/apps/web-antd/src/views/erp/purchase/supplier/index.vue b/apps/web-antd/src/views/erp/purchase/supplier/index.vue index 2ace8bbb..b0d6d79e 100644 --- a/apps/web-antd/src/views/erp/purchase/supplier/index.vue +++ b/apps/web-antd/src/views/erp/purchase/supplier/index.vue @@ -2,15 +2,17 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { ErpSupplierApi } from '#/api/erp/purchase/supplier'; -import { ref } from 'vue'; - import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { downloadFileFromBlobPart } from '@vben/utils'; import { message } from 'ant-design-vue'; -import { useVbenForm } from '#/adapter/form'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; -import { deleteSupplier, getSupplierPage } from '#/api/erp/purchase/supplier'; +import { + deleteSupplier, + exportSupplier, + getSupplierPage, +} from '#/api/erp/purchase/supplier'; import { $t } from '#/locales'; import { useGridColumns, useGridFormSchema } from './data'; @@ -19,53 +21,11 @@ import SupplierForm from './modules/form.vue'; /** 供应商管理 */ defineOptions({ name: 'ErpSupplier' }); -const searchParams = ref({ - pageNo: 1, - pageSize: 10, - name: '', - mobile: '', - status: undefined, -}); - -/** 搜索表单 */ -const [SearchForm, searchFormApi] = useVbenForm({ - commonConfig: { - componentProps: { - class: 'w-full', - }, - formItemClass: 'col-span-1', - labelWidth: 80, - }, - layout: 'inline', - schema: useGridFormSchema(), - showDefaultActions: false, -}); - /** 刷新表格 */ function onRefresh() { gridApi.query(); } -/** 搜索 */ -async function handleSearch() { - const values = await searchFormApi.getValues(); - Object.assign(searchParams.value, values, { pageNo: 1 }); - onRefresh(); -} - -/** 重置搜索 */ -async function handleReset() { - await searchFormApi.resetFields(); - Object.assign(searchParams.value, { - pageNo: 1, - pageSize: 10, - name: '', - mobile: '', - status: undefined, - }); - onRefresh(); -} - /** 添加供应商 */ function handleCreate() { formModalApi.setData({ type: 'create' }).open(); @@ -96,13 +56,8 @@ async function handleDelete(row: ErpSupplierApi.Supplier) { /** 导出供应商 */ async function handleExport() { - try { - // const data = await exportSupplier(searchParams.value); - // 这里需要处理文件下载逻辑 - message.success('导出成功'); - } catch { - message.error('导出失败'); - } + const data = await exportSupplier(await gridApi.formApi.getValues()); + downloadFileFromBlobPart({ fileName: '供应商.xls', source: data }); } const [FormModal, formModalApi] = useVbenModal({ @@ -111,17 +66,20 @@ const [FormModal, formModalApi] = useVbenModal({ }); const [Grid, gridApi] = useVbenVxeGrid({ + formOptions: { + schema: useGridFormSchema(), + }, gridOptions: { columns: useGridColumns(), - height: 600, + height: 'auto', keepSource: true, proxyConfig: { ajax: { - query: async ({ page }) => { + query: async ({ page }, formValues) => { return await getSupplierPage({ - ...searchParams.value, pageNo: page.currentPage, pageSize: page.pageSize, + ...formValues, }); }, }, @@ -131,14 +89,14 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, toolbarConfig: { refresh: true, - custom: true, + search: true, }, } as VxeTableGridOptions, });