分切下料-人工呼叫

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

utils/getData4.js

@@ -35,3 +35,12 @@ export const downShafts = (device, code) => request({
 		container: code
 	}
 })
+/**
+ * 分切上料-人工呼叫
+ */
+export const feedinghandleConfirm = (obj) => request({
+	url:'api/pda/feeding/handleConfirm',
+	data: {
+		raw_jo: obj
+	}
+})