diff --git a/pages/SecondPhase/production/SboProcess.vue b/pages/SecondPhase/production/SboProcess.vue index a3893bc..3b17bd7 100644 --- a/pages/SecondPhase/production/SboProcess.vue +++ b/pages/SecondPhase/production/SboProcess.vue @@ -11,8 +11,9 @@ - - + + + @@ -68,10 +69,8 @@ - - - - + + @@ -81,7 +80,7 @@ import NavBar from '@/components/NavBar.vue' import SearchBox from '@/components/SearchBox.vue' import UpTop from '@/components/upTop.vue' - import {queryRawFoilList, createOrder, confirmBlanking, rawStart, rawScrollDowm} from '@/utils/getData1.js' + import {queryRawFoilList, createOrder, confirmBlanking, rawScrollDowm} from '@/utils/getData1.js' export default { components: { NavBar, @@ -161,12 +160,12 @@ // 准备就绪 async _confirmBlanking () { this.disabled2 = true - if (!this.pkId) { + if (!this.val1) { this.disabled2 = false return } try { - let res = await confirmBlanking(this.pkObj) + let res = await confirmBlanking(this.val1) this.disabled2 = false this.pkId = '' this.pkObj = {} @@ -179,27 +178,6 @@ this.disabled2 = false } }, - // 开始工单 - async _rawStart () { - this.disabled3 = true - if (!this.pkId) { - this.disabled3 = false - return - } - try { - let res = await rawStart(this.pkObj) - this.disabled3 = false - this.pkId = '' - this.pkObj = {} - this.searchList() - uni.showToast({ - title: res.message, - icon: 'none' - }) - } catch (e) { - this.disabled3 = false - } - }, // 正常下卷/单下卷/单上轴/单下轴 async _rawScrollDowm (type) { this.disabled4 = true diff --git a/utils/getData1.js b/utils/getData1.js index 4dd296b..350fe70 100644 --- a/utils/getData1.js +++ b/utils/getData1.js @@ -50,10 +50,10 @@ export const createOrder = (code, name) => request({ } }) // 确认下卷-改为:准备就绪 -export const confirmBlanking = (rjo) => request({ +export const confirmBlanking = (code) => request({ url: 'api/pda/raw/confirmBlanking', data: { - raw_jo: rjo + point_code: code } }) // 开始工单