From 758aa7ce0b70bf8bde616c5332e6af2eb205f199 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 24 三月 2026 17:55:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/views/productionManagement/workOrder/index.vue | 126 +++++++++++++++++++++++++++++++++++++----
1 files changed, 112 insertions(+), 14 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index d8fbab9..0e950d1 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -176,6 +176,16 @@
readonly
style="width: 300px" />
</el-form-item>
+ <el-form-item label="鎶曞叆鎬婚噺(kg)"
+ prop="totalInvestment">
+ <el-input v-model.number="reportForm.totalInvestment"
+ type="number"
+ min="1"
+ step="1"
+ style="width: 300px"
+ placeholder="璇疯緭鍏ユ姇鍏ユ�婚噺"
+ @input="handleTotalInvestmentInput" />
+ </el-form-item>
<el-form-item label="鏈鐢熶骇鏁伴噺"
prop="quantity">
<el-input v-model.number="reportForm.quantity"
@@ -195,6 +205,15 @@
style="width: 300px"
placeholder="璇疯緭鍏ユ姤搴熸暟閲�"
@input="handleScrapQtyInput" />
+ </el-form-item>
+ <el-form-item label="妫�鍝佹暟閲�"
+ prop="inspectedQuantity">
+ <el-input-number v-model.number="reportForm.inspectedQuantity"
+ :min="0"
+ :step="1"
+ style="width: 300px"
+ controls-position="right"
+ placeholder="璇疯緭鍏ユ鍝佹暟閲�"/>
</el-form-item>
<el-form-item label="鐝粍淇℃伅">
<el-select v-model="reportForm.userId"
@@ -270,6 +289,10 @@
{
label: "宸ュ簭鍚嶇О",
prop: "processName",
+ },
+ {
+ label: "鎶曞叆鎬婚噺(kg)",
+ prop: "totalInvestment",
},
{
label: "棰勮鐢熶骇鏁伴噺",
@@ -358,8 +381,10 @@
const userOptions = ref([]);
const reportForm = reactive({
planQuantity: 0,
+ totalInvestment: 0,
quantity: null,
scrapQty: null,
+ inspectedQuantity: null,
userName: "",
workOrderId: "",
reportWork: "",
@@ -368,6 +393,26 @@
productMainId: null,
});
+ // 鎶曞叆鎬婚噺楠岃瘉瑙勫垯
+ const validateTotalInvestment = (rule, value, callback) => {
+ if (value === null || value === undefined || value === "") {
+ callback(new Error("璇疯緭鍏ユ姇鍏ユ�婚噺"));
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num) || !Number.isInteger(num) || num < 1) {
+ callback(new Error("鎶曞叆鎬婚噺蹇呴』澶т簬绛変簬1"));
+ return;
+ }
+ if (reportForm.quantity !== null && reportForm.quantity !== undefined && reportForm.quantity !== "") {
+ if (num < Number(reportForm.quantity)) {
+ callback(new Error("鎶曞叆鎬婚噺蹇呴』澶т簬鏈鐢熶骇鏁伴噺"));
+ return;
+ }
+ }
+ callback();
+ };
+
// 鏈鐢熶骇鏁伴噺楠岃瘉瑙勫垯
const validateQuantity = (rule, value, callback) => {
if (value === null || value === undefined || value === "") {
@@ -375,10 +420,15 @@
return;
}
const num = Number(value);
- // 鏁存暟涓斿ぇ浜庣瓑浜�1
if (isNaN(num) || !Number.isInteger(num) || num < 1) {
callback(new Error("鏈鐢熶骇鏁伴噺蹇呴』澶т簬绛変簬1"));
return;
+ }
+ if (reportForm.totalInvestment !== null && reportForm.totalInvestment !== undefined && reportForm.totalInvestment !== "") {
+ if (num > Number(reportForm.totalInvestment)) {
+ callback(new Error("鏈鐢熶骇鏁伴噺蹇呴』灏忎簬鎶曞叆鎬婚噺"));
+ return;
+ }
}
callback();
};
@@ -400,37 +450,87 @@
// 楠岃瘉瑙勫垯
const reportFormRules = {
+ totalInvestment: [{ required: true, validator: validateTotalInvestment, trigger: "blur" }],
quantity: [{ required: true, validator: validateQuantity, trigger: "blur" }],
scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
};
- // 澶勭悊鏈鐢熶骇鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�1
- const handleQuantityInput = value => {
+ // 澶勭悊鎶曞叆鎬婚噺杈撳叆
+ const handleTotalInvestmentInput = value => {
if (value === "" || value === null || value === undefined) {
- reportForm.quantity = null;
+ reportForm.totalInvestment = null;
+ reportForm.scrapQty = null;
return;
}
const num = Number(value);
if (isNaN(num)) {
return;
}
- // 濡傛灉灏忎簬1锛屾竻闄�
if (num < 1) {
- reportForm.quantity = null;
+ reportForm.totalInvestment = null;
+ reportForm.scrapQty = null;
return;
}
- // 濡傛灉鏄皬鏁板彇鏁存暟閮ㄥ垎
if (!Number.isInteger(num)) {
const intValue = Math.floor(num);
- // 濡傛灉鍙栨暣鍚庡皬浜�1锛屾竻闄�
+ if (intValue < 1) {
+ reportForm.totalInvestment = null;
+ reportForm.scrapQty = null;
+ return;
+ }
+ reportForm.totalInvestment = intValue;
+ } else {
+ reportForm.totalInvestment = num;
+ }
+ // 濡傛灉 quantity 鏈夊�硷紝鑷姩璁＄畻 scrapQty = totalInvestment - quantity
+ if (reportForm.quantity !== null && reportForm.quantity !== undefined && reportForm.quantity !== "") {
+ const total = Number(reportForm.totalInvestment);
+ const qty = Number(reportForm.quantity);
+ if (total > qty) {
+ reportForm.scrapQty = total - qty;
+ } else {
+ reportForm.scrapQty = null;
+ }
+ }
+ };
+
+ // 澶勭悊鏈鐢熶骇鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�1
+ const handleQuantityInput = value => {
+ if (value === "" || value === null || value === undefined) {
+ reportForm.quantity = null;
+ reportForm.scrapQty = null;
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num)) {
+ return;
+ }
+ if (num < 1) {
+ reportForm.quantity = null;
+ reportForm.scrapQty = null;
+ return;
+ }
+ if (!Number.isInteger(num)) {
+ const intValue = Math.floor(num);
if (intValue < 1) {
reportForm.quantity = null;
+ reportForm.scrapQty = null;
return;
}
reportForm.quantity = intValue;
- return;
+ } else {
+ reportForm.quantity = num;
}
- reportForm.quantity = num;
+ // 濡傛灉 totalInvestment 鏈夊�硷紝鑷姩璁＄畻 scrapQty = totalInvestment - quantity
+ if (reportForm.totalInvestment !== null && reportForm.totalInvestment !== undefined && reportForm.totalInvestment !== "") {
+ const total = Number(reportForm.totalInvestment);
+ const qty = Number(reportForm.quantity);
+ if (total > qty) {
+ reportForm.scrapQty = total - qty;
+ } else {
+ reportForm.scrapQty = null;
+ }
+ }
};
// 澶勭悊鎶ュ簾鏁伴噺
@@ -440,21 +540,17 @@
return;
}
const num = Number(value);
- // 濡傛灉鏄疦aN锛屼繚鎸佸師鍊�
if (isNaN(num)) {
return;
}
- // 濡傛灉鏄礋鏁帮紝娓呴櫎杈撳叆
if (num < 0) {
reportForm.scrapQty = null;
return;
}
- // 濡傛灉鏄皬鏁帮紝鍙栨暣鏁伴儴鍒�
if (!Number.isInteger(num)) {
reportForm.scrapQty = Math.floor(num);
return;
}
- // 鏈夋晥鐨勯潪璐熸暣鏁帮紙鍖呮嫭0锛�
reportForm.scrapQty = num;
};
const currentReportRowData = ref(null);
@@ -597,12 +693,14 @@
const showReportDialog = row => {
currentReportRowData.value = row;
reportForm.planQuantity = row.planQuantity;
+ reportForm.totalInvestment = row.totalInvestment;
reportForm.quantity =
row.quantity !== undefined && row.quantity !== null ? row.quantity : null;
reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
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(() => {
--
Gitblit v1.9.3