From a9c9e0f8b24d39b51224649cacf51cd6dfa9ea89 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 4 Oct 2025 15:44:11 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90antd=E3=80=91=E3=80=90erp?= =?UTF-8?q?=20=E7=B3=BB=E7=BB=9F=E3=80=91stock/stock=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/erp/purchase/in/data.ts | 1 - apps/web-antd/src/views/erp/purchase/return/data.ts | 1 - apps/web-antd/src/views/erp/sale/out/data.ts | 1 - apps/web-antd/src/views/erp/sale/return/data.ts | 1 - apps/web-antd/src/views/erp/stock/check/data.ts | 3 --- apps/web-antd/src/views/erp/stock/in/data.ts | 2 -- apps/web-antd/src/views/erp/stock/move/data.ts | 3 --- apps/web-antd/src/views/erp/stock/out/data.ts | 3 --- apps/web-antd/src/views/erp/stock/stock/data.ts | 9 +-------- apps/web-antd/src/views/erp/stock/stock/index.vue | 1 + 10 files changed, 2 insertions(+), 23 deletions(-) diff --git a/apps/web-antd/src/views/erp/purchase/in/data.ts b/apps/web-antd/src/views/erp/purchase/in/data.ts index 438416c0f..49b71a06b 100644 --- a/apps/web-antd/src/views/erp/purchase/in/data.ts +++ b/apps/web-antd/src/views/erp/purchase/in/data.ts @@ -350,7 +350,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getWarehouseSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, { diff --git a/apps/web-antd/src/views/erp/purchase/return/data.ts b/apps/web-antd/src/views/erp/purchase/return/data.ts index 9c92ef645..6153754bc 100644 --- a/apps/web-antd/src/views/erp/purchase/return/data.ts +++ b/apps/web-antd/src/views/erp/purchase/return/data.ts @@ -350,7 +350,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getWarehouseSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, { diff --git a/apps/web-antd/src/views/erp/sale/out/data.ts b/apps/web-antd/src/views/erp/sale/out/data.ts index e5383375f..cd5d7f0f8 100644 --- a/apps/web-antd/src/views/erp/sale/out/data.ts +++ b/apps/web-antd/src/views/erp/sale/out/data.ts @@ -354,7 +354,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getWarehouseSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, { diff --git a/apps/web-antd/src/views/erp/sale/return/data.ts b/apps/web-antd/src/views/erp/sale/return/data.ts index bf4f64b1e..1191fe14c 100644 --- a/apps/web-antd/src/views/erp/sale/return/data.ts +++ b/apps/web-antd/src/views/erp/sale/return/data.ts @@ -366,7 +366,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getWarehouseSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, { diff --git a/apps/web-antd/src/views/erp/stock/check/data.ts b/apps/web-antd/src/views/erp/stock/check/data.ts index 8bfeab46b..95b3e9fcc 100644 --- a/apps/web-antd/src/views/erp/stock/check/data.ts +++ b/apps/web-antd/src/views/erp/stock/check/data.ts @@ -189,7 +189,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getProductSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, { @@ -214,7 +213,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getWarehouseSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, { @@ -247,7 +245,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getSimpleUserList, labelField: 'nickname', valueField: 'id', - filterOption: false, }, }, ]; diff --git a/apps/web-antd/src/views/erp/stock/in/data.ts b/apps/web-antd/src/views/erp/stock/in/data.ts index 0d0296a63..1f6b27cf3 100644 --- a/apps/web-antd/src/views/erp/stock/in/data.ts +++ b/apps/web-antd/src/views/erp/stock/in/data.ts @@ -193,7 +193,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getSupplierSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, { @@ -237,7 +236,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getSimpleUserList, labelField: 'nickname', valueField: 'id', - filterOption: false, }, }, ]; diff --git a/apps/web-antd/src/views/erp/stock/move/data.ts b/apps/web-antd/src/views/erp/stock/move/data.ts index f83a2e08d..4560d6b9b 100644 --- a/apps/web-antd/src/views/erp/stock/move/data.ts +++ b/apps/web-antd/src/views/erp/stock/move/data.ts @@ -190,7 +190,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getProductSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, { @@ -215,7 +214,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getWarehouseSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, { @@ -248,7 +246,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getSimpleUserList, labelField: 'nickname', valueField: 'id', - filterOption: false, }, }, ]; diff --git a/apps/web-antd/src/views/erp/stock/out/data.ts b/apps/web-antd/src/views/erp/stock/out/data.ts index 6c8b59fc3..ee2d59b89 100644 --- a/apps/web-antd/src/views/erp/stock/out/data.ts +++ b/apps/web-antd/src/views/erp/stock/out/data.ts @@ -201,7 +201,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getProductSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, { @@ -226,7 +225,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getCustomerSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, { @@ -259,7 +257,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getSimpleUserList, labelField: 'nickname', valueField: 'id', - filterOption: false, }, }, ]; diff --git a/apps/web-antd/src/views/erp/stock/stock/data.ts b/apps/web-antd/src/views/erp/stock/stock/data.ts index 4d0e52b7e..037bb9c45 100644 --- a/apps/web-antd/src/views/erp/stock/stock/data.ts +++ b/apps/web-antd/src/views/erp/stock/stock/data.ts @@ -18,7 +18,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getProductSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, { @@ -32,7 +31,6 @@ export function useGridFormSchema(): VbenFormSchema[] { api: getWarehouseSimpleList, labelField: 'name', valueField: 'id', - filterOption: false, }, }, ]; @@ -60,12 +58,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { field: 'count', title: '库存量', minWidth: 100, - cellRender: { - name: 'CellAmount', - props: { - digits: 2, - }, - }, + formatter: 'formatAmount3', }, { field: 'warehouseName', diff --git a/apps/web-antd/src/views/erp/stock/stock/index.vue b/apps/web-antd/src/views/erp/stock/stock/index.vue index 8cd51e59c..2b20d7475 100644 --- a/apps/web-antd/src/views/erp/stock/stock/index.vue +++ b/apps/web-antd/src/views/erp/stock/stock/index.vue @@ -41,6 +41,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, rowConfig: { keyField: 'id', + isHover: true, }, toolbarConfig: { refresh: true,