From fcfd2281dfdaf89412eed00368d57d7d677a269f Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期六, 28 三月 2026 15:47:35 +0800
Subject: [PATCH] 追踪进度修改

---
 src/views/productionPlan/trackProgress/index.vue |   80 +++++++++++++++++++++++++++------------
 1 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/src/views/productionPlan/trackProgress/index.vue b/src/views/productionPlan/trackProgress/index.vue
index bd48010..b910bf5 100644
--- a/src/views/productionPlan/trackProgress/index.vue
+++ b/src/views/productionPlan/trackProgress/index.vue
@@ -27,6 +27,59 @@
       </div>
       <div class="progress-container">
         <div class="progress-section">
+          <h3 class="section-title">璁㈠崟淇℃伅</h3>
+          <div v-for="item in rowData.orderList"
+               :key="item.orderNo"
+               class="order-item">
+            <el-descriptions :column="3"
+                             border>
+              <el-descriptions-item label="璁㈠崟缂栧彿">{{ item.orderNo || '-' }}</el-descriptions-item>
+              <el-descriptions-item label="璁㈠崟鐘舵��">
+                <el-tag :type="getStatusType(item.status)">{{ getStatusText(item.status) }}</el-tag>
+              </el-descriptions-item>
+              <el-descriptions-item label="寮�濮嬫棩鏈�">{{ item.startTime || '-' }}</el-descriptions-item>
+              <el-descriptions-item label="闇�姹傛暟閲�">{{ item.quantity || 0 }} <span class="unit">鏂�</span></el-descriptions-item>
+              <el-descriptions-item label="瀹屾垚鏁伴噺">{{ item.completeQuantity || 0 }} <span class="unit">鏂�</span></el-descriptions-item>
+              <el-descriptions-item label="瀹屾垚杩涘害">
+                <el-progress :percentage="item.completionRate"
+                             :color="customColors(item.completionRate)"
+                             :status="item.completionRate === 100 ? 'success' : ''"
+                             style="width: 120px;" />
+              </el-descriptions-item>
+            </el-descriptions>
+            <el-table :data="trackProgressForm.progressDetails"
+                      border
+                      style="width: auto; height: 200px">
+              <el-table-column prop="step"
+                               label="姝ラ锛堢偣鍑绘煡鐪嬭鎯咃級"
+                               align="center">
+                <template #default="{ row, $index }">
+                  <el-link v-if="$index!=0"
+                           @click="handleClickStep(row)"
+                           type="primary">{{ row.step }}</el-link>
+                  <span v-else
+                        @click="handleClickStep(row)">{{ row.step }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="status"
+                               label="鐘舵��"
+                               align="center">
+                <template #default="scope">
+                  <el-tag :type="scope.row.status === 'completed' ? 'success' : scope.row.status === 'processing' ? 'warning' : 'info'">
+                    {{ scope.row.status === 'completed' ? '宸插畬鎴�' : scope.row.status === 'processing' ? '杩涜涓�' : '寰呭紑濮�' }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column prop="quantity"
+                               label="鏁伴噺"
+                               align="center" />
+              <el-table-columnstep prop="startTime"
+                                   label="鏃堕棿"
+                                   align="center" />
+            </el-table>
+          </div>
+        </div>
+        <!-- <div class="progress-section">
           <h3 class="section-title">杩涘害淇℃伅</h3>
           <div class="progress-item">
             <div class="progress-label">瀹屾垚杩涘害锛�</div>
@@ -71,30 +124,7 @@
               </el-table>
             </div>
           </div>
-        </div>
-        <div class="progress-section">
-          <h3 class="section-title">璁㈠崟淇℃伅</h3>
-          <div v-for="item in rowData.orderList"
-               :key="item.orderNo"
-               class="order-item">
-            <el-descriptions :column="3"
-                             border>
-              <el-descriptions-item label="璁㈠崟缂栧彿">{{ item.orderNo || '-' }}</el-descriptions-item>
-              <el-descriptions-item label="璁㈠崟鐘舵��">
-                <el-tag :type="getStatusType(item.status)">{{ getStatusText(item.status) }}</el-tag>
-              </el-descriptions-item>
-              <el-descriptions-item label="寮�濮嬫棩鏈�">{{ item.startTime || '-' }}</el-descriptions-item>
-              <el-descriptions-item label="闇�姹傛暟閲�">{{ item.quantity || 0 }} <span class="unit">鏂�</span></el-descriptions-item>
-              <el-descriptions-item label="瀹屾垚鏁伴噺">{{ item.completeQuantity || 0 }} <span class="unit">鏂�</span></el-descriptions-item>
-              <el-descriptions-item label="瀹屾垚杩涘害">
-                <el-progress :percentage="item.completionRate"
-                             :color="customColors(item.completionRate)"
-                             :status="item.completionRate === 100 ? 'success' : ''"
-                             style="width: 120px;" />
-              </el-descriptions-item>
-            </el-descriptions>
-          </div>
-        </div>
+        </div> -->
       </div>
     </el-card>
   </div>
@@ -153,7 +183,7 @@
   const generateProgressDetails = status => {
     const details = [
       {
-        step: "璁″垝纭",
+        step: "璁㈠崟鐢熸垚",
         status: "completed",
         quantity: 233,
         startTime: "2026-03-01 09:00:00",

--
Gitblit v1.9.3