From de83f5112fecda011bce0192dce152e66bb56f87 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 31 三月 2026 17:37:24 +0800
Subject: [PATCH] Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventory-management into dev_衡阳_鹏创电子
---
src/views/productionManagement/productionReporting/components/Detail.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/components/Detail.vue b/src/views/productionManagement/productionReporting/components/Detail.vue
index 6439989..cd4f4a9 100644
--- a/src/views/productionManagement/productionReporting/components/Detail.vue
+++ b/src/views/productionManagement/productionReporting/components/Detail.vue
@@ -54,11 +54,12 @@
<el-descriptions-item label="鎶ュ伐浜哄憳">{{ row.nickName || '-' }}</el-descriptions-item>
<el-descriptions-item label="宸ュ簭">{{ row.process || '-' }}</el-descriptions-item>
<el-descriptions-item label="宸ュ崟缂栧彿">{{ row.workOrderNo || '-' }}</el-descriptions-item>
- <el-descriptions-item label="浜у搧鍚嶇О">{{ row.salesContractNo || '-' }}</el-descriptions-item>
- <el-descriptions-item label="浜у搧瑙勬牸鍨嬪彿">{{ row.productName || '-' }}</el-descriptions-item>
- <el-descriptions-item label="浜у嚭鏁伴噺">{{ row.productModelName || '-' }}</el-descriptions-item>
- <el-descriptions-item label="鎶ュ簾鏁伴噺">{{ row.quantity || '-' }}</el-descriptions-item>
- <el-descriptions-item label="鍗曚綅">{{ row.scrapQty || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="浜у搧鍚嶇О">{{ row.productName || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="浜у搧瑙勬牸鍨嬪彿">{{ row.productModelName || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鏂欏彿">{{ row.materialCode || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="浜у嚭鏁伴噺">{{ row.quantity || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鎶ュ簾鏁伴噺">{{ row.scrapQty || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鍗曚綅">{{ row.unit || '-' }}</el-descriptions-item>
<el-descriptions-item label="鍒涘缓鏃堕棿">{{ row.createTime || '-' }}</el-descriptions-item>
<el-descriptions-item
v-for="item in otherDataEntries"
--
Gitblit v1.9.3