From 79daa70791a06babf13456b3940c5c29825a6c67 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 6 Jan 2023 14:50:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=8D=B7=E9=85=8D=E9=80=81=E5=A5=97?=
 =?UTF-8?q?=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ProductManage/ZjCasing.vue   | 33 ++++++++++++++++++++++++++----
 pages/ProductManage/ZjDelivery.vue | 30 ++++++++++++++++++++++++++-
 utils/getData2.js                  | 15 ++++++++++++++
 3 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/pages/ProductManage/ZjCasing.vue b/pages/ProductManage/ZjCasing.vue
index bd83b38..411e87a 100644
--- a/pages/ProductManage/ZjCasing.vue
+++ b/pages/ProductManage/ZjCasing.vue
@@ -29,7 +29,7 @@
 				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">存放点位</span>
+						<span class="filter_label">点位</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box
@@ -95,6 +95,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 || !val2}" :disabled="disabled1" @tap="_casingOutConfirm">拔轴确认</button>
 			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">套轴确认</button>
 			<button class="submit-button" @tap="searchList">查询</button>
 		</view>
@@ -104,7 +105,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryProductArea, queryDeviceByarea, queryMaterialInfo2, casingConfirm} from '@/utils/getData2.js'
+	import {queryProductArea, queryDeviceByarea, queryMaterialInfo2, casingConfirm, casingOutConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -132,7 +133,8 @@
 				},
 				totalCount: 0,
 				pageNum: 1,
-				pageSize: 10
+				pageSize: 10,
+				disabled1: false
 			};
 		},
 		created () {
@@ -197,7 +199,7 @@
 					this.status = 'noMore'
 				}
 			},
-			/** 确认 */
+			/** 套轴确认 */
 			async _casingConfirm () {
 				this.disabled = true
 				if (!this.checkArr.length || !this.val2) {
@@ -220,6 +222,29 @@
 					this.disabled = false
 				}
 			},
+			/** 拔轴确认 */
+			async _casingOutConfirm () {
+				this.disabled1 = true
+				if (!this.val1 || !this.val2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await casingOutConfirm(this.val2, this.val1)
+					this.disabled1 = false
+					this.checkArr = []
+					this.val1 = ''
+					this.val2 = ''
+					this.val4 = ''
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
 			toCheck (e) {
 				e.checked = !e.checked
 				this.checkArr = this.dataList.filter(i => { return i.checked === true })
diff --git a/pages/ProductManage/ZjDelivery.vue b/pages/ProductManage/ZjDelivery.vue
index 05b2d66..d3a863b 100644
--- a/pages/ProductManage/ZjDelivery.vue
+++ b/pages/ProductManage/ZjDelivery.vue
@@ -96,6 +96,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !val3}" :disabled="disabled5" @tap="_acrossVehicle">载具横移</button>
 			<button class="submit-button" :class="{'btn-disabled': checkArr.length === 0 || checkArr.length > 1}" :disabled="disabled1" @tap="_needVehicle">呼叫载具</button>
 			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled4" @tap="_shippingCheck">配送校验</button>
 			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val3}" :disabled="disabled2" @tap="_shippingConfirm">配送确认</button>
@@ -108,7 +109,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryProductArea, queryDeviceByarea, queryMaterialInfo3, needVehicle, shippingConfirm, returnVehicle, shippingCheck} from '@/utils/getData2.js'
+	import {queryProductArea, queryDeviceByarea, queryMaterialInfo3, needVehicle, shippingConfirm, returnVehicle, shippingCheck, acrossVehicle} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -129,6 +130,7 @@
 				disabled2: false,
 				disabled3: false,
 				disabled4: false,
+				disabled5: false,
 				checkArr: []
 			};
 		},
@@ -244,6 +246,32 @@
 					this.disabled3 = false
 				}
 			},
+			/** 载具横移 */
+			async _acrossVehicle () {
+				this.disabled5 = true
+				if (!this.val3) {
+					uni.showToast({
+						title: '请输入起点',
+						icon: 'none'
+					})
+					this.disabled5 = false
+					return
+				}
+				try {
+					let res = await acrossVehicle(this.val3)
+					this.disabled5 = false
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this._queryMaterialInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled5 = false
+				}
+			},
 			toCheck (e) {
 				e.checked = !e.checked
 				this.checkArr = this.dataList.filter(i => { return i.checked === true })
diff --git a/utils/getData2.js b/utils/getData2.js
index f27b65c..7a4833a 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -151,6 +151,14 @@ export const queryDeviceByarea = (area) => request({
 // 	}
 // 	return res
 // }
+// 1.4拔轴确认
+export const casingOutConfirm = (qzz, code) => request({
+	url:'api/pda/casing/outConfirm',
+	data: {
+		qzzno: qzz,
+		point_code: code
+	}
+})
 
 /**
  * 子卷配送
@@ -198,6 +206,13 @@ export const shippingCheck = (code, qzzno) => request({
 		qzzno: qzzno
 	}
 })
+// 1.6载具横移
+export const acrossVehicle = (code) => request({
+	url:'api/pda/shipping/acrossVehicle',
+	data: {
+		point_code: code
+	}
+})
 
 /**
  * 子卷进站