From 104ced736e6621f2e810cab1711b9d6e39a71c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Fri, 5 Jul 2024 09:05:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=B0=83=E6=95=B41?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wmsManagement/WmOutOrder.vue        |  1 -
 .../components/TheOutboundPlan/index.vue      | 96 +++++++++++++++----
 2 files changed, 78 insertions(+), 19 deletions(-)

diff --git a/src/views/wmsManagement/WmOutOrder.vue b/src/views/wmsManagement/WmOutOrder.vue
index f07e762..02f8649 100644
--- a/src/views/wmsManagement/WmOutOrder.vue
+++ b/src/views/wmsManagement/WmOutOrder.vue
@@ -329,7 +329,6 @@
 				this.loading = true
 				listWmOutOrder(this.queryParams).then((res) => {
 					if (res.code == 200) {
-						console.log(res)
 						this.dataList = res.data.result
 						this.total = res.data.totalNum
 						this.loading = false
diff --git a/src/views/wmsManagement/components/TheOutboundPlan/index.vue b/src/views/wmsManagement/components/TheOutboundPlan/index.vue
index ae48074..fd1cbbf 100644
--- a/src/views/wmsManagement/components/TheOutboundPlan/index.vue
+++ b/src/views/wmsManagement/components/TheOutboundPlan/index.vue
@@ -7,7 +7,7 @@
 				<el-tabs type="border-card" v-model="activeName">
 					<el-tab-pane label="出库简报" name="1">
 						<!-- 数据区域 -->
-						<el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row max-height="400px" show-summary>
+						<el-table :data="dataList1" v-loading="loading" ref="table" border highlight-current-row max-height="400px" show-summary>
 							<el-table-column :filters="filters" :filter-method="filterHandler" prop="partnumber" label="物料号(零件号)" align="center" :show-overflow-tooltip="true" min-width="140" />
 							<el-table-column prop="packageCode" label="批次号" align="center" :show-overflow-tooltip="true" min-width="140" />
 							<el-table-column prop="description" label="描述" align="center" :show-overflow-tooltip="true" min-width="160" />
@@ -24,7 +24,7 @@
 					</el-tab-pane>
 					<el-tab-pane label="详细信息" name="2">
 						<!-- 数据区域 -->
-						<el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row max-height="400px">
+						<el-table :data="dataList1" v-loading="loading" ref="table" border highlight-current-row max-height="400px">
 							<el-table-column :filters="filters" :filter-method="filterHandler" prop="partnumber" label="物料号(零件号)" align="center" :show-overflow-tooltip="true" min-width="140" />
 							<el-table-column prop="packageCode" label="批次号" align="center" :show-overflow-tooltip="true" min-width="140" />
 							<el-table-column prop="description" label="描述" align="center" :show-overflow-tooltip="true" min-width="160" />
@@ -45,16 +45,29 @@
 							<el-table-column prop="outOrder" label="计划顺序" align="center" :show-overflow-tooltip="true" />
 						</el-table>
 					</el-tab-pane>
+					<el-tab-pane label="全部出库详情" name="3">
+						<!-- 数据区域 -->
+						<vxe-table border keep-source resizable ref="xTable" :loading="loading" max-height="800" :row-config="{isHover: true}" :tree-config="{
+						transform: true, 
+						rowField: 'packageCodeClient_son', 
+						parentField: 'packageCodeClient_short_parent',
+						lazy: true, 
+						hasChild: 'hasChild', 
+						loadMethod: loadChildrenMethod }" :edit-config="{ trigger: 'manual', mode: 'row' }" :data="dataList2">
+							<vxe-column field="shipmentNum" title="出库单号" tree-node min-width="100"></vxe-column>
+							<vxe-column field="partnumber" title="零件号" min-width="100"></vxe-column>
+							<vxe-column field="description" title="描述" min-width="120"></vxe-column>
+							<vxe-column field="packageCode" title="批次号" min-width="180"></vxe-column>
+							<vxe-column field="locationCode" title="库位编码" min-width="40"></vxe-column>
+							<vxe-column field="packageNum" title="箱数"></vxe-column>
+							<vxe-column field="goodsNumAction" title="已出">
+							</vxe-column>
+							<vxe-column field="outTime" title="出库时间" min-width="120"></vxe-column>
+							<vxe-column field="remark" title="备注"></vxe-column>
+						</vxe-table>
+						<pagination background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getAllList" />
+					</el-tab-pane>
 				</el-tabs>
-
-				<!-- <pagination
-					class="mt10"
-					background
-					:total="total"
-					:page.sync="queryParams.pageNum"
-					:limit.sync="queryParams.pageSize"
-					@pagination="getList"
-				/> -->
 			</div>
 			<div slot="footer">
 				<el-button @click="close">取消</el-button>
@@ -65,6 +78,7 @@
 </template>
 <script>
 	import * as WmOutOrderApi from '@/api/wmsManagement/wmOutOrder.js'
+	import * as WmGoodsBatchApi from '@/api/wmsManagement/wmGoodsBatchSearch.js'
 	export default {
 		inheritAttrs: false,
 		components: {},
@@ -76,13 +90,14 @@
 				// 查询参数
 				queryParams: {
 					pageNum: 1,
-					pageSize: 10,
+					pageSize: 20,
 				},
 				activeName: '1',
 				// 弹出层标题
 				title: '出库详情',
 				// 数据列表
-				dataList: [],
+				dataList1: [],
+				dataList2: [],
 				filters: [],
 				filteredValue: [],
 				// 总记录数
@@ -97,7 +112,8 @@
 		methods: {
 			onOpen() {
 				this.activeName = '1';
-				this.getList()
+				this.getList();
+				this.getAllList();
 			},
 			onClose() {
 				this.$refs['elForm'].resetFields()
@@ -121,16 +137,14 @@
 				this.filters = [];
 				WmOutOrderApi.getOutOrderPlanAndOutProductionNum({ shipment_num: this.planKey }).then((res) => {
 					if (res.code === 200) {
-						this.dataList = res.data;
-
+						this.dataList1 = res.data;
 						let filterList = [];
-						for (let item of this.dataList) {
+						for (let item of this.dataList1) {
 							if (!filterList.includes(item.partnumber)) {
 								filterList.push(item.partnumber);
 								this.filters.push({ text: item.partnumber + ' ' + item.description, value: item.partnumber });
 							}
 						}
-						console.log(this.filters);
 						// 计划出库批次清单
 						this.loading = false
 					} else {
@@ -139,11 +153,57 @@
 					}
 				})
 			},
+			getAllList() {
+				// this.loading = false;
+				// return;
+				this.loading = true
+				setTimeout(() => {
+					this.loading = false
+				}, 30000)
+				this.filters = [];
+				let data = {
+					// 出库单号
+					shipmentNum: this.planKey,
+					pageNum: this.queryParams.pageNum,
+					pageSize: this.queryParams.pageSize,
+					// 查询类别:1-树父节点 2-树子节点
+					type: 1,
+					// 聚合模型类别:1-根据批次号 2-根据零件号 3-根据出库单
+					model: 3,
+					// 查询类别:1-入库 2-出库
+					category: 2
+				}
+				WmGoodsBatchApi.GetBatchTreeTableData(data).then(res => {
+					if (res.code === 200) {
+						this.total = res.data.totalNum;
+						this.dataList2 = res.data.result;
+						this.loading = false
+					} else {
+						this.loading = false
+					}
+				})
+			},
+			loadChildrenMethod({ row }) {
+				return new Promise(resolve => {
+					const data = {
+						type: 2,
+						model: 3,
+						category: 2,
+						shipmentNum: row.packageCodeClient_son,
+					}
+					WmGoodsBatchApi.GetBatchTreeTableData(data).then(res => {
+						if (res.code === 200) {
+							resolve(res.data.result);
+						}
+					})
+				})
+			},
 			/** 修改按钮操作 */
 			handleUpdate(row) {},
 			handleClick(tab, event) {
 
 			},
+			// 物料号筛选
 			filterHandler(value, row, column) {
 				const property = column['property'];
 				return row[property] === value;