From 651a525187fe1d5422f89bb49fe31792e0ad2357 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 6 Jun 2026 21:40:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(erp):=20=E4=BF=AE=E5=A4=8D=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97=E5=AE=BD=E9=AB=98?= =?UTF-8?q?=E4=B8=8E=E5=B5=8C=E5=A5=97=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整 ERP 单据选择弹窗宽度为 80% - 固定选择弹窗 Grid 高度,避免表格被压扁 - 禁用主表单弹窗遮罩点击关闭,避免子弹窗操作误关闭主弹窗 - 同步处理 web-antd、web-ele、web-antdv-next --- .../views/erp/finance/payment/modules/form.vue | 1 + .../payment/modules/purchase-in-select.vue | 12 +++++------- .../payment/modules/sale-return-select.vue | 12 +++++------- .../views/erp/finance/receipt/modules/form.vue | 1 + .../finance/receipt/modules/sale-out-select.vue | 12 +++++------- .../receipt/modules/sale-return-select.vue | 12 +++++------- .../src/views/erp/purchase/in/modules/form.vue | 1 + .../purchase/in/modules/purchase-order-select.vue | 9 +++++---- .../views/erp/purchase/return/modules/form.vue | 1 + .../return/modules/purchase-order-select.vue | 9 +++++---- .../src/views/erp/sale/out/modules/form.vue | 1 + .../erp/sale/out/modules/sale-order-select.vue | 9 +++++---- .../src/views/erp/sale/return/modules/form.vue | 1 + .../erp/sale/return/modules/sale-order-select.vue | 9 +++++---- .../views/erp/finance/payment/modules/form.vue | 1 + .../payment/modules/purchase-in-select.vue | 12 +++++------- .../payment/modules/sale-return-select.vue | 12 +++++------- .../views/erp/finance/receipt/modules/form.vue | 1 + .../finance/receipt/modules/sale-out-select.vue | 12 +++++------- .../receipt/modules/sale-return-select.vue | 12 +++++------- .../src/views/erp/purchase/in/modules/form.vue | 1 + .../purchase/in/modules/purchase-order-select.vue | 9 +++++---- .../views/erp/purchase/return/modules/form.vue | 1 + .../return/modules/purchase-order-select.vue | 9 +++++---- .../src/views/erp/sale/out/modules/form.vue | 1 + .../erp/sale/out/modules/sale-order-select.vue | 9 +++++---- .../src/views/erp/sale/return/modules/form.vue | 1 + .../erp/sale/return/modules/sale-order-select.vue | 9 +++++---- .../views/erp/finance/payment/modules/form.vue | 1 + .../payment/modules/purchase-in-select.vue | 14 ++++++-------- .../payment/modules/sale-return-select.vue | 14 ++++++-------- .../views/erp/finance/receipt/modules/form.vue | 1 + .../finance/receipt/modules/sale-out-select.vue | 15 +++++++-------- .../receipt/modules/sale-return-select.vue | 15 +++++++-------- .../src/views/erp/purchase/in/modules/form.vue | 1 + .../purchase/in/modules/purchase-order-select.vue | 11 ++++++----- .../views/erp/purchase/return/modules/form.vue | 1 + .../return/modules/purchase-order-select.vue | 11 ++++++----- .../src/views/erp/sale/out/modules/form.vue | 1 + .../erp/sale/out/modules/sale-order-select.vue | 11 ++++++----- .../src/views/erp/sale/return/modules/form.vue | 1 + .../erp/sale/return/modules/sale-order-select.vue | 11 ++++++----- 42 files changed, 148 insertions(+), 140 deletions(-) diff --git a/apps/web-antd/src/views/erp/finance/payment/modules/form.vue b/apps/web-antd/src/views/erp/finance/payment/modules/form.vue index 25caa7b05..b9c8cd4c1 100644 --- a/apps/web-antd/src/views/erp/finance/payment/modules/form.vue +++ b/apps/web-antd/src/views/erp/finance/payment/modules/form.vue @@ -176,6 +176,7 @@ const [Modal, modalApi] = useVbenModal({
diff --git a/apps/web-antd/src/views/erp/finance/payment/modules/purchase-in-select.vue b/apps/web-antd/src/views/erp/finance/payment/modules/purchase-in-select.vue index ea4e118e8..deefa8220 100644 --- a/apps/web-antd/src/views/erp/finance/payment/modules/purchase-in-select.vue +++ b/apps/web-antd/src/views/erp/finance/payment/modules/purchase-in-select.vue @@ -26,7 +26,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, gridOptions: { columns: usePurchaseInGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -95,14 +95,12 @@ defineExpose({ open: openModal }); diff --git a/apps/web-antd/src/views/erp/finance/payment/modules/sale-return-select.vue b/apps/web-antd/src/views/erp/finance/payment/modules/sale-return-select.vue index a68cb945c..71534b39a 100644 --- a/apps/web-antd/src/views/erp/finance/payment/modules/sale-return-select.vue +++ b/apps/web-antd/src/views/erp/finance/payment/modules/sale-return-select.vue @@ -26,7 +26,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, gridOptions: { columns: useSaleReturnGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -99,14 +99,12 @@ defineExpose({ open: openModal }); diff --git a/apps/web-antd/src/views/erp/finance/receipt/modules/form.vue b/apps/web-antd/src/views/erp/finance/receipt/modules/form.vue index 3b13253dc..6b2d21796 100644 --- a/apps/web-antd/src/views/erp/finance/receipt/modules/form.vue +++ b/apps/web-antd/src/views/erp/finance/receipt/modules/form.vue @@ -190,6 +190,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/erp/finance/receipt/modules/sale-out-select.vue b/apps/web-antd/src/views/erp/finance/receipt/modules/sale-out-select.vue index 21e793c8c..122349051 100644 --- a/apps/web-antd/src/views/erp/finance/receipt/modules/sale-out-select.vue +++ b/apps/web-antd/src/views/erp/finance/receipt/modules/sale-out-select.vue @@ -26,7 +26,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, gridOptions: { columns: useSaleOutGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -91,14 +91,12 @@ defineExpose({ open: openModal }); diff --git a/apps/web-antd/src/views/erp/finance/receipt/modules/sale-return-select.vue b/apps/web-antd/src/views/erp/finance/receipt/modules/sale-return-select.vue index 3ebd3f2d3..2fc2f0ac2 100644 --- a/apps/web-antd/src/views/erp/finance/receipt/modules/sale-return-select.vue +++ b/apps/web-antd/src/views/erp/finance/receipt/modules/sale-return-select.vue @@ -26,7 +26,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, gridOptions: { columns: useSaleReturnGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -95,14 +95,12 @@ defineExpose({ open: openModal }); diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/form.vue b/apps/web-antd/src/views/erp/purchase/in/modules/form.vue index 11da2a489..3a58289eb 100644 --- a/apps/web-antd/src/views/erp/purchase/in/modules/form.vue +++ b/apps/web-antd/src/views/erp/purchase/in/modules/form.vue @@ -206,6 +206,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue b/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue index 5e24a9b4a..854ae14ff 100644 --- a/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue +++ b/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue @@ -38,7 +38,7 @@ const [Grid] = useVbenVxeGrid({ }, gridOptions: { columns: useOrderGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -108,12 +108,13 @@ function handleOk() { - + diff --git a/apps/web-antd/src/views/erp/purchase/return/modules/form.vue b/apps/web-antd/src/views/erp/purchase/return/modules/form.vue index 9efd64660..dc907057d 100644 --- a/apps/web-antd/src/views/erp/purchase/return/modules/form.vue +++ b/apps/web-antd/src/views/erp/purchase/return/modules/form.vue @@ -206,6 +206,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-select.vue b/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-select.vue index 188ef9116..7cefd0c85 100644 --- a/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-select.vue +++ b/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-select.vue @@ -38,7 +38,7 @@ const [Grid] = useVbenVxeGrid({ }, gridOptions: { columns: useOrderGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -108,12 +108,13 @@ function handleOk() { - + diff --git a/apps/web-antd/src/views/erp/sale/out/modules/form.vue b/apps/web-antd/src/views/erp/sale/out/modules/form.vue index 5aff9e351..9483f64cc 100644 --- a/apps/web-antd/src/views/erp/sale/out/modules/form.vue +++ b/apps/web-antd/src/views/erp/sale/out/modules/form.vue @@ -201,6 +201,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/erp/sale/out/modules/sale-order-select.vue b/apps/web-antd/src/views/erp/sale/out/modules/sale-order-select.vue index 9d6b40ba7..099f56ea0 100644 --- a/apps/web-antd/src/views/erp/sale/out/modules/sale-order-select.vue +++ b/apps/web-antd/src/views/erp/sale/out/modules/sale-order-select.vue @@ -38,7 +38,7 @@ const [Grid] = useVbenVxeGrid({ }, gridOptions: { columns: useOrderGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -108,12 +108,13 @@ function handleOk() { - + diff --git a/apps/web-antd/src/views/erp/sale/return/modules/form.vue b/apps/web-antd/src/views/erp/sale/return/modules/form.vue index 7fa489a75..76ce63a83 100644 --- a/apps/web-antd/src/views/erp/sale/return/modules/form.vue +++ b/apps/web-antd/src/views/erp/sale/return/modules/form.vue @@ -206,6 +206,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/erp/sale/return/modules/sale-order-select.vue b/apps/web-antd/src/views/erp/sale/return/modules/sale-order-select.vue index 8a8ade7a4..ec19cbbcc 100644 --- a/apps/web-antd/src/views/erp/sale/return/modules/sale-order-select.vue +++ b/apps/web-antd/src/views/erp/sale/return/modules/sale-order-select.vue @@ -38,7 +38,7 @@ const [Grid] = useVbenVxeGrid({ }, gridOptions: { columns: useOrderGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -108,12 +108,13 @@ function handleOk() { - + diff --git a/apps/web-antdv-next/src/views/erp/finance/payment/modules/form.vue b/apps/web-antdv-next/src/views/erp/finance/payment/modules/form.vue index 9bb8a42f1..f92292bb2 100644 --- a/apps/web-antdv-next/src/views/erp/finance/payment/modules/form.vue +++ b/apps/web-antdv-next/src/views/erp/finance/payment/modules/form.vue @@ -176,6 +176,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antdv-next/src/views/erp/finance/payment/modules/purchase-in-select.vue b/apps/web-antdv-next/src/views/erp/finance/payment/modules/purchase-in-select.vue index df0c8a677..f7c35f7da 100644 --- a/apps/web-antdv-next/src/views/erp/finance/payment/modules/purchase-in-select.vue +++ b/apps/web-antdv-next/src/views/erp/finance/payment/modules/purchase-in-select.vue @@ -26,7 +26,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, gridOptions: { columns: usePurchaseInGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -95,14 +95,12 @@ defineExpose({ open: openModal }); diff --git a/apps/web-antdv-next/src/views/erp/finance/payment/modules/sale-return-select.vue b/apps/web-antdv-next/src/views/erp/finance/payment/modules/sale-return-select.vue index 7c533292e..584fbe1b2 100644 --- a/apps/web-antdv-next/src/views/erp/finance/payment/modules/sale-return-select.vue +++ b/apps/web-antdv-next/src/views/erp/finance/payment/modules/sale-return-select.vue @@ -26,7 +26,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, gridOptions: { columns: useSaleReturnGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -99,14 +99,12 @@ defineExpose({ open: openModal }); diff --git a/apps/web-antdv-next/src/views/erp/finance/receipt/modules/form.vue b/apps/web-antdv-next/src/views/erp/finance/receipt/modules/form.vue index 16c44e2cc..a5ca1669f 100644 --- a/apps/web-antdv-next/src/views/erp/finance/receipt/modules/form.vue +++ b/apps/web-antdv-next/src/views/erp/finance/receipt/modules/form.vue @@ -190,6 +190,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antdv-next/src/views/erp/finance/receipt/modules/sale-out-select.vue b/apps/web-antdv-next/src/views/erp/finance/receipt/modules/sale-out-select.vue index fc0a9993e..d74324ec0 100644 --- a/apps/web-antdv-next/src/views/erp/finance/receipt/modules/sale-out-select.vue +++ b/apps/web-antdv-next/src/views/erp/finance/receipt/modules/sale-out-select.vue @@ -26,7 +26,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, gridOptions: { columns: useSaleOutGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -91,14 +91,12 @@ defineExpose({ open: openModal }); diff --git a/apps/web-antdv-next/src/views/erp/finance/receipt/modules/sale-return-select.vue b/apps/web-antdv-next/src/views/erp/finance/receipt/modules/sale-return-select.vue index 7f19957ce..21254baf3 100644 --- a/apps/web-antdv-next/src/views/erp/finance/receipt/modules/sale-return-select.vue +++ b/apps/web-antdv-next/src/views/erp/finance/receipt/modules/sale-return-select.vue @@ -26,7 +26,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, gridOptions: { columns: useSaleReturnGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -95,14 +95,12 @@ defineExpose({ open: openModal }); diff --git a/apps/web-antdv-next/src/views/erp/purchase/in/modules/form.vue b/apps/web-antdv-next/src/views/erp/purchase/in/modules/form.vue index 3fe78dc94..512e60290 100644 --- a/apps/web-antdv-next/src/views/erp/purchase/in/modules/form.vue +++ b/apps/web-antdv-next/src/views/erp/purchase/in/modules/form.vue @@ -206,6 +206,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antdv-next/src/views/erp/purchase/in/modules/purchase-order-select.vue b/apps/web-antdv-next/src/views/erp/purchase/in/modules/purchase-order-select.vue index 925301931..6caf8af76 100644 --- a/apps/web-antdv-next/src/views/erp/purchase/in/modules/purchase-order-select.vue +++ b/apps/web-antdv-next/src/views/erp/purchase/in/modules/purchase-order-select.vue @@ -38,7 +38,7 @@ const [Grid] = useVbenVxeGrid({ }, gridOptions: { columns: useOrderGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -108,12 +108,13 @@ function handleOk() { - + diff --git a/apps/web-antdv-next/src/views/erp/purchase/return/modules/form.vue b/apps/web-antdv-next/src/views/erp/purchase/return/modules/form.vue index 235a09147..ed349a100 100644 --- a/apps/web-antdv-next/src/views/erp/purchase/return/modules/form.vue +++ b/apps/web-antdv-next/src/views/erp/purchase/return/modules/form.vue @@ -206,6 +206,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antdv-next/src/views/erp/purchase/return/modules/purchase-order-select.vue b/apps/web-antdv-next/src/views/erp/purchase/return/modules/purchase-order-select.vue index f0cdc5701..c11c1f8e5 100644 --- a/apps/web-antdv-next/src/views/erp/purchase/return/modules/purchase-order-select.vue +++ b/apps/web-antdv-next/src/views/erp/purchase/return/modules/purchase-order-select.vue @@ -38,7 +38,7 @@ const [Grid] = useVbenVxeGrid({ }, gridOptions: { columns: useOrderGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -108,12 +108,13 @@ function handleOk() { - + diff --git a/apps/web-antdv-next/src/views/erp/sale/out/modules/form.vue b/apps/web-antdv-next/src/views/erp/sale/out/modules/form.vue index 06b75feac..8df3a56ba 100644 --- a/apps/web-antdv-next/src/views/erp/sale/out/modules/form.vue +++ b/apps/web-antdv-next/src/views/erp/sale/out/modules/form.vue @@ -201,6 +201,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antdv-next/src/views/erp/sale/out/modules/sale-order-select.vue b/apps/web-antdv-next/src/views/erp/sale/out/modules/sale-order-select.vue index 05ddc9d57..90ce5abad 100644 --- a/apps/web-antdv-next/src/views/erp/sale/out/modules/sale-order-select.vue +++ b/apps/web-antdv-next/src/views/erp/sale/out/modules/sale-order-select.vue @@ -38,7 +38,7 @@ const [Grid] = useVbenVxeGrid({ }, gridOptions: { columns: useOrderGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -108,12 +108,13 @@ function handleOk() { - + diff --git a/apps/web-antdv-next/src/views/erp/sale/return/modules/form.vue b/apps/web-antdv-next/src/views/erp/sale/return/modules/form.vue index 69aea9d1a..1d1f39ff0 100644 --- a/apps/web-antdv-next/src/views/erp/sale/return/modules/form.vue +++ b/apps/web-antdv-next/src/views/erp/sale/return/modules/form.vue @@ -206,6 +206,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antdv-next/src/views/erp/sale/return/modules/sale-order-select.vue b/apps/web-antdv-next/src/views/erp/sale/return/modules/sale-order-select.vue index daf3f3e90..25b053483 100644 --- a/apps/web-antdv-next/src/views/erp/sale/return/modules/sale-order-select.vue +++ b/apps/web-antdv-next/src/views/erp/sale/return/modules/sale-order-select.vue @@ -38,7 +38,7 @@ const [Grid] = useVbenVxeGrid({ }, gridOptions: { columns: useOrderGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -108,12 +108,13 @@ function handleOk() { - + diff --git a/apps/web-ele/src/views/erp/finance/payment/modules/form.vue b/apps/web-ele/src/views/erp/finance/payment/modules/form.vue index 46a0ea20f..4c2a2916b 100644 --- a/apps/web-ele/src/views/erp/finance/payment/modules/form.vue +++ b/apps/web-ele/src/views/erp/finance/payment/modules/form.vue @@ -176,6 +176,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-ele/src/views/erp/finance/payment/modules/purchase-in-select.vue b/apps/web-ele/src/views/erp/finance/payment/modules/purchase-in-select.vue index 8169157d7..ddbd429db 100644 --- a/apps/web-ele/src/views/erp/finance/payment/modules/purchase-in-select.vue +++ b/apps/web-ele/src/views/erp/finance/payment/modules/purchase-in-select.vue @@ -26,7 +26,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, gridOptions: { columns: usePurchaseInGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -95,19 +95,17 @@ defineExpose({ open: openModal }); diff --git a/apps/web-ele/src/views/erp/finance/payment/modules/sale-return-select.vue b/apps/web-ele/src/views/erp/finance/payment/modules/sale-return-select.vue index ec57fd5cc..310548169 100644 --- a/apps/web-ele/src/views/erp/finance/payment/modules/sale-return-select.vue +++ b/apps/web-ele/src/views/erp/finance/payment/modules/sale-return-select.vue @@ -26,7 +26,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, gridOptions: { columns: useSaleReturnGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -99,19 +99,17 @@ defineExpose({ open: openModal }); diff --git a/apps/web-ele/src/views/erp/finance/receipt/modules/form.vue b/apps/web-ele/src/views/erp/finance/receipt/modules/form.vue index b024098f4..92eb7d4af 100644 --- a/apps/web-ele/src/views/erp/finance/receipt/modules/form.vue +++ b/apps/web-ele/src/views/erp/finance/receipt/modules/form.vue @@ -190,6 +190,7 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-ele/src/views/erp/finance/receipt/modules/sale-out-select.vue b/apps/web-ele/src/views/erp/finance/receipt/modules/sale-out-select.vue index b5d2def59..1d583bee1 100644 --- a/apps/web-ele/src/views/erp/finance/receipt/modules/sale-out-select.vue +++ b/apps/web-ele/src/views/erp/finance/receipt/modules/sale-out-select.vue @@ -26,7 +26,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ }, gridOptions: { columns: useSaleOutGridColumns(), - height: 'auto', + height: 520, keepSource: true, proxyConfig: { ajax: { @@ -92,18 +92,17 @@ defineExpose({ open: openModal });