From c7bc00c5eda84e3f74e463812d32a9e1996aa522 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 23 Mar 2020 16:34:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompletionOfWorkshopComponents/index.vue                 | 5 ++---
 src/views/ManufacturingCenter/ProcessingStatusNew/index.vue  | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
index b4f2d6f7..4c5d8543 100644
--- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
+++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
@@ -39,10 +39,9 @@
                 {{ scope.row.投产数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="工序状态" show-overflow-tooltip min-width="90">
+            <el-table-column align="center" label="完成日期" show-overflow-tooltip min-width="90">
               <template slot-scope="scope">
-                <span v-if="scope.row.工序状态 >= 4">已完成</span>
-                <span v-else>未完成</span>
+                {{ scope.row.完成日期 ? scope.row.完成日期.split(' ')[0] : '' }}
               </template>
             </el-table-column>
           </el-table>
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index dab56dfb..88986715 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -39,11 +39,6 @@
                 {{ scope.row.工艺名称 }}
               </template>
             </el-table-column>
-            <!--<el-table-column align="center" label="已完数量" show-overflow-tooltip min-width="70">-->
-            <!--<template slot-scope="scope">-->
-            <!--{{ scope.row.完成数量 }}-->
-            <!--</template>-->
-            <!--</el-table-column>-->
             <el-table-column align="center" label="投产数" width="80">
               <template slot-scope="scope">
                 {{ scope.row.批次数量 }}