From 2f03e1f738092cfb906cd548d18e8deb4f39b658 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期三, 06 五月 2026 14:05:33 +0800
Subject: [PATCH] 生产追溯接口对接

---
 src/views/productionManagement/productionTraceability/index.vue |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/views/productionManagement/productionTraceability/index.vue b/src/views/productionManagement/productionTraceability/index.vue
index 8de8ab3..a850788 100644
--- a/src/views/productionManagement/productionTraceability/index.vue
+++ b/src/views/productionManagement/productionTraceability/index.vue
@@ -68,14 +68,14 @@
               </el-table-column>
               <el-table-column label="浜у搧鍚嶇О"
                                align="center">
-                <template #default>
-                  {{ rowData.productionOrderDto?.productName || '-' }}
+                <template #default="{ row }">
+                  {{ row.workOrder.productName || '-' }}
                 </template>
               </el-table-column>
               <el-table-column label="瑙勬牸"
                                align="center">
-                <template #default>
-                  {{ rowData.productionOrderDto?.model || '-' }}
+                <template #default="{ row }">
+                  {{ row.workOrder.model || '-' }}
                 </template>
               </el-table-column>
               <el-table-column prop="workOrder.planQuantity"
@@ -84,6 +84,13 @@
               <el-table-column prop="workOrder.completeQuantity"
                                label="瀹屾垚鏁伴噺"
                                align="center" />
+              <el-table-column prop="workOrder.completionStatus"
+                               label="瀹屾垚杩涘害"
+                               align="center">
+                <template #default="{ row }">
+                  <span :style="{ color: customColors(row.workOrder.completionStatus) }">{{ row.workOrder.completionStatus || 0 }}%</span>
+                </template>
+              </el-table-column>
               <el-table-column label="璇︽儏"
                                align="center"
                                width="200">
@@ -119,9 +126,13 @@
             <el-descriptions-item label="瀹屾垚鏁伴噺">{{ detailData.workOrder.completeQuantity || 0 }}</el-descriptions-item>
             <el-descriptions-item label="瀹為檯寮�濮嬫椂闂�">{{ parseTime(detailData.workOrder.actualStartTime) || '-' }}</el-descriptions-item>
             <el-descriptions-item label="瀹為檯缁撴潫鏃堕棿">{{ parseTime(detailData.workOrder.actualEndTime) || '-' }}</el-descriptions-item>
-            <el-descriptions-item label="鐘舵��">
-              <el-tag :type="getStatusType(detailData.workOrder.status)">{{ getStatusText(detailData.workOrder.status) }}</el-tag>
-            </el-descriptions-item>
+            <!-- <el-descriptions-item label="瀹屾垚杩涘害">
+              <el-progress :percentage="detailData.workOrder.completionStatus >= 100 ? 100 : (detailData.workOrder.completionStatus || 0)"
+                           :color="customColors(detailData.workOrder.completionStatus)"
+                           :status="detailData.workOrder.completionStatus >= 100 ? 'success' : ''"
+                           style="width:500px;" />
+            </el-descriptions-item> -->
+            <el-descriptions-item label="瀹屾垚杩涘害"><span :style="{ color: customColors(detailData.workOrder.completionStatus) }">{{ detailData.workOrder.completionStatus || 0 }}%</span></el-descriptions-item>
           </el-descriptions>
         </div>
         <div class="detail-section">
@@ -227,7 +238,7 @@
                                width="60"
                                align="center" />
               <el-table-column label="鎸囨爣"
-                               prop="paramName"
+                               prop="parameterItem"
                                align="center" />
               <el-table-column label="鍗曚綅"
                                prop="unit"
@@ -235,8 +246,11 @@
               <el-table-column label="鏍囧噯鍊�"
                                prop="standardValue"
                                align="center" />
+              <el-table-column label="鍐呮帶鍊�"
+                               prop="controlValue"
+                               align="center" />
               <el-table-column label="瀹為檯鍊�"
-                               prop="inputValue"
+                               prop="testValue"
                                align="center" />
             </el-table>
           </div>

--
Gitblit v1.9.3