From 58f66bcf22448b05d054aae839fb16817d45eadd Mon Sep 17 00:00:00 2001 From: weiwei Date: Tue, 12 Aug 2025 09:22:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarketerp/purchaseManagement/smErpCgBack/form.vue | 2 +- src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue | 2 +- .../supermarketerp/purchaseManagement/smErpCgInventory/form.vue | 2 +- .../supermarketerp/purchaseManagement/smErpCgPlan/form.vue | 2 +- .../supermarketerp/retailManagement/smErpRetailBack/form.vue | 2 +- .../retailManagement/smErpRetailDelivery/form.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue index 8a2c642..fc543eb 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue @@ -231,7 +231,7 @@ const dataRules = ref({ }) const validRules = ref>({ unitId: [{ required: true, message: "必须选择" }], - quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }], + quantity: [{ required: true, type: "number", message: "必须填写" }], }) // 合计总金额 diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue index 36eaab2..d6d2fa8 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue @@ -261,7 +261,7 @@ const dataRules = ref({ // 可编辑表格校验规则 const validRules = ref>({ unitId: [{ required: true, message: "必须选择" }], - quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }], + quantity: [{ required: true, type: "number", message: "必须填写" }], }) // 初始化数据 diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue index 81b53dd..513c756 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue @@ -259,7 +259,7 @@ const dataRules = ref({ }) const validRules = ref>({ selectedUnitObj: [{ required: true, message: "必须选择" }], - quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }], + quantity: [{ required: true, type: "number", message: "必须填写" }], }) // 合计总金额 diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue index 9556d50..50b5545 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue @@ -205,7 +205,7 @@ const dataRules = ref({ // 可编辑表格校验规则 const validRules = ref>({ unitId: [{ required: true, message: "必须选择" }], - quantity: [{ required: true, type: "number", min: 0, message: "必需大于等于0" }], + quantity: [{ required: true, type: "number", message: "必须填写" }], }) // 初始化数据 diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue index 27e922b..002fa6a 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue @@ -293,7 +293,7 @@ const dataRules = ref({ // 可编辑表格校验规则 const validRules = ref>({ unitId: [{ required: true, message: "必须选择" }], - quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }], + quantity: [{ required: true, type: "number", message: "必须填写" }], }) // 收款金额表单校验规则 diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue index c05d4a4..c376bff 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue @@ -229,7 +229,7 @@ const dataRules = ref({ }) const validRules = ref>({ unitId: [{ required: true, message: "必须选择" }], - quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }], + quantity: [{ required: true, type: "number", message: "必须填写" }], }) onMounted(() => { From ddfc8fe48b342d41fac643b01b5ed4beda16d75e Mon Sep 17 00:00:00 2001 From: weiwei Date: Tue, 12 Aug 2025 09:51:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=9B=B6=E5=94=AE=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseManagement/smErpCgBack/index.vue | 3 +- .../purchaseManagement/smErpCgDd/index.vue | 11 +- .../smErpCgInventory/index.vue | 3 +- .../purchaseManagement/smErpCgPlan/index.vue | 61 +------- .../smErpRetailBack/index.vue | 138 ++++++++---------- .../smErpRetailDelivery/index.vue | 3 +- .../supermarketerp/stockTaking/index.vue | 3 +- 7 files changed, 73 insertions(+), 149 deletions(-) diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue index cc43d86..9a1e7c4 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue @@ -102,8 +102,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table" import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords" import { useMessage, useMessageBox } from "/@/hooks/message" import { displayPrice } from "/@/utils/formatMoney" - -const SmForm = defineAsyncComponent(() => import("./form.vue")) +import SmForm from "./form.vue" const queryRef = ref() const showSearch = ref(true) diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue index 7ff0ed1..416e42a 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue @@ -1,11 +1,11 @@