From 922bb7898b170eefe78b138affe858421e3c5cbe Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Sat, 3 Aug 2024 10:55:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=88=B6=E5=93=81=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E4=B8=8A=E6=9E=B6=E5=92=8C=E8=A3=85=E9=85=8D=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                | 25 ++++++++--
 .../productPutaway/record/fgDirectPutaway.vue | 48 +++++++++++++++++++
 .../record/productPutawayRecord.vue           | 11 ++---
 .../record/semiDirectPutaway.vue              | 48 +++++++++++++++++++
 4 files changed, 123 insertions(+), 9 deletions(-)
 create mode 100644 src/pages/productPutaway/record/fgDirectPutaway.vue
 create mode 100644 src/pages/productPutaway/record/semiDirectPutaway.vue

diff --git a/src/pages.json b/src/pages.json
index cdcfe111..c1cf6147 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1141,14 +1141,33 @@
 
 			}
 		},
+		// {
+		// 	"path": "pages/productPutaway/record/productPutawayRecord",
+		// 	"style": {
+		// 		"navigationBarTitleText": "制品上架记录",
+		// 		"enablePullDownRefresh": false
+
+		// 	}
+		// },
+		
 		{
-			"path": "pages/productPutaway/record/productPutawayRecord",
+			"path": "pages/productPutaway/record/fgDirectPutaway",
 			"style": {
-				"navigationBarTitleText": "制品上架记录",
+				"navigationBarTitleText": "装配直接上架",
 				"enablePullDownRefresh": false
-
+		
 			}
 		},
+		
+		{
+			"path": "pages/productPutaway/record/semiDirectPutaway",
+			"style": {
+				"navigationBarTitleText": "预生产直接上架",
+				"enablePullDownRefresh": false
+		
+			}
+		},
+		
 
 		{
 			"path": "pages/productPutaway/request/putawayRequest",
diff --git a/src/pages/productPutaway/record/fgDirectPutaway.vue b/src/pages/productPutaway/record/fgDirectPutaway.vue
new file mode 100644
index 00000000..77b6ec31
--- /dev/null
+++ b/src/pages/productPutaway/record/fgDirectPutaway.vue
@@ -0,0 +1,48 @@
+ <template>
+ 	<view class="">
+ 		<product-putaway-record :title="title" ref="productPutawayRecord" type='assemble'></product-putaway-record>
+ 	</view>
+ </template>
+ 
+ <script>
+ 	import productPutawayRecord from '@/pages/productPutaway/record/productPutawayRecord.vue'
+ 
+ 	export default {
+ 		components: {
+ 			productPutawayRecord
+ 		},
+ 		data() {
+ 			return {
+ 				title:''
+ 			};
+ 		},
+ 		onLoad(option){
+ 			this.title = option.title
+ 		},
+ 		
+ 		onShow() {
+ 			if(this.$refs.productPutawayRecord!=undefined){
+ 				this.$refs.productPutawayRecord.refresh();
+ 			}
+ 		},
+ 
+ 		onPullDownRefresh() {
+ 			this.$refs.productPutawayRecord.refresh();
+ 		},
+ 		onNavigationBarButtonTap(e) {
+ 			if (e.index === 0) {
+ 				this.$refs.productPutawayRecord.toHome();
+ 			} else if (e.index == 1) {
+ 				this.$refs.productPutawayRecord.openFilter();
+ 			}
+ 		},
+ 
+ 		methods: {
+ 
+ 		}
+ 	}
+ </script>
+ 
+ <style scoped lang="scss">
+ 
+ </style>
\ No newline at end of file
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index 409d5e22..5dcdfa37 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -115,11 +115,11 @@
 				title: option.title
 			})
 			this.type = option.type
-			if (this.type == 'predict') {
-				updateTitle('制品上架记录')
-			} else if (this.type == 'assemble') {
-				updateTitle('装配上架记录')
-			}
+			// if (this.type == 'predict') {
+			// 	updateTitle('制品上架记录')
+			// } else if (this.type == 'assemble') {
+			// 	updateTitle('装配上架记录')
+			// }
 
 			getBusinessType(this.bussinessCode, res => {
 				if (res.success) {
@@ -264,7 +264,6 @@
 				setTimeout(r => {
 					this.$refs.scanPopup.openScanPopupByBusinessType(this.businessType);
 				})
-
 			},
 
 			closeScanPopup() {
diff --git a/src/pages/productPutaway/record/semiDirectPutaway.vue b/src/pages/productPutaway/record/semiDirectPutaway.vue
new file mode 100644
index 00000000..80676802
--- /dev/null
+++ b/src/pages/productPutaway/record/semiDirectPutaway.vue
@@ -0,0 +1,48 @@
+<template>
+	<view class="">
+		<product-putaway-record :title="title" ref="productPutawayRecord" type='predict'></product-putaway-record>
+	</view>
+</template>
+
+<script>
+	import productPutawayRecord from '@/pages/productPutaway/record/productPutawayRecord.vue'
+
+	export default {
+		components: {
+			productPutawayRecord
+		},
+		data() {
+			return {
+				title:''
+			};
+		},
+		onLoad(option){
+			this.title = option.title
+		},
+		
+		onShow() {
+			if(this.$refs.productPutawayRecord!=undefined){
+				this.$refs.productPutawayRecord.refresh();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.$refs.productPutawayRecord.refresh();
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.productPutawayRecord.toHome();
+			} else if (e.index == 1) {
+				this.$refs.productPutawayRecord.openFilter();
+			}
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file