From 70b1979cd86eda02cf682c5d3ff3f0b3d3834cda Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 6 Mar 2023 11:38:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E8=BD=B4=E9=80=81=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ProductManage/SlittingFeeding.vue | 32 +++++++++++++++++++++++--
 utils/getData2.js                       |  7 ++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/pages/ProductManage/SlittingFeeding.vue b/pages/ProductManage/SlittingFeeding.vue
index 8f9d69f..b3a950d 100644
--- a/pages/ProductManage/SlittingFeeding.vue
+++ b/pages/ProductManage/SlittingFeeding.vue
@@ -77,6 +77,7 @@
 			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
 		</view>
 		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn">空轴送回</button>
 			<button class="submit-button" @tap="handleSure">人工呼叫</button>
 			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button>
 			<button class="submit-button" @tap="searchList">查询</button>
@@ -121,7 +122,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingHandleConfirm} from '@/utils/getData2.js'
+	import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingHandleConfirm, feedingVehicleReturn} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -151,7 +152,8 @@
 				val3: '',
 				val4: '',
 				val5: '',
-				disabled1: false
+				disabled1: false,
+				disabled2: false
 			};
 		},
 		created () {
@@ -284,6 +286,32 @@
 					this.disabled1 = false
 				}
 			},
+			/** 空轴送回 */
+			async _feedingVehicleReturn () {
+				this.disabled2 = true
+				if (!this.val1) {
+					this.disabled2 = false
+					uni.showToast({
+						title: '点位不能为空',
+						icon: 'none'
+					})
+					return
+				}
+				try {
+					let res = await feedingVehicleReturn(this.val1)
+					this.disabled2 = false
+					this.active = false
+					this.val1 = '''
+					this.pkId = ''
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
 		}
 	}
 </script>
diff --git a/utils/getData2.js b/utils/getData2.js
index 5e8064b..64a9d58 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -445,6 +445,13 @@ export const feedingHandleConfirm = (code, cn, ncode) => request({
 		next_point_code: ncode
 	}
 })
+// 1.5空轴送回
+export const feedingVehicleReturn = (code) => request({
+	url:'api/pda/feeding/vehicleReturn',
+	data: {
+		point_code: code
+	}
+})
 
 /**
  * 任务管理