From 6dbbc9c86afa617901ab603c6a82f6621b07bf06 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期三, 26 八月 2026 09:54:13 +0800
Subject: [PATCH] feat(erp): 增加采购与销售订单订金校验逻辑,限制不得超过优惠后总金额 - **采购订单 (`src/views/erp/purchase/order/data.ts`)**: 为 `depositPrice`(支付订金)字段增加双重校验,动态绑定 `max` 属性到 `totalPrice`,并添加动态表单 rules,超出时提示“订金不能大于优惠后金额”。 - **销售订单 (`src/views/erp/sale/order/data.ts`)**: 复用同等防错机制,限制 `depositPrice`(收取订金)输入不能超过优惠后金额,超过时给予相应报错提示。
---
src/views/mes/md/workstation/workshop/modules/form.vue | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/views/mes/md/workstation/workshop/modules/form.vue b/src/views/mes/md/workstation/workshop/modules/form.vue
index ba98f53..ec8f682 100644
--- a/src/views/mes/md/workstation/workshop/modules/form.vue
+++ b/src/views/mes/md/workstation/workshop/modules/form.vue
@@ -5,8 +5,8 @@
import { computed, ref } from "vue";
- import { useVbenModal } from "../../../../../../packages/effects/common-ui/src";
- import { BarcodeBizTypeEnum } from "../../../../../../packages/constants/src";
+ import { useVbenModal } from "@vben/common-ui";
+ // import { BarcodeBizTypeEnum } from "@vben/constants";
import { Button, message } from "ant-design-vue";
@@ -17,14 +17,14 @@
updateWorkshop,
} from "#/api/mes/md/workstation/workshop";
import { $t } from "#/locales";
- import { BarcodeDetail } from "#/views/wls/barcode/components";
+ // import { BarcodeDetail } from "#/views/wls/barcode/components";
import { useFormSchema } from "../data";
const emit = defineEmits(["success"]);
const formType = ref<FormType>("create"); // 琛ㄥ崟妯″紡
const formData = ref<MesMdWorkshopApi.Workshop>();
- const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉$爜璇︽儏寮圭獥
+ // const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉$爜璇︽儏寮圭獥
const isDetail = computed(() => formType.value === "detail"); // 鏄惁鏌ョ湅妯″紡
const getTitle = computed(() => {
@@ -49,17 +49,17 @@
});
/** 鏌ョ湅杞﹂棿鏉$爜 */
- function handleBarcode() {
- if (!formData.value?.id) {
- return;
- }
- barcodeDetailRef.value?.openByBusiness(
- formData.value.id,
- BarcodeBizTypeEnum.WORKSHOP,
- formData.value.code,
- formData.value.name
- );
- }
+ // function handleBarcode() {
+ // if (!formData.value?.id) {
+ // return;
+ // }
+ // barcodeDetailRef.value?.openByBusiness(
+ // formData.value.id,
+ // BarcodeBizTypeEnum.WORKSHOP,
+ // formData.value.code,
+ // formData.value.name
+ // );
+ // }
const [Modal, modalApi] = useVbenModal({
async onConfirm() {
@@ -117,9 +117,9 @@
<template v-if="isDetail && formData?.id"
#prepend-footer>
<div class="flex flex-auto items-center">
- <Button @click="handleBarcode">鏌ョ湅鏉$爜</Button>
+ <!-- <Button @click="handleBarcode">鏌ョ湅鏉$爜</Button> -->
</div>
</template>
</Modal>
- <BarcodeDetail ref="barcodeDetailRef" />
+ <!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
</template>
--
Gitblit v1.9.3