From 8d9187ad3005acd2c70240c4f0b99426976c5f76 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Tue, 2 Jul 2024 10:01:07 +0800
Subject: [PATCH] 2024/06/28

---
 src/views/modules/finshProduct/outWarehouse.vue             | 5 +++++
 src/views/modules/finshProduct/outWarehouse/shipmentBox.vue | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/finshProduct/outWarehouse.vue b/src/views/modules/finshProduct/outWarehouse.vue
index 87b1d82..35f28a3 100644
--- a/src/views/modules/finshProduct/outWarehouse.vue
+++ b/src/views/modules/finshProduct/outWarehouse.vue
@@ -374,6 +374,11 @@ export default {
               <el-input v-model="queryForm.shipmentId"></el-input>
             </el-form-item>
           </el-col>
+<!--          <el-col :span="3">-->
+<!--            <el-form-item label="发货状态">-->
+<!--              <el-input v-model="queryForm.status"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="7">
             <el-row :gutter="10">
               <el-col :span="11">
diff --git a/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue b/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue
index 9abc225..d5fc17c 100644
--- a/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue
+++ b/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue
@@ -334,9 +334,10 @@ export default {
     </div>
     <el-table :data="dataList" style="width: 100%" border :height="height">
       <el-table-column prop="boxNoStr" label="箱号" width="200" header-align="center" align="left"></el-table-column>
+      <el-table-column prop="partNo" label="物料编码" width="100" header-align="center" align="left"></el-table-column>
+      <el-table-column prop="status" label="状态" width="100" header-align="center" align="center"></el-table-column>
       <el-table-column prop="createBy" label="录入人" width="100" header-align="center" align="left"></el-table-column>
       <el-table-column prop="createDate" label="录入时间" width="200" header-align="center" align="center"></el-table-column>
-      <el-table-column prop="status" label="状态" width="100" header-align="center" align="center"></el-table-column>
       <el-table-column align="center" label="操作">
         <template slot-scope="scope">
           <el-link @click="handleScanRoll(scope.row)" v-if="scope.row.status==='未封箱'">扫描</el-link>