From fc98ee331338c9db4deff3bba7ba3258412f9c23 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 24 三月 2026 17:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/views/productionManagement/workOrder/index.vue | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 83d371f..0e1a793 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -121,7 +121,7 @@
</div>
<div class="info-group">
<div class="info-item">
- <span class="info-label">闇�姹傛暟閲�</span>
+ <span class="info-label">棰勮鐢熶骇鏁伴噺</span>
<span class="info-value">{{ transferCardRowData.planQuantity }}</span>
</div>
<div class="info-item">
@@ -206,6 +206,16 @@
placeholder="璇疯緭鍏ユ姤搴熸暟閲�"
@input="handleScrapQtyInput" />
</el-form-item>
+ <el-form-item label="妫�鍝佹暟閲�"
+ prop="inspectedQuantity">
+ <el-input v-model.number="reportForm.inspectedQuantity"
+ type="number"
+ min="0"
+ step="1"
+ style="width: 300px"
+ placeholder="璇疯緭鍏ユ鍝佹暟閲�"
+ @input="handleInspectedQuantity"/>
+ </el-form-item>
<el-form-item label="鐝粍淇℃伅">
<el-select v-model="reportForm.userId"
style="width: 300px"
@@ -286,7 +296,7 @@
prop: "totalInvestment",
},
{
- label: "闇�姹傛暟閲�",
+ label: "棰勮鐢熶骇鏁伴噺",
prop: "planQuantity",
width: "140",
},
@@ -375,6 +385,7 @@
totalInvestment: 0,
quantity: null,
scrapQty: null,
+ inspectedQuantity: null,
userName: "",
workOrderId: "",
reportWork: "",
@@ -543,6 +554,26 @@
}
reportForm.scrapQty = num;
};
+
+ const handleInspectedQuantity = value => {
+ if (value === "" || value === null || value === undefined) {
+ reportForm.inspectedQuantity = null;
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num)) {
+ return;
+ }
+ if (num < 0) {
+ reportForm.inspectedQuantity = null;
+ return;
+ }
+ if (!Number.isInteger(num)) {
+ reportForm.inspectedQuantity = Math.floor(num);
+ return;
+ }
+ reportForm.inspectedQuantity = num;
+ };
const currentReportRowData = ref(null);
const page = reactive({
current: 1,
@@ -690,6 +721,7 @@
reportForm.workOrderId = row.id;
reportForm.reportWork = row.reportWork;
reportForm.productMainId = row.productMainId;
+ reportForm.inspectedQuantity = row.inspectedQuantity;
reportForm.scrapQty =
row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
nextTick(() => {
@@ -763,12 +795,12 @@
return;
}
- if (quantity > reportForm.planQuantity) {
- ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
+ // if (quantity > reportForm.planQuantity) {
+ // ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
+ // confirmButtonText: "纭畾",
+ // });
+ // return;
+ // }
const submitData = {
...reportForm,
--
Gitblit v1.9.3