From a46575030a013c5f4412f397ad7bbd64023faf19 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 24 Aug 2023 11:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=BB=E5=AD=97=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/modules/clean/cleaning-cutting.vue      | 2 +-
 src/pages/modules/lettering/lettering-process.vue | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/modules/clean/cleaning-cutting.vue b/src/pages/modules/clean/cleaning-cutting.vue
index b277418..7d35f07 100644
--- a/src/pages/modules/clean/cleaning-cutting.vue
+++ b/src/pages/modules/clean/cleaning-cutting.vue
@@ -42,7 +42,7 @@
                 <thead>
                     <tr>
                         <th>序号</th>
-                        <th>日期</th>
+                        <th>上料完成时间</th>
                         <th>任务号</th>
                         <th>物料编号</th>
                         <th>物料规格</th>
diff --git a/src/pages/modules/lettering/lettering-process.vue b/src/pages/modules/lettering/lettering-process.vue
index 3db92ba..786b8e0 100644
--- a/src/pages/modules/lettering/lettering-process.vue
+++ b/src/pages/modules/lettering/lettering-process.vue
@@ -34,7 +34,9 @@
                     <td>{{ e.material_code }}</td>
                     <td>{{ e.instorage_time }}</td>
                     <td>{{ e.is_pick === true ? '是' : '否' }}</td>
-                    <td>{{ e.instorage_type }}</td>
+                    <td v-show="e.bill_type === '0001'">清洗入库</td>
+                    <td v-show="e.bill_type === '0009'">手工入库</td>
+                    <td v-show="e.bill_type === ''"></td>
                 </tr>
             </tbody>
           </table>