From 13f4d5bc78b4f7c90ebf1dcd65a68a8b5428407e Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 4 Jul 2023 15:55:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E6=8B=BC?=
 =?UTF-8?q?=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../semifinished/semi-finished-compose-search.vue      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/modules/semifinished/semi-finished-compose-search.vue b/src/pages/modules/semifinished/semi-finished-compose-search.vue
index eb9a275..65e7286 100644
--- a/src/pages/modules/semifinished/semi-finished-compose-search.vue
+++ b/src/pages/modules/semifinished/semi-finished-compose-search.vue
@@ -82,11 +82,11 @@
                     <tr v-for="(e, i) in dataList" :key="e.bill_code" :class="{'selected_icon': pkId === e.bill_code}" @click="toRadio(e)">
                         <td>{{ i+1 }}</td>
                         <td>{{ e.bill_code }}</td>
-                        <td v-if="bill_status === '10'">生成</td>
-                        <td v-if="bill_status === '20'">提交</td>
-                        <td v-if="bill_status === '30'">执行中</td>
-                        <td v-if="bill_status === '60'">确认</td>
-                        <td v-if="bill_status === '99'">完成</td>
+                        <td v-if="e.bill_status === '10'">生成</td>
+                        <td v-if="e.bill_status === '20'">提交</td>
+                        <td v-if="e.bill_status === '30'">执行中</td>
+                        <td v-if="e.bill_status === '60'">确认</td>
+                        <td v-if="e.bill_status === '99'">完成</td>
                         <td>普通拼盘</td>
                         <td>{{ e.material_code }}</td>
                         <td>{{ e.material_spec }}</td>

From b96cfba7303f9e15809fc7ef9b85afff32c2cbad Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 4 Jul 2023 16:49:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E6=8B=BC?=
 =?UTF-8?q?=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/semifinished/semi-finished-compose-search.vue  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/modules/semifinished/semi-finished-compose-search.vue b/src/pages/modules/semifinished/semi-finished-compose-search.vue
index 65e7286..a78da07 100644
--- a/src/pages/modules/semifinished/semi-finished-compose-search.vue
+++ b/src/pages/modules/semifinished/semi-finished-compose-search.vue
@@ -74,6 +74,7 @@
                         <th>移出货位2</th>
                         <th>移出载具2</th>
                         <th>移出重量2</th>
+                        <th>执行状态</th>
                         <th>创建时间</th>
                         <th>创建人</th>
                     </tr>
@@ -96,6 +97,12 @@
                         <td>{{ e.turnin_struct_code }}</td>
                         <td>{{ e.storagevehicle_code_in }}</td>
                         <td>{{ e.qty }}</td>
+                        <td v-if="e.work_status === '00'">未生成</td>
+                        <td v-if="e.work_status === '10'">生成</td>
+                        <td v-if="e.work_status === '20'">移出中</td>
+                        <td v-if="e.work_status === '30'">移出确认</td>
+                        <td v-if="e.work_status === '40'">移回中</td>
+                        <td v-if="e.work_status === '99'">完成</td>
                         <td>{{ e.create_time }}</td>
                         <td>{{ e.create_name }}</td>
                     </tr>