From 51907cc12be77bb588865d94ef09afb0181521d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Tue, 10 Dec 2024 09:17:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=98=E7=9B=98=E8=BD=AC=E8=BF=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                       |   8 +++
 pages/home/home.vue              |   3 +-
 pages/transfer/tray-transfer.vue |  99 +++++++++++++++++++++++++++++++
 static/image/menu/RF09.png       | Bin 0 -> 1613 bytes
 utils/getData2.js                |  12 ++++
 utils/mork2.js                   |   4 ++
 6 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 pages/transfer/tray-transfer.vue
 create mode 100644 static/image/menu/RF09.png

diff --git a/pages.json b/pages.json
index f541877..0923216 100644
--- a/pages.json
+++ b/pages.json
@@ -248,6 +248,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/transfer/tray-transfer",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 704a2fc..0c6d748 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -47,7 +47,8 @@
 					{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
 					{title: '盘点管理', path: 'RF05', sonTree: [{title: '盘点作业', path: '/pages/check/check-task'}]},
 					{title: '任务管理', path: 'RF06', sonTree: [{title: '任务管理', path: '/pages/task/task-manage'}]},
-					{title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]}
+					{title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]},
+					{title: '转运管理', path: 'RF09', sonTree: [{title: '托盘转运', path: '/pages/transfer/tray-transfer'}]}
 				],
 				show: false,
 				secM: [],
diff --git a/pages/transfer/tray-transfer.vue b/pages/transfer/tray-transfer.vue
new file mode 100644
index 0000000..3863ac7
--- /dev/null
+++ b/pages/transfer/tray-transfer.vue
@@ -0,0 +1,99 @@
+<template>
+	<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-7">
+						<span class="filter_label">起点</span>
+					</view>
+					<view class="zd-col-24">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">终点</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_transfConfirm">转运确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {deviceManageTransf, transfConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [],
+				index: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._deviceManageTransf(e)
+				}
+			},
+			async _deviceManageTransf (e) {
+				let res = await deviceManageTransf(e)
+				this.options = [...res]
+			},
+			async _transfConfirm () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await transfConfirm(this.val1, this.index)
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.button-primary, .button-default
+	_fj(center)
+	font-size 26rpx
+	height 88rpx
+	line-height 30rpx
+</style>
diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png
new file mode 100644
index 0000000000000000000000000000000000000000..6417a79f0e56715159c4beb35362b8c1c2b30e6b
GIT binary patch
literal 1613
zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901|%(3I5Gh#$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%o>>?5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNY@uLosb^?v
zX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*8A=6l&%Q8or6i
znRy^VO|ULsUn|eN;*!L?<Wx@=TP2`5dYPFiR?bcaM$WDVW=@W-#)gKj7LG>FCYC0~
z#zrP?F3y$~CNRA&`N^fZsd*(Zy(tL2<~a3&5=3qR&}Ns^qRg_?6t|-MTm`Vltuk@D
z#RR8$P`xR*-C~MUuRhQ*`k?4Vif)(?Fb#p2@Wcz`z>|M!9x%-p0TcJKqp>p?7?^f@
zx;TbZ+<J5OythcA4BLnAb7Peal}_=^YkFn>Vp6+?c7CNtr$WaE0g0=sDoQW1TuVA!
zT!YSRzOk}dATmUtgvX|vrD}z<Ym(u|Z+mucKC|s==IptZ_iFe3Ft9IA|9<$5^?U1G
z8FP!>rq;SD32a#q+9U=cye<G)Kq8ED*MiWzZ=7t$=NO9FZ!`LMx%tGT-ZOH)e^&`#
zowoSa9`EZv-v;iAPp#Fg^|`X)uAAOneWUs_*X8wV=X4wH?W;}8zP(QFzxly4vnxb@
zzxn+8r_?*$+jka7pV~hmGo`-Ke;xY?<CNZ=FLyM25&aXqhgmW`Z}E4f@1C>HFs5{f
z-co+Aw#&}erEHVqe3x^ROIfNWSo>U<dqO00eRfKX<-63zeXTMIt?Rx_Qj0$#+xpIZ
zzFcwawkp9IAG>)LEqiozzD%C|O`1(dd}izVFH?EFFE11-QTT3k!Ohy6uOY5oGxU8m
zPrr=r`IkLmK&dSYSl0pxU?7wjZ|#aPlf2K8RsO>NgkTDjWup$a)$FSN8jok@6N7bb
z<XkvD!MpUd$&H@eFD%Mt+3TD6X78+izR^8$!_D6pzfX|nxuM7tk!PIHZe*lmQ|96P
z!6|wBqw=@iCsvE?Tb}nMnfcr0CH!(aU&^282tEHHXFmD*hI!A`EnYJpw^Y8K#a*a4
z|6=S3(<hbO_b+pOTAa7D#l~xy<MxYd|2+P(n^)YW-@1QJ;Cf~2Cw(kGV|IVB`s8r0
zO=rfdaE&YddE!q57HCemxiE9W%!Ml_L@s<eL2}`8$%&E+?;9!^JN*uPmY8BKZ1lL{
zX#LV3rk_M_9{qAiQol{r>`8!I8!*D7K(QWmLCcXl>cYY6=XK`qxmhjy@0edb!wKmV
zr}wY<-&FHYo_)hFalb4p7EpM>0u7#W^4|YaJ-{INq2Y!8o-Lq?gTd3)&t;ucLK6Vv
Cv27>-

literal 0
HcmV?d00001

diff --git a/utils/getData2.js b/utils/getData2.js
index fb0706f..75334d4 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -195,3 +195,15 @@ export const inStorageConfirm = (obj) => request({
 	url:'api/pda/inStorage/confirm',
 	data: obj
 })
+
+/**
+ * 托盘转运
+ */
+export const deviceManageTransf = (start) => request({
+	url:'api/deviceManage/transf',
+	data: {start: start}
+})
+export const transfConfirm = (start, end) => request({
+	url:'api/deviceManage/transfConfirm',
+	data: {start: start, end: end}
+})
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 701f866..1553ad1 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -210,4 +210,8 @@ export const outStorageOrderConfirm = (code) => {
 	  "msg": ""
 	}
 	return res
+}
+export const deviceManageTransf = () => {
+	let res = [{value: '1109', text: '一楼楼入库点'}, {value: '2109', text: '二楼楼入库点'}]
+	return res
 }
\ No newline at end of file