From 52594a9985e7e46c1b851146637c067fb6844518 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Mon, 23 Oct 2023 16:36:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Middle/Mold/Touch/Reporting.vue | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/Middle/Mold/Touch/Reporting.vue b/src/pages/Middle/Mold/Touch/Reporting.vue
index b004b86..e1bc3f8 100644
--- a/src/pages/Middle/Mold/Touch/Reporting.vue
+++ b/src/pages/Middle/Mold/Touch/Reporting.vue
@@ -21,7 +21,10 @@
                     <div>部件：{{ item.component_detail ? item.component_detail.name : '' }}</div>
                     <div>工序：{{ item.process_detail ? item.process_detail.name : '' }}</div>
 
-                    <div>状态：{{ item.is_complete ? "已完成" : (item.is_send ? "已发料" : "未发料") }}</div>
+                    <div>
+                      状态：{{ item.is_complete ? "已完成" : (item.is_send ? "已发料" : "未发料") }}
+                      <span v-if="item.complete_time">({{ getDateValueString(item.complete_time) }})</span>
+                    </div>
                   </div>
                   <div class="gx-item-col">
                     <div>
@@ -34,8 +37,8 @@
                       <a-button style="margin-left: 3px;" @click="pageReport(item, true)"
                         v-if="item.is_complete == 1">撤销报工</a-button>
                     </div>
-                    <div style="margin-top: 10px;;" v-if="item.complete_time">
-                      {{ getDateValueString(item.complete_time) }}
+                    <div style="margin-top: 10px;font-size: 14px;" v-if="item.plan_complete_time">
+                      计划完成:{{ getDateValueString(item.plan_complete_time) }}
                     </div>
 
                   </div>
@@ -67,7 +70,10 @@
                       <div v-if="item.department_detail && item.department_detail.name">部门：{{ item.department_detail.name }}</div>
                       <div>工序：{{ item.process_detail ? item.process_detail.name : '' }}</div>
 
-                      <div>状态：{{ item.is_complete ? "已完成" : (item.is_send ? "已发料" : "未发料") }}({{ item.progress }}%)</div>
+                      <div>状态：
+                        {{ item.is_complete ? "已完成" : (item.is_send ? "已发料" : "未发料") }}
+                        <span v-if="item.complete_time">({{ getDateValueString(item.complete_time) }})</span>
+                      </div>
                     </div>
                     <div class="gx-item-col">
                       <div>
@@ -80,9 +86,9 @@
                         <a-button style="margin-left: 3px;" @click="pageReport(item, true)"
                           v-if="item.is_complete == 1">撤销报工</a-button>
                       </div>
-                      <div style="margin-top: 10px;;" v-if="item.complete_time">
-                        {{ getDateValueString(item.complete_time) }} 
-                      </div>
+                    <div style="margin-top: 10px;font-size: 14px;" v-if="item.plan_complete_time">
+                      计划完成:{{ getDateValueString(item.plan_complete_time) }}
+                    </div>
 
                     </div>
                   </div>