From 33d9e4e1a653f0fb460826eb20bf58457045ff8e Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 04 三月 2026 16:40:33 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New
---
src/views/productionManagement/workOrder/index.vue | 106 +++++++++++++++++++++++++++++------------------------
1 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 59457e8..162dd91 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -24,10 +24,12 @@
:page="page"
:tableLoading="tableLoading"
@pagination="pagination">
- <template #completionStatus="{ row }">
- <el-progress :percentage="toProgressPercentage(row?.completionStatus)" :color="progressColor(toProgressPercentage(row?.completionStatus))" :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
- </template>
- </PIMTable>
+ <template #completionStatus="{ row }">
+ <el-progress :percentage="toProgressPercentage(row?.completionStatus)"
+ :color="progressColor(toProgressPercentage(row?.completionStatus))"
+ :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
+ </template>
+ </PIMTable>
</div>
<el-dialog v-model="editDialogVisible"
title="缂栬緫鏃堕棿"
@@ -104,7 +106,6 @@
transferCardRowData.status
}}</span>
</div> -->
-
<div class="info-item">
<span class="info-label">璁″垝寮�濮嬫椂闂�</span>
<span class="info-value">{{ transferCardRowData.planStartTime }}</span>
@@ -175,7 +176,8 @@
readonly
style="width: 300px" />
</el-form-item>
- <el-form-item label="鏈鐢熶骇鏁伴噺" prop="quantity">
+ <el-form-item label="鏈鐢熶骇鏁伴噺"
+ prop="quantity">
<el-input v-model.number="reportForm.quantity"
type="number"
min="1"
@@ -184,7 +186,8 @@
placeholder="璇疯緭鍏ユ湰娆＄敓浜ф暟閲�"
@input="handleQuantityInput" />
</el-form-item>
- <el-form-item label="鎶ュ簾鏁伴噺" prop="scrapQty">
+ <el-form-item label="鎶ュ簾鏁伴噺"
+ prop="scrapQty">
<el-input v-model.number="reportForm.scrapQty"
type="number"
min="0"
@@ -202,7 +205,7 @@
@change="handleUserChange">
<el-option v-for="user in userOptions"
:key="user.userId"
- :label="user.userName"
+ :label="user.nickName"
:value="user.userId" />
</el-select>
</el-form-item>
@@ -364,50 +367,46 @@
userId: "",
productMainId: null,
});
-
+
// 鏈鐢熶骇鏁伴噺楠岃瘉瑙勫垯
const validateQuantity = (rule, value, callback) => {
- if (value === null || value === undefined || value === '') {
- callback(new Error('璇疯緭鍏ユ湰娆＄敓浜ф暟閲�'));
+ if (value === null || value === undefined || value === "") {
+ callback(new Error("璇疯緭鍏ユ湰娆＄敓浜ф暟閲�"));
return;
}
const num = Number(value);
// 鏁存暟涓斿ぇ浜庣瓑浜�1
if (isNaN(num) || !Number.isInteger(num) || num < 1) {
- callback(new Error('鏈鐢熶骇鏁伴噺蹇呴』澶т簬绛変簬1'));
+ callback(new Error("鏈鐢熶骇鏁伴噺蹇呴』澶т簬绛変簬1"));
return;
}
callback();
};
-
+
// 鎶ュ簾鏁伴噺楠岃瘉瑙勫垯
const validateScrapQty = (rule, value, callback) => {
- if (value === null || value === undefined || value === '') {
+ if (value === null || value === undefined || value === "") {
callback();
return;
}
const num = Number(value);
// 鏁存暟涓斿ぇ浜庣瓑浜�0
if (isNaN(num) || !Number.isInteger(num) || num < 0) {
- callback(new Error('鎶ュ簾鏁伴噺蹇呴』澶т簬绛変簬0'));
+ callback(new Error("鎶ュ簾鏁伴噺蹇呴』澶т簬绛変簬0"));
return;
}
callback();
};
-
+
// 楠岃瘉瑙勫垯
const reportFormRules = {
- quantity: [
- { required: true, validator: validateQuantity, trigger: 'blur' }
- ],
- scrapQty: [
- { validator: validateScrapQty, trigger: 'blur' }
- ]
+ quantity: [{ required: true, validator: validateQuantity, trigger: "blur" }],
+ scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
};
-
+
// 澶勭悊鏈鐢熶骇鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�1
- const handleQuantityInput = (value) => {
- if (value === '' || value === null || value === undefined) {
+ const handleQuantityInput = value => {
+ if (value === "" || value === null || value === undefined) {
reportForm.quantity = null;
return;
}
@@ -433,10 +432,10 @@
}
reportForm.quantity = num;
};
-
+
// 澶勭悊鎶ュ簾鏁伴噺
- const handleScrapQtyInput = (value) => {
- if (value === '' || value === null || value === undefined) {
+ const handleScrapQtyInput = value => {
+ if (value === "" || value === null || value === undefined) {
reportForm.scrapQty = null;
return;
}
@@ -532,7 +531,9 @@
// 鍒涘缓 Blob URL
const fileBlob =
- blob instanceof Blob ? blob : new Blob([blob], { type: blob.type || "application/octet-stream" });
+ blob instanceof Blob
+ ? blob
+ : new Blob([blob], { type: blob.type || "application/octet-stream" });
const url = window.URL.createObjectURL(fileBlob);
// 鍒涘缓闅愯棌 iframe锛岀敤浜庤Е鍙戞祻瑙堝櫒鎵撳嵃
@@ -596,12 +597,14 @@
const showReportDialog = row => {
currentReportRowData.value = row;
reportForm.planQuantity = row.planQuantity;
- reportForm.quantity = row.quantity !== undefined && row.quantity !== null ? row.quantity : null;
+ 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.scrapQty = row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
+ reportForm.scrapQty =
+ row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
nextTick(() => {
reportFormRef.value?.clearValidate();
});
@@ -610,7 +613,7 @@
.then(res => {
if (res.code === 200) {
reportForm.userId = res.data.userId;
- reportForm.userName = res.data.userName;
+ reportForm.userName = res.data.nickName;
}
})
.catch(err => {
@@ -625,31 +628,38 @@
};
const handleReport = () => {
- reportFormRef.value?.validate((valid) => {
+ reportFormRef.value?.validate(valid => {
if (!valid) {
return false;
}
-
+
if (reportForm.planQuantity <= 0) {
ElMessageBox.alert("寰呯敓浜ф暟閲忎负0锛屾棤娉曟姤宸�", "鎻愮ず", {
confirmButtonText: "纭畾",
});
return;
}
-
+
// 楠岃瘉鏈鐢熶骇鏁伴噺
- if (reportForm.quantity === null || reportForm.quantity === undefined || reportForm.quantity === '') {
+ if (
+ reportForm.quantity === null ||
+ reportForm.quantity === undefined ||
+ reportForm.quantity === ""
+ ) {
ElMessageBox.alert("璇疯緭鍏ユ湰娆＄敓浜ф暟閲�", "鎻愮ず", {
confirmButtonText: "纭畾",
});
return;
}
-
+
const quantity = Number(reportForm.quantity);
- const scrapQty = reportForm.scrapQty === null || reportForm.scrapQty === undefined || reportForm.scrapQty === ''
- ? 0
- : Number(reportForm.scrapQty);
-
+ const scrapQty =
+ reportForm.scrapQty === null ||
+ reportForm.scrapQty === undefined ||
+ reportForm.scrapQty === ""
+ ? 0
+ : Number(reportForm.scrapQty);
+
// 鏈鐢熶骇鏁伴噺
if (isNaN(quantity) || !Number.isInteger(quantity) || quantity < 1) {
ElMessageBox.alert("鏈鐢熶骇鏁伴噺蹇呴』澶т簬绛変簬1", "鎻愮ず", {
@@ -657,7 +667,7 @@
});
return;
}
-
+
// 鎶ュ簾鏁伴噺蹇呴』鏄暣鏁颁笖澶т簬绛変簬0
if (isNaN(scrapQty) || !Number.isInteger(scrapQty) || scrapQty < 0) {
ElMessageBox.alert("鎶ュ簾鏁伴噺蹇呴』澶т簬绛変簬0", "鎻愮ず", {
@@ -665,20 +675,20 @@
});
return;
}
-
+
if (quantity > reportForm.planQuantity) {
ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
confirmButtonText: "纭畾",
});
return;
}
-
+
const submitData = {
...reportForm,
quantity: quantity,
- scrapQty: scrapQty
+ scrapQty: scrapQty,
};
-
+
// console.log(submitData);
addProductMain(submitData).then(res => {
if (res.code === 200) {
@@ -708,11 +718,11 @@
};
// 鐢ㄦ埛閫夋嫨鍙樺寲鏃舵洿鏂� userName
- const handleUserChange = (userId) => {
+ const handleUserChange = userId => {
if (userId) {
const selectedUser = userOptions.value.find(user => user.userId === userId);
if (selectedUser) {
- reportForm.userName = selectedUser.userName;
+ reportForm.userName = selectedUser.nickName;
}
} else {
reportForm.userName = "";
--
Gitblit v1.9.3