From 1940c1e6bfdf406bc052acb32f7ae707f4497799 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 22 一月 2026 16:53:06 +0800
Subject: [PATCH] Merge branch 'dev_new' of http://114.132.189.42:9002/r/product-inventory-APP-before into dev_new
---
src/pages/productionManagement/productionReport/index.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/pages/productionManagement/productionReport/index.vue b/src/pages/productionManagement/productionReport/index.vue
index c528611..16412c1 100644
--- a/src/pages/productionManagement/productionReport/index.vue
+++ b/src/pages/productionManagement/productionReport/index.vue
@@ -24,11 +24,12 @@
<u-input v-model="form.quantity"
placeholder="璇疯緭鍏�"
type="number" />
- <!-- <u-number-box v-model="form.quantity"
- step="0.1"
- bgColor="#fff"
- decimal-length="1"
- :min="0"></u-number-box> -->
+ </u-form-item>
+ <u-form-item label="鎶ュ簾鏁伴噺"
+ prop="scrapQty">
+ <u-input v-model="form.scrapQty"
+ placeholder="璇疯緭鍏�"
+ type="number" />
</u-form-item>
<u-form-item label="鐝粍淇℃伅"
prop="schedulingUserId"
@@ -78,6 +79,7 @@
let form = ref({
planQuantity: "",
quantity: "",
+ scrapQty: "",
userName: "",
workOrderId: "",
productProcessRouteItemId: "",
@@ -140,8 +142,15 @@
return;
}
// 杞崲涓烘暟瀛楄繘琛屾瘮杈�
- const quantity = Number(form.value.quantity);
+ const quantity = Number(form.value.quantity) || 0;
+ const scrapQty = Number(form.value.scrapQty) || 0;
const planQuantity = Number(form.value.planQuantity);
+ // 楠岃瘉鐢熶骇鏁伴噺鍜屾姤搴熸暟閲忕殑鍜屼笉鑳借秴杩囧緟鐢熶骇鏁伴噺
+ if (quantity + scrapQty > planQuantity) {
+ submitting.value = false;
+ showToast("鐢熶骇鏁伴噺鍜屾姤搴熸暟閲忕殑鍜屼笉鑳借秴杩囧緟鐢熶骇鏁伴噺");
+ return;
+ }
if (quantity > planQuantity) {
submitting.value = false;
showToast("鏈鐢熶骇鏁伴噺涓嶈兘澶т簬寰呯敓浜ф暟閲�");
@@ -151,6 +160,7 @@
const submitData = {
...form.value,
quantity: Number(form.value.quantity),
+ scrapQty: Number(form.value.scrapQty) || 0,
planQuantity: Number(form.value.planQuantity) || 0,
};
console.log(submitData, "submitData");
--
Gitblit v1.9.3