From e65d303e35f7721fd81728769c3dac8bf5c927c4 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 26 Aug 2024 16:31:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=8C=BA=E7=A9=BA=E6=96=99?=
 =?UTF-8?q?=E6=9E=B6=E9=80=81=E5=9B=9E,=E5=A4=96=E5=8D=8F=E5=8C=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=AC=BC=E6=A1=86=E9=80=81=E5=9B=9E,=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E8=BD=AC=E8=BF=90,=E8=A1=A5=E7=A9=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/manage/empty-material-racks-back.vue | 73 ++++++++++++++++++++--
 pages/manage/empty-tray-back.vue           | 18 ++----
 pages/manage/fill-tray.vue                 | 39 ++++++------
 pages/manage/material-transfer.vue         | 73 ++++++++++++++++++++--
 utils/getData2.js                          | 31 +++++++++
 5 files changed, 195 insertions(+), 39 deletions(-)

diff --git a/pages/manage/empty-material-racks-back.vue b/pages/manage/empty-material-racks-back.vue
index 239d03a..4b316e2 100644
--- a/pages/manage/empty-material-racks-back.vue
+++ b/pages/manage/empty-material-racks-back.vue
@@ -1,19 +1,84 @@
 <template>
-	<view>
-		
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">当前点位</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">载具号</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_handheldRack">确认</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {handheldRack} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				title: '',
+				val1: '',
+				val2: '',
+				disabled: false
 			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async _handheldRack () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await handheldRack(this.val1, this.val2)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.disabled = false
+			}
 		}
 	}
 </script>
 
 <style lang="stylus">
-
 </style>
diff --git a/pages/manage/empty-tray-back.vue b/pages/manage/empty-tray-back.vue
index d7b54bd..e519258 100644
--- a/pages/manage/empty-tray-back.vue
+++ b/pages/manage/empty-tray-back.vue
@@ -25,7 +25,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_callEmptyVehicle">送回确认</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_handheldCageFrame">送回确认</button>
 		</view>
 	</view>
 </template>
@@ -34,7 +34,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import LinkScan from '@/components/LinkScan.vue'
-	import {getVehicleType, callEmptyVehicle} from '@/utils/getData2.js'
+	import {handheldCageFrame} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -56,22 +56,14 @@
 			getScanlist (e) {
 				this.val2 = e.join()
 			},
-			/** 载具类型下拉框 */
-			async _getVehicleType () {
-				let res = await getVehicleType()
-				this.options1 = [...res]
-			},
-			pickerChange (e) {
-				this.index1 = e.detail.value
-			},
-			async _callEmptyVehicle () {
+			async _handheldCageFrame () {
 				this.disabled = true
-				if (!this.val1) {
+				if (!this.val1 || !this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await callEmptyVehicle(this.val1)
+					let res = await handheldCageFrame(this.val1, this.val2)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
diff --git a/pages/manage/fill-tray.vue b/pages/manage/fill-tray.vue
index 248f341..c00dc01 100644
--- a/pages/manage/fill-tray.vue
+++ b/pages/manage/fill-tray.vue
@@ -4,6 +4,16 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">当前点位</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
 					<view class="zd-col-5">
 						<span class="filter_label">载具类型</span>
 					</view>
@@ -14,22 +24,11 @@
 					</view>
 					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
-				<view class="zd-row">
-					<view class="zd-col-5">
-						<span class="filter_label">当前点位</span>
-					</view>
-					<view class="zd-col-19">
-						<search-box
-						v-model="val1"
-						/>
-					</view>
-				</view>
-				
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_unbindVehicle">补空确认</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || index1 === ''}" :disabled="disabled" @tap="_handheldStorehouse">确认</button>
 		</view>
 	</view>
 </template>
@@ -37,7 +36,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getVehicleType, bindVehicle, unbindVehicle} from '@/utils/getData2.js'
+	import {vehicleType, handheldStorehouse} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -54,24 +53,28 @@
 		},
 		onLoad (options) {
 			this.title = options.title
+			this._vehicleType()
 		},
 		methods: {
 			/** 载具类型下拉框 */
-			async _getVehicleType () {
-				let res = await getVehicleType()
-				this.options1 = [...res]
+			async _vehicleType () {
+				let res = await vehicleType()
+				this.options1 = [...res.content]
+				this.options1.map(el => {
+					this.$set(el, 'text', el.label)
+				})
 			},
 			pickerChange (e) {
 				this.index1 = e.detail.value
 			},
-			async _bindVehicle () {
+			async _handheldStorehouse () {
 				this.disabled = true
 				if (!this.val1 || this.index1 === '') {
 					this.disabled1 = false
 					return
 				}
 				try {
-					let res = await bindVehicle(this.val1, this.options1[this.index1].value)
+					let res = await handheldStorehouse(this.val1, this.options1[this.index1].value)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
diff --git a/pages/manage/material-transfer.vue b/pages/manage/material-transfer.vue
index 239d03a..b0a4e55 100644
--- a/pages/manage/material-transfer.vue
+++ b/pages/manage/material-transfer.vue
@@ -1,19 +1,84 @@
 <template>
-	<view>
-		
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">当前点位</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">载具号</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_handheldTranshipment">确认</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {handheldTranshipment} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				title: '',
+				val1: '',
+				val2: '',
+				disabled: false
 			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async _handheldTranshipment () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await handheldTranshipment(this.val1, this.val2)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.disabled = false
+			}
 		}
 	}
 </script>
 
 <style lang="stylus">
-
 </style>
diff --git a/utils/getData2.js b/utils/getData2.js
index 4e6d6ad..31ca2fd 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -30,6 +30,37 @@ export const handheldLock = (code, status) => request({
 	url:'api/handheld/lock',
 	data: {region_code: code, status: status}
 })
+// 外协区空料架送回
+export const handheldRack = (code, vcode) => request({
+	url:'api/handheld/rack',
+	data: {device_code: code, vehicle_code: vcode}
+})
+// 外协区空笼框送回
+export const handheldCageFrame = (code, list) => request({
+	url:'api/handheld/cageFrame',
+	data: {device_code: code, vehicle_list: list}
+})
+// 物料转运
+export const handheldTranshipment = (code, vcode) => request({
+	url:'api/handheld/transhipment',
+	data: {device_code: code, vehicle_code: vcode}
+})
+// 载具类型列表
+// export const vehicleType = () => request({
+// 	url:'api/fab/vehicleType',
+// 	data: {}
+// })
+export const vehicleType = () => {
+	let res = {
+	    content: [{ label: 'aa', value: '11'}, { label: 'bb', value: '22'}]
+	}
+	return res
+}
+// 补空框
+export const handheldStorehouse = (code, type) => request({
+	url:'api/handheld/storehouse',
+	data: {device_code: code, vehicle_type: type}
+})
 
 /**
  * 空托盘出库