From 24e9ab2fff07120396bc38f0c521a20cf784dbc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Fri, 25 Oct 2024 14:15:28 +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=202024/8/3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                | 13 ++++-
 .../productPutaway/record/fgDirectPutaway.vue | 48 +++++++++++++++++++
 .../record/productPutawayRecord.vue           | 10 ++--
 .../record/semiDirectPutaway.vue              | 48 +++++++++++++++++++
 4 files changed, 112 insertions(+), 7 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 527ffc62..8c376964 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1145,15 +1145,24 @@
 
 			}
 		},
+
 		{
-			"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",
 			"style": {
diff --git a/src/pages/productPutaway/record/fgDirectPutaway.vue b/src/pages/productPutaway/record/fgDirectPutaway.vue
new file mode 100644
index 00000000..4bd5f2ad
--- /dev/null
+++ b/src/pages/productPutaway/record/fgDirectPutaway.vue
@@ -0,0 +1,48 @@
+ <template>
+ 	<view class="">
+ 		<product-putaway-record :title="title" ref="productPutawayRecord" putawayType='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 54f249db..378b001a 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -87,11 +87,11 @@
 			title: option.title
 		})
 		type.value = option.type
-		if (type.value == 'predict') {
-			updateTitle('制品上架记录')
-		} else if (type.value == 'assemble') {
-			updateTitle('装配上架记录')
-		}
+		// if (type.value == 'predict') {
+		// 	updateTitle('制品上架记录')
+		// } else if (type.value == 'assemble') {
+		// 	updateTitle('装配上架记录')
+		// }
 		getBusinessType(bussinessCode.value, (res) => {
 			if (res.success) {
 				businessType.value = res.businessType
diff --git a/src/pages/productPutaway/record/semiDirectPutaway.vue b/src/pages/productPutaway/record/semiDirectPutaway.vue
new file mode 100644
index 00000000..f8aebb9e
--- /dev/null
+++ b/src/pages/productPutaway/record/semiDirectPutaway.vue
@@ -0,0 +1,48 @@
+<template>
+ 	<view class="">
+ 		<product-putaway-record :title="title" ref="productPutawayRecord" putawayType='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