diff --git a/src/api/wms/sale-out-platform.js b/src/api/wms/sale-out-platform.js index ee2ece7..92a0f6e 100644 --- a/src/api/wms/sale-out-platform.js +++ b/src/api/wms/sale-out-platform.js @@ -40,6 +40,22 @@ export function attachmentPrint(obj) { }) } +export function showAttachmentFile(obj) { + return request({ + url: mom_wms('/picking/showAttachmentFile'), + method: 'post', + data: obj + }) +} + +export function printByFilePath(obj) { + return request({ + url: mom_wms('/picking/printByFilePath'), + method: 'post', + data: obj + }) +} + export function pickingPost(documentNo) { return request({ url: `/wms/picking/post`, diff --git a/src/views/wms/sale-out-platform/index.vue b/src/views/wms/sale-out-platform/index.vue index d4abe4e..1d0ccc2 100644 --- a/src/views/wms/sale-out-platform/index.vue +++ b/src/views/wms/sale-out-platform/index.vue @@ -7,6 +7,19 @@ @inputDialogSelected="inputCallBack($event,productionRequisitionDialog)" ref="documentDialog"> + + + + + + + + + + 拣配单打印 送货单打印 - 要货附件打印 - 出库附件打印 + 要货附件打印 + 出库附件打印 冲销 @@ -138,7 +151,7 @@ import { selectSaleOutDetail, saleOutPostCancel, pickingPostCancel, - pickingPrintA4, deliveryPrint, attachmentPrint + pickingPrintA4, deliveryPrint, attachmentPrint, showAttachmentFile } from '@/api/wms/sale-out-platform'; import { fetchListWithClose } from "@/api/wms/picking"; import { @@ -173,6 +186,8 @@ import { fetchListWithClose } from "@/api/wms/picking"; }, site: getStore({name: 'tenantId'}), formObj: {}, + dnOrderFileList: [], + dnOrderFileDialogVisible: false, initData: { suggestSize: 10 }, @@ -559,34 +574,29 @@ import { fetchListWithClose } from "@/api/wms/picking"; this.doRetrieve(); }, - pickingPrintA4() { + printAttachAction(filePath){ let me = this; - if (me.saleOutListSelection.length > 0) { - for (let i = 0; i < me.saleOutListSelection.length; i++) { - let row = me.saleOutListSelection[i]; - if (row.pickStatus !== 'SUBMIT' && row.pickStatus !== 'POST') { - return me.$message.error("第" + (i + 1) + "行拣货未提交且未过账不允许打印标签"); - } + let param = { + printAttachmentType: filePath, + }; + showLoading(); + printByFilePath(param).then(res => { + hideLoading(); + me.dnOrderFileDialogVisible = false; + // 显示打印文件流 + if (!isBlank(res.data.data)) { + window.open(res.data.data); + } else { + this.$message.error("查找打印文件失败") } - let param = { - documentNo: me.formObj.documentNo, - printer: me.printerA4, - seqList: me.saleOutListSelection.map(o => o.seq), - }; - showLoading(); - pickingPrintA4(param).then(res => { - hideLoading(); - me.$message.success("打印成功"); - }).catch(() => { - hideLoading(); - }); - } else { - me.$message.error("请选择要打印的行项目"); - } + }).catch(() => { + hideLoading(); + }); }, - printAttachAction(fieldType){ + printAttachShow(fieldType){ let me = this; + me.dnOrderFileList = []; if(isBlank(me.formObj.externalDocumentNo)){ me.$message.error("DN单号不能为空"); return; @@ -596,14 +606,10 @@ import { fetchListWithClose } from "@/api/wms/picking"; printAttachmentType: fieldType, }; showLoading(); - attachmentPrint(param).then(res => { + showAttachmentFile(param).then(res => { hideLoading(); - // 显示打印文件流 - if (!isBlank(res.data.data)) { - window.open(res.data.data); - } else { - this.$message.error("查找打印文件失败") - } + me.dnOrderFileDialogVisible = true; + me.dnOrderFileList = res.data.data; }).catch(() => { hideLoading(); });