From d709dd8d513b0d871cd720c69704248cd9f058b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?=
 <9634538+git_rabbit@user.noreply.gitee.com>
Date: Fri, 22 Mar 2024 16:12:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93-=E5=87=BA=E5=BA=93=E5=8D=95-?=
 =?UTF-8?q?=E6=88=90=E5=93=81=E5=BA=93=EF=BC=8C=E5=87=BA=E5=BA=93=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=A0=B7=E5=BC=8F=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Print/出库单.vue                             | 2 ++
 src/views/wmsManagement/WmGoodsNowProduction.vue            | 4 ++--
 src/views/wmsManagement/WmGoodsOutProduction.vue            | 6 +++---
 src/views/wmsManagement/WmOutOrder.vue                      | 1 +
 .../wmsManagement/components/TheOutboundPlan/index.vue      | 2 ++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/Print/出库单.vue b/src/components/Print/出库单.vue
index f9e881d..1746b49 100644
--- a/src/components/Print/出库单.vue
+++ b/src/components/Print/出库单.vue
@@ -165,6 +165,8 @@ export default {
 							this.printData.materialList = res.data
 						}
 					})
+					this.loading = false;
+					return;
 					WmOutOrderApi.generateOutorderplan({ shipment_num: getKey }).then((res) => {
 						if (res.code === 200) {
 							this.printData.planlList = res.data
diff --git a/src/views/wmsManagement/WmGoodsNowProduction.vue b/src/views/wmsManagement/WmGoodsNowProduction.vue
index 9bf11e0..485b6e5 100644
--- a/src/views/wmsManagement/WmGoodsNowProduction.vue
+++ b/src/views/wmsManagement/WmGoodsNowProduction.vue
@@ -28,9 +28,9 @@
 			<el-form-item label="库位编号" prop="locationCode">
 				<el-input v-model="queryParams.locationCode" placeholder="请输入库位编号" />
 			</el-form-item>
-			<el-form-item label="入库时间" prop="entryWarehouseTime">
+			<!-- <el-form-item label="入库时间" prop="entryWarehouseTime">
 				<el-date-picker v-model="queryParams.entryWarehouseTime" type="datetime" placeholder="选择日期时间"></el-date-picker>
-			</el-form-item>
+			</el-form-item> -->
 			<el-form-item label=" ">
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
diff --git a/src/views/wmsManagement/WmGoodsOutProduction.vue b/src/views/wmsManagement/WmGoodsOutProduction.vue
index 2097eb0..f1bb65b 100644
--- a/src/views/wmsManagement/WmGoodsOutProduction.vue
+++ b/src/views/wmsManagement/WmGoodsOutProduction.vue
@@ -31,9 +31,9 @@
 			<el-form-item label="库位编号" prop="locationCode">
 				<el-input v-model="queryParams.locationCode" placeholder="请输入库位编号" />
 			</el-form-item>
-			<el-form-item label="出库时间" prop="outTime">
+			<!-- <el-form-item label="出库时间" prop="outTime">
 				<el-date-picker v-model="form.outTime" type="datetime" placeholder="选择日期时间"></el-date-picker>
-			</el-form-item>
+			</el-form-item> -->
 			<el-form-item label=" ">
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -355,7 +355,7 @@ export default {
 		handleDelete(row) {
 			const Ids = row.id || this.ids
 
-			this.$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+			this.$confirm('是否确认删除数据项？')
 				.then(function () {
 					return delWmGoodsOutProduction(Ids)
 				})
diff --git a/src/views/wmsManagement/WmOutOrder.vue b/src/views/wmsManagement/WmOutOrder.vue
index 2d2c342..27d812e 100644
--- a/src/views/wmsManagement/WmOutOrder.vue
+++ b/src/views/wmsManagement/WmOutOrder.vue
@@ -324,6 +324,7 @@ export default {
 			TheOutboundPlanDialogVisible:false,
 			showPrintDialog:false,
 			printKey:'',
+			planKey:'',
 			labelWidth: '100px',
 			formLabelWidth: '100px',
 			// 选中shipmentNum数组
diff --git a/src/views/wmsManagement/components/TheOutboundPlan/index.vue b/src/views/wmsManagement/components/TheOutboundPlan/index.vue
index 7c40358..8cea28b 100644
--- a/src/views/wmsManagement/components/TheOutboundPlan/index.vue
+++ b/src/views/wmsManagement/components/TheOutboundPlan/index.vue
@@ -92,6 +92,8 @@ export default {
 			})
 		},
 		getList() {
+			this.loading = false;
+			return;
 			this.loading = true
 			setTimeout(() => {
 				this.loading = false