From a6ec63752a00edd7e0f5fd15608800bc7cf2fc51 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 20 May 2024 14:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                   | 16 +++++
 pages/SecondPhase/finished/ReturnToStore.vue | 71 ++++++++++++++++++++
 utils/getData3.js                            | 10 +++
 utils/mork2.js                               |  4 ++
 4 files changed, 101 insertions(+)
 create mode 100644 pages/SecondPhase/finished/ReturnToStore.vue

diff --git a/pages.json b/pages.json
index e139858..f071d90 100644
--- a/pages.json
+++ b/pages.json
@@ -383,6 +383,22 @@
             }
             
         }
+        ,{
+            "path" : "pages/SecondPhase/finished/ReturnToStore",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/finished/abnorToStore",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/finished/ReturnToStore.vue b/pages/SecondPhase/finished/ReturnToStore.vue
new file mode 100644
index 0000000..95ede80
--- /dev/null
+++ b/pages/SecondPhase/finished/ReturnToStore.vue
@@ -0,0 +1,71 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="退货入库"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">木箱号</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val2" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_twoPdaReturnIn">入库</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {twoPdaReturnIn} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				disabled: false
+			};
+		},
+		methods: {
+			async _twoPdaReturnIn () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await twoPdaReturnIn(this.val1, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/utils/getData3.js b/utils/getData3.js
index 419059f..8629779 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -98,4 +98,14 @@ export const createOrder = (code, name) => request({
 		point_code: code,
 		container_name: name
 	}
+})
+/**
+ * 二期退货入库
+ */
+export const twoPdaReturnIn = (no, pcode) => request({
+	url:'api/twoPda/vehicle/returnIn',
+	data: {
+		box_no: no,
+		point_code: pcode
+	}
 })
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index b6e6ca2..44bda79 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -83,6 +83,10 @@ export const authority = () => {
 				{menu_id: '1', title: '点位管理', path: '/pages/SecondPhase/point/PointManage'},
 				{menu_id: '2', title: '异常出库解锁', path: '/pages/SecondPhase/point/ErrorOutUnlock'}
 			]},
+			{menu_id: '7', path: 'RF06', title: '成品入库', sonTree: [
+				{menu_id: '1', title: '退货入库', path: '/pages/SecondPhase/finished/ReturnToStore'},
+				{menu_id: '2', title: '异常口入库', path: '/pages/SecondPhase/finished/abnorToStore'}
+			]}
 		]
 		}
 	}}