From 9d76e00b8a1b2e1a4af3754f990479bddac70f7e Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Sat, 3 Aug 2024 15:22:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=AE=8C=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/fg/coms/comReceiptPopup.vue |  5 +--
 src/pages/fg/receiptByPlan.vue        | 62 +++++----------------------
 src/pages/fg/receiptNoPlan.vue        | 11 ++++-
 3 files changed, 22 insertions(+), 56 deletions(-)

diff --git a/src/pages/fg/coms/comReceiptPopup.vue b/src/pages/fg/coms/comReceiptPopup.vue
index a4c6a1f2..9ce9c4f6 100644
--- a/src/pages/fg/coms/comReceiptPopup.vue
+++ b/src/pages/fg/coms/comReceiptPopup.vue
@@ -188,7 +188,7 @@
 				this.initData();
 				this.planDate = getCurrDate()
 				// this.batch = getBatch8()
-				this.batch = this.planDate.replace('-', '');
+				this.batch = this.planDate.replace('-', '').replace('-', '');
 				this.$refs.popup.open('bottom')
 			},
 
@@ -316,9 +316,8 @@
 
 			confirmSelectDate(data) {
 				this.planDate = data[0].label;
-				this.batch = this.planDate.replace('-', '');
+				this.batch = this.planDate.replace('-', '').replace('-', '');
 				this.afterSelectPlanData();
-
 			},
 
 			showSelectDate() {
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index 0b852e6f..7ef0add1 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -295,11 +295,21 @@
 					//装配收货记录 生成后 创建 制品上架申请
 					let createProductputawaySwitch = getSwitchInfoByCode(
 						"CreateProductputawayRequestAfterProductreceiptRecordCreated")
+					// if (createProductputawaySwitch) {
+					// 	createPutawayRequestByPlan(list[0].requestNumber).then(res => {
+					// 		createInspectRequestByPlan(list[0].requestNumber)
+					// 	})
+					// }
+					//创建上架申请和检验申请
 					if (createProductputawaySwitch) {
 						createPutawayRequestByPlan(list[0].requestNumber).then(res => {
 							createInspectRequestByPlan(list[0].requestNumber)
 						})
+					} else { //创建检验申请
+						createInspectRequestByPlan(list[0].requestNumber)
 					}
+					
+					
 
 					var queryParams = {
 						filters: [{
@@ -469,57 +479,7 @@
 </script>
 
 <style scoped lang="scss">
-	page {
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
-	}
-
-	.page-wraper {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 100%;
-	}
-
-	.header {
-		position: fixed;
-		/* #ifdef H5 */
-		/* #endif */
-		left: 0;
-		width: 100%;
-		background-color: #fff;
-		z-index: 10;
-	}
-
-	.page-footer {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-	}
-
-
-	.page-main {
-		flex: 1;
-		position: relative;
-	}
-
-	.page-main-scroll {
-		position: absolute;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-	}
-
-	.page-main-list {
-		/*  height: 80rpx;
-	    line-height: 80rpx; */
-		text-align: center;
-		background: #e0e0e0;
-
-	}
+ 
 
 	.item {
 		background-color: #fff;
diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index d5ec36b8..e6c18e50 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -243,6 +243,11 @@
 			},
 
 			submit() {
+				this.scanedQty = this.scanedQty + this.showList.length;
+				this.showList = [];
+				this.dataContent.handleQty = 0;
+				return;
+
 				if (this.allList.length == 0) {
 					this.showErrorMessage("请先扫描唯一码")
 					return;
@@ -292,17 +297,19 @@
 								requestNumber: item.requestNumber
 							})
 						})
-					} 
-					else {
+					} else {
 						throw new Error("提交失败")
 					}
 
 					let createProductputawaySwitch = getSwitchInfoByCode(
 						"CreateProductputawayRequestAfterProductreceiptRecordCreated")
+					//创建上架申请和检验申请
 					if (createProductputawaySwitch) {
 						createPutawayRequestByPlan(list[0].requestNumber).then(res => {
 							createInspectRequestByPlan(list[0].requestNumber)
 						})
+					} else { //创建检验申请
+						createInspectRequestByPlan(list[0].requestNumber)
 					}
 					this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + list[0].requestNumber, list)
 					this.scanedQty = this.scanedQty + this.showList.length;