From 6c72faadb95e80210aa51a30ce24a24145b5af3c Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 9 Apr 2024 17:57:25 +0800
Subject: [PATCH] 111

---
 src/components/Print/出库单.vue               | 19 ++++++++++---------
 .../TheChouseMaterial/TheChouseMaterial.vue   |  3 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/Print/出库单.vue b/src/components/Print/出库单.vue
index 69d1368..d471fae 100644
--- a/src/components/Print/出库单.vue
+++ b/src/components/Print/出库单.vue
@@ -63,35 +63,36 @@
             <table title="出库计划" align="center">
               <thead>
                 <tr>
-                  <th>批次号</th>
                   <th>物料号</th>
                   <th>所属仓库</th>
+                  <th>批次号</th>
+                  <th>需求零件数</th>
+
                   <!-- <th>批次箱数</th>
                   <th>批次零件数</th> -->
                   <th>库存箱数</th>
                   <th>库存零件数</th>
-                  <th>需求零件数</th>
+
                   <!-- <th>批次时间</th>
                   <th>出库顺序</th> -->
-                 
                 </tr>
               </thead>
               <tbody>
-                <tr v-if="item.package_code_client != null" v-for="(item, index) in printData.planlList" :key="index">
-                  <td>{{ item.patchcode }}</td>
+                <tr v-for="(item, index) in printData.planlList" :key="index">
                   <td>{{ item.materialCode }}</td>
                   <td>{{ item.warehouseCode }}</td>
+                  <td>{{ item.patchcode }}</td>
+                  <td>{{ item.partnumberNum }}</td>
+                  <!-- <td>{{ item.requireNum }}</td> -->
+
                   <!-- <td>{{ item.packageNum }}</td>
                   <td>{{ item.partnumberNum }}</td> -->
                   <td>{{ item.inventory_pack_num }}</td>
                   <td>{{ item.inventory_num }}</td>
-                  <td>{{ item.requireNum }}</td>
+
                   <!-- <td>{{ item.patchtime }}</td>
                   <td>{{ item.outorder }}</td> -->
                 </tr>
-                <tr v-else>
-                  <td :colspan="8"><div class="line"></div></td>
-                </tr>
               </tbody>
             </table>
           </div>
diff --git a/src/views/wmsManagement/components/TheChouseMaterial/TheChouseMaterial.vue b/src/views/wmsManagement/components/TheChouseMaterial/TheChouseMaterial.vue
index b636d9c..72154a9 100644
--- a/src/views/wmsManagement/components/TheChouseMaterial/TheChouseMaterial.vue
+++ b/src/views/wmsManagement/components/TheChouseMaterial/TheChouseMaterial.vue
@@ -16,7 +16,7 @@
 				<el-row type="flex" justify="start" align="top" :gutter="10">
 					<el-form-item label="" prop="search">
 						<el-button type="primary" icon="el-icon-search" size="medium" @click="getList">搜索</el-button>
-						<el-button type="success" icon="el-icon-plus" size="medium" :disabled="dataList.length === 0" @click="handelConfirm">添加物料</el-button>
+						
 					</el-form-item>
 				</el-row>
 				<el-row>
@@ -49,6 +49,7 @@
 			</el-form>
 			<div slot="footer">
 				<el-button @click="close">取消</el-button>
+				<el-button type="success" icon="el-icon-plus" size="medium" :disabled="dataList.length === 0" @click="handelConfirm">添加物料</el-button>
 			</div>
 		</el-dialog>
 	</div>