From 50a7991538a3b0ed283fd61e74b24dda3b2274c0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 8 Oct 2024 15:52:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1=E7=AE=B1?= =?UTF-8?q?=E7=A0=81=E6=94=B9=E6=89=B9=E6=AC=A1=E6=96=B0=E5=A2=9E=E4=BA=86?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=BB=84=E4=BB=B6=E5=92=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?2024/9/18=2019:41:50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../balance/recommendBalanceBatch.vue | 77 ++ src/mycomponents/item/itemQty.vue | 2 +- src/mycomponents/qty/qtyEdit.vue | 161 ++++ src/pages.json | 9 + .../coms/comRepleishDetailCardBatch.vue | 123 ++- .../coms/comScanReplishPackBatch.vue | 762 ++++++++++++++++++ src/pages/repleinsh/job/repleinshDetail.vue | 69 +- .../repleinsh/job/repleinshDetailBatch.vue | 504 ++++++++++++ src/pages/repleinsh/job/repleinshJob.vue | 34 +- 9 files changed, 1608 insertions(+), 133 deletions(-) create mode 100644 src/mycomponents/balance/recommendBalanceBatch.vue create mode 100644 src/mycomponents/qty/qtyEdit.vue create mode 100644 src/pages/repleinsh/coms/comScanReplishPackBatch.vue create mode 100644 src/pages/repleinsh/job/repleinshDetailBatch.vue diff --git a/src/mycomponents/balance/recommendBalanceBatch.vue b/src/mycomponents/balance/recommendBalanceBatch.vue new file mode 100644 index 00000000..10acdfd1 --- /dev/null +++ b/src/mycomponents/balance/recommendBalanceBatch.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/mycomponents/item/itemQty.vue b/src/mycomponents/item/itemQty.vue index eb37f9e8..590746f8 100644 --- a/src/mycomponents/item/itemQty.vue +++ b/src/mycomponents/item/itemQty.vue @@ -1,5 +1,5 @@ @@ -60,18 +25,21 @@ import itemQty from '@/mycomponents/item/itemQty.vue' import recommend from '@/mycomponents/recommend/recommend.vue' import recommendBalance from '@/mycomponents/balance/recommendBalance.vue' + import recommendBalanceBatch from '@/mycomponents/balance/recommendBalanceBatch.vue' import handleBalance from '@/mycomponents/balance/handleBalance.vue' import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue' import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue' import requiredLocation from '@/mycomponents/location/requiredLocation.vue' import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue' + import qtyEdit from '@/mycomponents/qty/qtyEdit.vue' import location from '@/mycomponents/balance/location.vue' import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue' import { getDetailOption, - getEditRemoveOption, - getRemoveOption + getPurchaseReceiptOption, + getRemoveOption, + getEditRemoveOption } from '@/common/array.js'; export default { @@ -85,7 +53,9 @@ requiredLocation, balanceQtyEdit, location, - detailInfoPopup + detailInfoPopup, + recommendBalanceBatch, + qtyEdit }, props: { dataContent: { @@ -96,6 +66,10 @@ type: Object, default: {} }, + isEdit: { + type: Boolean, + default: true + }, }, watch: { @@ -109,60 +83,57 @@ batchItem: {}, detailOptions: [], scanOptions: [], - removeOptions:[] + + options: [], + removeOptions: [], + editAndRemoveOptions: [] } }, mounted() { - this.detailOptions = getDetailOption(); - this.scanOptions = getEditRemoveOption(); - this.removeOptions = getRemoveOption() + this.removeOptions = getRemoveOption(); + this.editAndRemoveOptions = getEditRemoveOption() }, methods: { resizeCollapse() { - this.$nextTick(() => { - this.$refs.collapse.forEach(r => { - r.childrens.forEach(i => { - i.init(); - }) - r.resize(); - }) - }); + }, - swipeClick(e, batch, record, index) { + swipeClick(e, item, index) { if (e.content.text == "编辑") { - this.edit(batch, record) + this.edit(item) } else if (e.content.text == "移除") { - this.remove(batch, record, index) + this.remove(item, index) } }, - edit(batch, record) { + edit(item) { + console.log(item) let that = this; - that.editItem = record; - that.batchItem = batch; - record.balance.balanceQty = record.balance.qty; - that.$refs.balanceQtyEdit.openEditPopup(record.balance, record.qty); + that.editItem = item; + // that.batchItem = batch; + // record.balance.balanceQty = record.balance.qty; + that.$refs.balanceQtyEdit.openEditPopup(item); }, detail(item) { this.showItem = item; this.$refs.receiptHint.openScanPopup() }, - remove(batch, record, index) { + remove(item) { this.$refs.message.showQuestionMessage("确定移除扫描信息?", res => { if (res) { - batch.Records.splice(index, 1); - this.resizeCollapse(); - this.$emit('updateData', record) + item.handleQty = 0; + item.scaned = false ; + // this.$emit('updateData', record) } }); }, confirm(val) { - this.editItem.qty = val; + console.log(val) + this.editItem.handleQty = val; this.$emit('updateData', this.editItem) // let qty = 0; // this.batchItem.Records.forEach(r => { @@ -175,4 +146,4 @@ + \ No newline at end of file diff --git a/src/pages/repleinsh/coms/comScanReplishPackBatch.vue b/src/pages/repleinsh/coms/comScanReplishPackBatch.vue new file mode 100644 index 00000000..8587f364 --- /dev/null +++ b/src/pages/repleinsh/coms/comScanReplishPackBatch.vue @@ -0,0 +1,762 @@ + + + + + \ No newline at end of file diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index 4dcba9aa..cde4cbd5 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -14,10 +14,8 @@ - + @updateData='updateData'> @@ -78,7 +76,6 @@ import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue' import winScanButton from '@/mycomponents/scan/winScanButton.vue' import comRepleishDetailCard from '@/pages/repleinsh/coms/comRepleishDetailCard.vue' - import comRepleishDetailCardBatch from '@/pages/repleinsh/coms/comRepleishDetailCardBatch.vue' import comScanReplishPack from '@/pages/repleinsh/coms/comScanReplishPack.vue' import jobTop from '@/mycomponents/job/jobTop.vue' @@ -91,7 +88,6 @@ comScanReplishPack, requiredLocation, jobTop, - comRepleishDetailCardBatch, }, data() { return { @@ -105,8 +101,6 @@ toLocationAreaTypeList: [], jobStatus: "", scanMessage: "", - managementList:[], - managementType:'' }; }, @@ -202,19 +196,7 @@ this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this .jobContent, that.scanMessage); } - //获取管理模式，封装参数 - var itemCodes = [] - this.detailSource.forEach(item => { - itemCodes.push(item.itemCode) - item.scaned = false - }) - await getManagementPrecisions(itemCodes, that.toLocationCode, res => { - if (res.success) { - this.managementList = res.list; - this.managementType = this.managementList.some(item => item.ManagementPrecision == - 'BY_BATCH') ? 'BY_BATCH' : '' - } - }) + let timer = setTimeout(r => { that.resizeCollapse(); if (timer) { @@ -353,32 +335,26 @@ itemCodes.push(cur.itemCode) }) }) - //获取管理模式，封装参数 - getManagementPrecisions(itemCodes, this.toLocationCode, res => { - if (res.success) { - this.managementList = res.list; - this.managementType = this.managementList.some(item => item.ManagementPrecision == - 'BY_BATCH') ? 'BY_BATCH' : '' - var params = this.setParams() - if (!params.subList || params.subList.length == 0) { - uni.hideLoading() - this.showErrorMessage("请扫描您需要提交的补料任务") - return - } - console.log("提交参数", JSON.stringify(params)); - repleinshJobSubmit(params).then(res => { - uni.hideLoading() - if (res.data) { - this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data) - } else { - this.showErrorMessage("提交失败[" + res.msg + "]") - } - }).catch(error => { - uni.hideLoading() - this.showErrorMessage(error) - }) + + var params = this.setParams() + if (!params.subList || params.subList.length == 0) { + uni.hideLoading() + this.showErrorMessage("请扫描您需要提交的补料任务") + return + } + console.log("提交参数", JSON.stringify(params)); + repleinshJobSubmit(params).then(res => { + uni.hideLoading() + if (res.data) { + this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data) + } else { + this.showErrorMessage("提交失败[" + res.msg + "]") } + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) }) + }, setParams() { @@ -411,11 +387,6 @@ record.toPackingNumber = r.packingNumber; record.toPackUnit = r.packUnit; record.toBatch = r.batch; - if(this.managementType == 'BY_BATCH'){ - record.toPackingNumber = ''; - record.packingNumber = ''; - record.fromPackingNumber = ''; - } subItem.recordList.push(record); }) commitSubList.push(deepCopyData(subItem)); diff --git a/src/pages/repleinsh/job/repleinshDetailBatch.vue b/src/pages/repleinsh/job/repleinshDetailBatch.vue new file mode 100644 index 00000000..e5c876f9 --- /dev/null +++ b/src/pages/repleinsh/job/repleinshDetailBatch.vue @@ -0,0 +1,504 @@ + + + + + \ No newline at end of file diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index 1487f1f2..6b0d5da0 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -63,6 +63,10 @@ planRefreshTime, repleinshJobFilter } from '@/common/config.js'; + + import { + getManagementPrecisions + } from '@/common/balance.js'; import comEmptyView from '@/mycomponents/common/comEmptyView.vue' import jobFilter from '@/mycomponents/job/jobFilter.vue' @@ -313,11 +317,11 @@ openJobDetail(item, scanMessage = '') { - this.getJobInfoByNumber(item.number,scanMessage ) + this.getJobInfoByNumber(item.number,scanMessage, item) }, - getJobInfoByNumber(number,scanMessage){ + getJobInfoByNumber(number,scanMessage, item){ let that = this; uni.showLoading({ title: "加载中....", @@ -358,11 +362,27 @@ return; } - - uni.navigateTo({ - url: './repleinshDetail?id=' + result.masterId + '&status=' + result.status + '&scanMessage=' + - scanMessage + '&title=' + this.title - }); + getManagementPrecisions([item.itemCode], item.fromLocationCode, ret => { + if (ret.success) { + this.managementList = ret.list; + this.managementType = this.managementList.some(cur => cur.ManagementPrecision == 'BY_BATCH') ? + 'BY_BATCH' : '' + this.managementType ='BY_BATCH' + if (this.managementType == 'BY_BATCH') { + uni.navigateTo({ + url: './repleinshDetailBatch?id=' + result.masterId + '&status=' + result.status + + '&scanMessage=' + + scanMessage + '&title=' + this.title + }); + } else { + uni.navigateTo({ + url: './repleinshDetail?id=' + result.masterId + '&status=' + result.status + + '&scanMessage=' + + scanMessage + '&title=' + this.title + }); + } + } + }) this.scanMessage = "" } }).catch(error => {