diff --git a/pages/SecondPhase/production/SboProcess.vue b/pages/SecondPhase/production/SboProcess.vue index 00776c8..436ec04 100644 --- a/pages/SecondPhase/production/SboProcess.vue +++ b/pages/SecondPhase/production/SboProcess.vue @@ -11,7 +11,7 @@ - + @@ -34,6 +34,7 @@ + @@ -89,7 +90,7 @@ import SearchBox from '@/components/SearchBox.vue' import UpTop from '@/components/upTop.vue' import { confirmAction } from '@/utils/utils.js' - import {queryProductArea, queryRawFoilList, createOrder, confirmBlanking, rawScrollDowm} from '@/utils/getData1.js' + import {queryProductArea, queryRawFoilList, createOrder, rawPrint, confirmBlanking, rawScrollDowm} from '@/utils/getData1.js' export default { components: { NavBar, @@ -179,6 +180,9 @@ if ((!this.val1 || !this.val2) && type === '6') { return } + if (!this.val2 && type === '7') { + return + } const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗?") if (isConfirmed) { if (type === '5') { @@ -187,6 +191,9 @@ if (type === '6') { this._createOrder() } + if (type === '7') { + this._rawPrint() + } } }, async _confirmBlanking () { @@ -221,6 +228,22 @@ this.disabled1 = false } }, + async _rawPrint () { + this.disabled1 = true + try { + let res = await rawPrint(this.val2) + this.disabled1 = false + this.pkId = '' + this.pkObj = {} + this.searchList() + uni.showToast({ + title: res.message, + icon: 'none' + }) + } catch (e) { + this.disabled1 = false + } + }, async handleConfirm1(type) { this.type = type if (!this.pkId && (type === '1' || type === '3')) { diff --git a/utils/getData1.js b/utils/getData1.js index 249249d..879b9fd 100644 --- a/utils/getData1.js +++ b/utils/getData1.js @@ -50,6 +50,13 @@ export const createOrder = (code, name) => request({ container_name: name } }) +// 打印 +export const rawPrint = (name) => request({ + url: 'api/pda/raw/print', + data: { + container_name: name + } +}) // 确认下卷-改为:准备就绪 export const confirmBlanking = (code) => request({ url: 'api/pda/raw/confirmBlanking',