From d8405d2690eeb70a6c98e4eb2e7646b18dfc79fd Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 13 Dec 2023 16:52:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request2.js | 2 +- pages.json | 9 + pages/issue/request/issueRequestCreate.vue | 3 +- .../coms/comReturnRequestCreator.vue | 199 ++++++---- .../coms/comReturnRequestInfo.vue | 4 +- .../request/requestDetail.vue | 14 +- .../request/returnRequestCreate.vue | 49 ++- pages/purchaseReturn/record/returnRecord.vue | 4 +- .../purchaseReturn/request/returnRequest.vue | 2 +- .../request/returnRequestCreate.vue | 356 ++++++++++++++++++ 10 files changed, 549 insertions(+), 93 deletions(-) create mode 100644 pages/purchaseReturn/request/returnRequestCreate.vue diff --git a/api/request2.js b/api/request2.js index ca0798db..55516fce 100644 --- a/api/request2.js +++ b/api/request2.js @@ -683,7 +683,7 @@ export function purchaseReturnRequestHandle(id) { * 采购退货申请 提交 * @param {*} params */ -export function purchaseReturnRequestSubmit(params) { +export function purchaseReturnRequestCreate(params) { return request({ url: baseApi + "/wms/purchasereturn-request-main/create", method: "post", diff --git a/pages.json b/pages.json index 3e2f6fd0..df594bf3 100644 --- a/pages.json +++ b/pages.json @@ -111,6 +111,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/purchaseReturn/request/returnRequestCreate", + "style": { + "navigationBarTitleText": "采购退货申请创建", + "enablePullDownRefresh": true + } + }, { "path": "pages/purchaseReturn/job/returnJob", @@ -149,6 +156,8 @@ // } } }, + + { "path": "pages/purchaseReceipt/job/receiptJob", "style": { diff --git a/pages/issue/request/issueRequestCreate.vue b/pages/issue/request/issueRequestCreate.vue index b547a751..e222eee4 100644 --- a/pages/issue/request/issueRequestCreate.vue +++ b/pages/issue/request/issueRequestCreate.vue @@ -36,7 +36,7 @@ goHome, updateTitle, getRemoveOption, - getISODateTime + getCurrDateOneMonthsTimes } from '@/common/basic.js'; import { @@ -150,6 +150,7 @@ setParams() { + this.detailSource.dueTime = getCurrDateOneMonthsTimes(); return this.detailSource }, submit() { diff --git a/pages/productionReturn/coms/comReturnRequestCreator.vue b/pages/productionReturn/coms/comReturnRequestCreator.vue index f1f0bffc..07e0a008 100644 --- a/pages/productionReturn/coms/comReturnRequestCreator.vue +++ b/pages/productionReturn/coms/comReturnRequestCreator.vue @@ -1,88 +1,159 @@ diff --git a/pages/productionReturn/coms/comReturnRequestInfo.vue b/pages/productionReturn/coms/comReturnRequestInfo.vue index fbb64a31..a7b40d91 100644 --- a/pages/productionReturn/coms/comReturnRequestInfo.vue +++ b/pages/productionReturn/coms/comReturnRequestInfo.vue @@ -14,8 +14,8 @@ {{ dataContent.workStationCode }} - 原材料库 - {{ dataContent.toLocationCode}} + 来源库位 + {{ dataContent.fromLocationCode}} diff --git a/pages/productionReturn/request/requestDetail.vue b/pages/productionReturn/request/requestDetail.vue index 1acd47b1..262f5f83 100644 --- a/pages/productionReturn/request/requestDetail.vue +++ b/pages/productionReturn/request/requestDetail.vue @@ -1,5 +1,9 @@ + + diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue index 6c67be4f..1425e40d 100644 --- a/pages/productReceipt/job/productReceiptDetail.vue +++ b/pages/productReceipt/job/productReceiptDetail.vue @@ -13,10 +13,10 @@ - - + @@ -37,8 +37,7 @@ - - + @@ -56,7 +55,6 @@ } from '@/api/request2.js'; import { goHome, - getCurrDateTime, navigateBack, getPackingNumberAndBatch, } from '@/common/basic.js'; @@ -79,8 +77,9 @@ import comMessage from '@/mycomponents/common/comMessage.vue' import winScanPack from "@/mycomponents/scan/winScanPack.vue" import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" - import detailInfoPopup from '@/pages/productReceipt/coms/detailInfoPopup.vue' import jobTop from '@/mycomponents/job/jobTop.vue' + import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue" + export default { name: 'receipt_detail', @@ -90,8 +89,8 @@ requiredLocation, winScanPack, comMessage, - detailInfoPopup, - jobTop + jobTop, + comProductDetailCard }, data() { return { @@ -104,10 +103,8 @@ jobContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - fromLocationTypeList: [], toLocationTypeList: [], toLocationInfo: {}, - businessTypeInfo: {}, managementList: [] }; @@ -116,16 +113,15 @@ this.id = option.id; if (this.id != undefined) { //新建的任务自动接收 - // if (option.status == "JOB_PENDING") { - // this.receive((callback => { - // this.received = true; - // this.getDetail(); - // })); - // } else { - // this.getDetail(); - // } - - this.getDetail(); + if (option.status == "1") { + this.receive((callback => { + this.received = true; + this.getDetail(); + })); + } else { + this.getDetail(); + } + } }, //返回首页 @@ -189,7 +185,6 @@ that.jobContent = res.data; that.subList = res.data.subList; that.toLocationCode = that.subList[0].toLocationCode - that.fromLocationTypeList = getDirectoryItemArray(that.jobContent.fromLocationTypes); that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.detailSource = getDataSource(that.subList) } else { @@ -226,19 +221,15 @@ itemDetail.handleQty = Number(result.label.qty); itemDetail.toLocationCode = this.toLocationCode; itemDetail.labelQty = Number(result.label.qty); - this.calcHandleQty(); + calcHandleQty(this.detailSource); + this.continueScan() + this.$forceUpdate() } } } }, - calcHandleQty() { - calcHandleQty(this.detailSource) - this.continueScan(); - this.$forceUpdate(); - }, - //继续扫描 continueScan() { this.scanCount = getScanCount(this.subList); @@ -251,12 +242,9 @@ updateData() { - this.calcHandleQty(); + calcHandleQty(this.detailSource); }, - openDetail(item) { - this.$refs.detailInfoPopup.openPopup(item) - }, openScanPopup() { this.$refs.scanPopup.openScanPopup(); @@ -342,17 +330,17 @@ this.managementList = res.list; var params = this.setParams(); console.log("提交参数",JSON.stringify(params)); - // productReceiptJobsubmit(params).then(res => { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成制品收货记录" + res.data, ) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) + productReceiptJobsubmit(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功
生成制品收货记录
" + res.data, ) + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) } else { uni.hideLoading(); this.showErrorMessage(res.message); @@ -369,8 +357,11 @@ if (detail.scaned) { var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, detail.packingNumber, detail.batch); - detail.toPackingNumber =info.packingNumber; - detail.toBatch =info.batch; + detail.toPackingNumber = info.packingNumber; + detail.toBatch = info.batch; + detail.toContainerNumber = ''; + detail.toInventoryStatus =detail.inventoryStatus + detail.toLocationCode = this.toLocationCode subList.push(detail) } }) @@ -382,19 +373,19 @@ scanPopupGetFocus() { - this.$refs.scanPopup.packGetFocus(); + this.$refs.scanPopup.getfocus(); }, scanPopupLoseFocus() { - this.$refs.scanPopup.packLoseFocus(); + this.$refs.scanPopup.losefocus(); }, showMessage(message) { setTimeout(r => { - // this.scanPopupLoseFocus(); + this.scanPopupLoseFocus(); this.$refs.comMessage.showMessage(message, res => { if (res) { - // this.scanPopupGetFocus(); + this.scanPopupGetFocus(); } }); }) diff --git a/pages/productReceipt/job/productReceiptJob.vue b/pages/productReceipt/job/productReceiptJob.vue index 245dedb1..d2730f53 100644 --- a/pages/productReceipt/job/productReceiptJob.vue +++ b/pages/productReceipt/job/productReceiptJob.vue @@ -128,7 +128,7 @@ this.loadingType = "loading"; if (type === "refresh") { this.pageNo = 1; - this.receiptList = []; + this.jobList = []; } var filters = [] if (this.checkedToday) { diff --git a/pages/productionReturn/request/returnRequestCreate.vue b/pages/productionReturn/request/returnRequestCreate.vue index 98747514..0c8d5cf4 100644 --- a/pages/productionReturn/request/returnRequestCreate.vue +++ b/pages/productionReturn/request/returnRequestCreate.vue @@ -7,7 +7,6 @@ - @@ -183,17 +182,17 @@ }); var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - // productionReturnRequestCreate(params).then(res => { - // uni.hideLoading() - // if (res.data) { - // this.showCommitSuccessMessage("提交成功
生成发料申请" + res.data) - // } else { - // this.showErrorMessage("提交失败[" + res.msg + "]") - // } - // }).catch(error => { - // uni.hideLoading() - // this.showErrorMessage(error) - // }) + productionReturnRequestCreate(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功
生成发料申请" + res.data) + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") + } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) }, showCommitSuccessMessage(hint) { this.$refs.comMessage.showSuccessMessage(hint, res => { diff --git a/pages/scrap/coms/comScrapDetailCard.vue b/pages/scrap/coms/comScrapDetailCard.vue index d0ab40f2..4f376664 100644 --- a/pages/scrap/coms/comScrapDetailCard.vue +++ b/pages/scrap/coms/comScrapDetailCard.vue @@ -104,6 +104,7 @@ detail(item) { this.showItem = item; + console.log("提交参数", JSON.stringify(item)); this.$refs.jobDetailPopup.openPopup(item) }, remove(item) { @@ -111,15 +112,13 @@ res => { if (res) { item.scaned = false - item.record = {} - // item.record.qty = 0; this.$forceUpdate() this.$emit('remove', item) } }); }, confirm(qty) { - this.editItem.record.qty = qty; + this.editItem.handleQty = qty; this.$emit('updateData') } } diff --git a/pages/scrap/job/scrapJobDetail.vue b/pages/scrap/job/scrapJobDetail.vue index 6eb893ec..c8f504fe 100644 --- a/pages/scrap/job/scrapJobDetail.vue +++ b/pages/scrap/job/scrapJobDetail.vue @@ -385,11 +385,11 @@ }, scanPopupGetFocus() { - this.$refs.scanPopup.getfocus(); + this.$refs.scanPopup.packGetFocus(); }, scanPopupLoseFocus() { - this.$refs.scanPopup.losefocus(); + this.$refs.scanPopup.packLoseFocus(); }, showCommitSuccessMessage(hint) {