From ce7caba6ddb036e3d8984730143dbd27adb91e09 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 14 Oct 2024 11:21:38 +0800 Subject: [PATCH] =?UTF-8?q?YT-348=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=92=8CPDA=E6=8F=90=E4=BA=A4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=90=8E=E7=9A=84=E6=89=93=E5=8D=B0=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E6=8C=87=E5=BC=95=E5=8D=95=E5=8A=9F=E8=83=BD=E5=8E=BB=E6=8E=89?= =?UTF-8?q?YT-356pda=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=8C=85=E8=A3=85=E9=87=8F=E7=9A=84=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E6=98=BE=E7=A4=BA0=EF=BC=8C=E7=8E=B0=E6=98=BE=E7=A4=BANaN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/qty/countQtyEdit.vue | 2 +- src/pages/pointPutawayJob/index.vue | 10 ++--- .../purchaseReceipt/job/receiptDetail.vue | 38 ++++++++++++------- src/pages/putaway/job/putawayJob.vue | 4 +- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/src/mycomponents/qty/countQtyEdit.vue b/src/mycomponents/qty/countQtyEdit.vue index 1a48f223..356281a1 100644 --- a/src/mycomponents/qty/countQtyEdit.vue +++ b/src/mycomponents/qty/countQtyEdit.vue @@ -28,7 +28,7 @@ 标包量 : - {{Number(dataContent.packQty)}} + {{Number(dataContent.packQty) || 0}} diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue index 3bc3a8f6..636b7ecb 100644 --- a/src/pages/pointPutawayJob/index.vue +++ b/src/pages/pointPutawayJob/index.vue @@ -274,7 +274,6 @@ }) this.newHtmlContent1 = this.newHtmlContent1.replace( "mainBody", str); //替换物品代码 - console.log(333, this.newHtmlContent1) }); // #endif }) @@ -292,7 +291,6 @@ } else { this.showTableSubList = this.data.sublist } - // console.log(233,this.showTableSubList) }, getTableInspectDTOList() { if (this.data1.inspectDTOList.length > this.pageSize1) { @@ -307,7 +305,6 @@ } else { this.showTableInspectDTOList = this.data1.inspectDTOList } - console.log(233, this.showTableInspectDTOList) }, showMessage(message) { this.$refs.comMessage.showMessage(message, res => { @@ -348,7 +345,11 @@ this.getTableSubList() }) } - // 获取采购收货指引单 + + if (this.data.ids && !this.number) { + this.tabIndex = 2 + } + // 获取采购收货检验指引单 if (this.number) { await queryInspectionFreeFlag({ number: this.number @@ -359,7 +360,6 @@ if (this.data1 && this.data1.inspectDTOList && this.data1.inspectDTOList.length == 0&&this.data.ids) { this.tabIndex = 2 } - console.log(88,this.data1.inspectDTOList) this.getTableInspectDTOList() }) .catch(error => { diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 9a58d696..9957d8bd 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -166,6 +166,7 @@ scanMessage: '', status: '', switchCode: "", + switchCode1: "", isCheckLocation: 'purchaseReceiptLocationCodeValidate', //校验收货库位 reasonText: "", @@ -181,9 +182,8 @@ this.scanMessage = option.scanMessage; this.operation = option.operation; this.status = option.status; - this.switchCode = "purchasereceiptPrintPDA" //pda打印 - - + this.switchCode = "purchasereceiptPrintPDA" //采购收货PDA打印开关 + this.switchCode1 = "EnableQms" //根据开关中是否启用QMS去判断，如果为TRUE显示检验指引单，如果为FALSE不显示检验指引单 }, onShow() { @@ -458,7 +458,6 @@ }, commit() { - this.scanCount = getScanCount(this.subList); if (this.scanCount == 0) { this.showErrorMessage("扫描数为0,请先扫描") return; @@ -530,7 +529,8 @@ this.detailSource.forEach(item => { itemCodes.push(item.itemCode) }) - + + //获取管理模式，封装参数 getManagementPrecisions(itemCodes, this.toLocationCode, res => { if (res.success) { @@ -539,15 +539,17 @@ let that = this purchaseReceiptJobSubmit(params).then(res => { if (res.data) { - let isCheckPrint = getSwitchInfoByCode(this.switchCode) - if (!isCheckPrint) { + let isCheckPrint = getSwitchInfoByCode(this.switchCode)//是否显示上架指引单 + let isCheckPrint1 = getSwitchInfoByCode(this.switchCode1)//是否显示采购收货检验指引单 + if (isCheckPrint1 && !isCheckPrint) { uni.hideLoading() - // this.showCommitSuccessMessage("提交成功\n生成采购收货记录\n" + res.data.number) uni.redirectTo({ url: '/pages/pointPutawayJob/index?number=' + that.jobContent.number }) - } else { + }else if(!isCheckPrint1 && !isCheckPrint){ + this.showCommitSuccessMessage("提交成功\n生成采购收货记录\n" + res.data.number) + }else { // if (res.data == '打印任务已发送，等待打印机处理！') { // this.showCommitSuccessMessage(res.data) // const purchaseReceiptDetailPointParams = { @@ -603,11 +605,19 @@ ',') } uni.hideLoading() - uni.redirectTo({ - url: '/pages/pointPutawayJob/index?number=' + that.jobContent.number + - '&data=' + - encodeURIComponent(JSON.stringify(dataParams)) - }) + if(!isCheckPrint1 && isCheckPrint){ + uni.redirectTo({ + url: '/pages/pointPutawayJob/index?data=' + + encodeURIComponent(JSON.stringify(dataParams)) + }) + }else if(isCheckPrint1 && isCheckPrint){ + uni.redirectTo({ + url: '/pages/pointPutawayJob/index?number=' + that.jobContent.number + + '&data=' + + encodeURIComponent(JSON.stringify(dataParams)) + }) + } + } }) }, 2000) diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue index 9c903838..a55c07e8 100644 --- a/src/pages/putaway/job/putawayJob.vue +++ b/src/pages/putaway/job/putawayJob.vue @@ -56,9 +56,7 @@ import putawayJobListPopup from '@/pages/putaway/coms/putawayJobListPopup.vue' import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue' import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue" - import { - Exception - } from 'sass'; + export default { name: 'Putaway',