From 944e2c29e0ccda3afcf2cc1a37ed9cc82d9402f5 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 24 Jun 2025 16:51:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E4=B8=8B=E6=96=99-=E4=BA=BA?=
 =?UTF-8?q?=E5=B7=A5=E5=91=BC=E5=8F=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SecondPhase/slitting/SlittingFeeding.vue  | 27 ++++++++++++++++---
 utils/getData4.js                             | 11 +++++++-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/pages/SecondPhase/slitting/SlittingFeeding.vue b/pages/SecondPhase/slitting/SlittingFeeding.vue
index c5307d2..9a08cfa 100644
--- a/pages/SecondPhase/slitting/SlittingFeeding.vue
+++ b/pages/SecondPhase/slitting/SlittingFeeding.vue
@@ -82,7 +82,7 @@
 		<view class="zd-row submitbar">
 			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('2')">{{$t('button.full-shaft-return')}}</button>
 			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('1')">{{$t('button.empty-shaft-return')}}</button>
-			<button class="zd-col-5 btn-submit btn-success" @tap="handleSure">{{$t('button.manual-call')}}</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled" @tap="manCall">{{$t('button.manual-call')}}</button>
 			<!-- <button class="zd-col-3 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button> -->
 			<button class="zd-col-3 btn-submit btn-success" @tap="searchList">{{$t('button.search')}}</button>
 		</view>
@@ -131,7 +131,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import UpTop from '@/components/upTop.vue'
-	import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingHandleConfirm, feedingVehicleReturn} from '@/utils/getData2.js'
+	import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingHandleConfirm, feedingVehicleReturn, feedinghandleConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -219,6 +219,26 @@
 					this.status = 'noMore'
 				}
 			},
+			/** 人工呼叫-改直接调用 */
+			async manCall () {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await feedinghandleConfirm(this.pkObj)
+					this.disabled = false
+					this.pkId = ''
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
 			/** 呼叫 */
 			async toSure () {
 				this.disabled = true
@@ -244,7 +264,8 @@
 				this.pkObj = this.pkId === e.container_name ? e : {}
 			},
 			handleSure () {
-				this.active = true
+				// this.active = true
+				// 去掉弹框
 			},
 			cancleModal () {
 				this.active = false
diff --git a/utils/getData4.js b/utils/getData4.js
index 176b8b1..a4f2103 100644
--- a/utils/getData4.js
+++ b/utils/getData4.js
@@ -34,4 +34,13 @@ export const downShafts = (device, code) => request({
 		device_code: device,
 		container: code
 	}
-})
\ No newline at end of file
+})
+/**
+ * 分切上料-人工呼叫
+ */
+export const feedinghandleConfirm = (obj) => request({
+	url:'api/pda/feeding/handleConfirm',
+	data: {
+		raw_jo: obj
+	}
+})