From b52c08544fd4ab1e8ff0f09efaac160608fd90ce Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 27 四月 2026 11:59:06 +0800
Subject: [PATCH] 天津宝东 1.修改生产流程
---
src/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue b/src/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue
index 2379076..c7d6cfb 100644
--- a/src/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue
+++ b/src/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue
@@ -6,13 +6,9 @@
<el-table-column label="鍘熸枡鍨嬪彿" prop="materialModel" min-width="180" />
<el-table-column label="鍘熺焊闇�瑕侀噺" prop="basePaperQty" min-width="120" />
<el-table-column label="绾哥闇�瑕侀噺" prop="cartonQty" min-width="120" />
- <el-table-column label="濉戞枡琚嬫暟閲�" prop="plasticBagQty" min-width="120" />
- <el-table-column label="璁￠噺鍗曚綅" prop="unit" width="100" />
<el-table-column label="鍘熺焊棰嗙敤鏁伴噺" prop="basePaperPickQty" min-width="120" />
<el-table-column label="绾哥棰嗙敤鏁伴噺" prop="cartonPickQty" min-width="120" />
- <el-table-column label="濉戞枡琚嬮鐢ㄦ暟閲�" prop="plasticBagPickQty" min-width="120" />
<el-table-column label="閫�鏂欐暟閲�" prop="returnQty" min-width="110" />
- <el-table-column label="瀹為檯鏁伴噺" prop="actualQty" min-width="110" />
</el-table>
<template #footer>
<span class="dialog-footer">
@@ -33,7 +29,6 @@
<el-table :data="returnSummaryList" border row-key="summaryKey">
<el-table-column label="鍘熸枡鍚嶇О" prop="materialName" min-width="180" />
<el-table-column label="鍘熸枡鍨嬪彿" prop="materialModel" min-width="180" />
- <el-table-column label="璁￠噺鍗曚綅" prop="unit" min-width="100" />
<el-table-column label="閫�鏂欐眹鎬绘暟閲�" prop="returnQtyTotal" min-width="140" />
</el-table>
@@ -71,11 +66,7 @@
const getPickQty = item => {
const directPick = Number(item.pickQty ?? NaN);
if (Number.isFinite(directPick)) return directPick;
- return (
- Number(item.basePaperPickQty || 0) +
- Number(item.cartonPickQty || 0) +
- Number(item.plasticBagPickQty || 0)
- );
+ return Number(item.basePaperPickQty || 0) + Number(item.cartonPickQty || 0);
};
const calcReturnQty = item =>
getPickQty(item) - Number(item.actualQty || 0);
@@ -120,12 +111,11 @@
materialDetailTableData.value.forEach(item => {
const returnQty = calcReturnQty(item);
if (returnQty <= 0) return;
- const key = `${item.materialModelId || ""}_${item.materialName || ""}_${item.materialModel || ""}_${item.unit || ""}`;
+ const key = `${item.materialModelId || ""}_${item.materialName || ""}_${item.materialModel || ""}`;
const old = map.get(key) || {
summaryKey: key,
materialName: item.materialName || "",
materialModel: item.materialModel || "",
- unit: item.unit || "",
returnQtyTotal: 0,
};
old.returnQtyTotal += returnQty;
--
Gitblit v1.9.3