From 00b698500f50db405fdfd414442a48144296e3e0 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 15 Aug 2024 09:02:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/check/check-task.vue           |  4 ++++
 pages/entry/empty-tray-to-store.vue  |  4 ++++
 pages/entry/group-to-store.vue       |  2 --
 pages/outbound/out-store-confirm.vue |  4 ++++
 pages/outbound/tray-out-store.vue    | 18 ++++++++++++++----
 utils/getData2.js                    |  4 ++++
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/pages/check/check-task.vue b/pages/check/check-task.vue
index ba9a165..bff0c98 100644
--- a/pages/check/check-task.vue
+++ b/pages/check/check-task.vue
@@ -153,6 +153,10 @@
 						})
 						this.clearUp()
 					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
 						this.disabled = false
 					}
 				} catch (e) {
diff --git a/pages/entry/empty-tray-to-store.vue b/pages/entry/empty-tray-to-store.vue
index 1a3d777..7d467db 100644
--- a/pages/entry/empty-tray-to-store.vue
+++ b/pages/entry/empty-tray-to-store.vue
@@ -78,6 +78,10 @@
 						})
 						this.clearUp()
 					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
 						this.disabled = false
 					}
 				} catch (e) {
diff --git a/pages/entry/group-to-store.vue b/pages/entry/group-to-store.vue
index 4825390..a7ea226 100644
--- a/pages/entry/group-to-store.vue
+++ b/pages/entry/group-to-store.vue
@@ -105,8 +105,6 @@
 				}
 				try {
 					let res = await mdGruopDick(this.dataList, this.val1, this.val2)
-					if (res.code === '200') {
-					}
 					this.disabled = false
 					uni.showToast({
 						title: res.msg,
diff --git a/pages/outbound/out-store-confirm.vue b/pages/outbound/out-store-confirm.vue
index b87f38f..964885f 100644
--- a/pages/outbound/out-store-confirm.vue
+++ b/pages/outbound/out-store-confirm.vue
@@ -63,6 +63,10 @@
 						})
 						this.clearUp()
 					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
 						this.disabled = false
 					}
 				} catch (e) {
diff --git a/pages/outbound/tray-out-store.vue b/pages/outbound/tray-out-store.vue
index 29ff37d..039575c 100644
--- a/pages/outbound/tray-out-store.vue
+++ b/pages/outbound/tray-out-store.vue
@@ -40,7 +40,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {pdaPalletIostorinvOut} from '@/utils/getData2.js'
+	import {targetPoint, pdaPalletIostorinvOut} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -52,15 +52,14 @@
 				options1: [{text:'堆叠托盘', value:'22222222'},{text:'料箱',value: '11111111'}],
 				index1: '',
 				qty: '',
-				options2: [{text:'1309', value:'1309'}],
+				options2: [],
 				index2: '',
 				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
-		},
-		created () {
+			this._targetPoint()
 		},
 		methods: {
 			selectChange1 (e) {
@@ -69,6 +68,13 @@
 			selectChange2 (e) {
 				this.index2 = e
 			},
+			async _targetPoint () {
+				let res = await targetPoint()
+				this.options2 = [...res]
+				this.options2.map(el => {
+					this.$set(el, 'text', el.label)
+				})
+			},
 			clearUp () {
 				this.qty = ''
 				this.index1 = ''
@@ -90,6 +96,10 @@
 						})
 						this.clearUp()
 					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
 						this.disabled = false
 					}
 				} catch (e) {
diff --git a/utils/getData2.js b/utils/getData2.js
index 504a109..f67e8c6 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -49,6 +49,10 @@ export const pdaPalletIostorinvIn = (code, id) => request({
 /**
  * 托盘出库
  */
+export const targetPoint = () => request({
+	url:'api/pdaPalletIostorinv/targetPoint',
+	method: 'GET'
+})
 export const pdaPalletIostorinvOut = (id, qty, point) => request({
 	url:'api/pdaPalletIostorinv/out',
 	data: {material_id: id, qty: qty, pcsn: '1', target_point: point}