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 @@ - + @@ -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 + } +})