From 71a9eef518f2f2f1a1eb2fb90f2eb8ab7b155bc8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 08 一月 2026 14:57:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业
---
src/views/productionManagement/workOrder/index.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index f120ae7..acc3cd1 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -61,9 +61,9 @@
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="editDialogVisible = false">鍙栨秷</el-button>
<el-button type="primary"
@click="handleUpdate">纭畾</el-button>
+ <el-button @click="editDialogVisible = false">鍙栨秷</el-button>
</span>
</template>
</el-dialog>
@@ -164,7 +164,7 @@
<el-form :model="reportForm"
label-width="120px">
<el-form-item label="寰呯敓浜ф暟閲�">
- <el-input v-model="reportForm.remainingQuantity"
+ <el-input v-model="reportForm.planQuantity"
readonly
style="width: 300px" />
</el-form-item>
@@ -184,9 +184,9 @@
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="reportDialogVisible = false">鍙栨秷</el-button>
<el-button type="primary"
@click="handleReport">纭畾</el-button>
+ <el-button @click="reportDialogVisible = false">鍙栨秷</el-button>
</span>
</template>
</el-dialog>
@@ -214,6 +214,11 @@
width: "140",
},
{
+ label: "鐢熶骇璁㈠崟鍙�",
+ prop: "productOrderNpsNo",
+ width: "140",
+ },
+ {
label: "浜у搧鍚嶇О",
prop: "productName",
width: "140",
@@ -229,6 +234,11 @@
{
label: "宸ュ簭鍚嶇О",
prop: "processName",
+ },
+ {
+ label: "寰呯敓浜ф暟閲�",
+ prop: "planQuantity",
+ width: "140",
},
{
label: "璁″垝鐢熶骇鏁伴噺",
@@ -294,7 +304,7 @@
const transferCardRowData = ref(null);
const reportDialogVisible = ref(false);
const reportForm = reactive({
- remainingQuantity: 0,
+ planQuantity: 0,
quantity: 0,
userName: "",
workOrderId: "",
@@ -378,7 +388,7 @@
const showReportDialog = row => {
currentReportRowData.value = row;
- reportForm.remainingQuantity = 1;
+ reportForm.planQuantity = row.planQuantity;
reportForm.quantity = row.quantity;
reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
reportForm.workOrderId = row.id;
@@ -396,7 +406,7 @@
});
return;
}
- if (reportForm.quantity > reportForm.remainingQuantity) {
+ if (reportForm.quantity > reportForm.planQuantity) {
ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
confirmButtonText: "纭畾",
});
--
Gitblit v1.9.3