From 1ec30743b1ae6c1a23d231d16c4304b81e05aaae Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 2 Apr 2024 19:12:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryMove/coms/comMoveRecord.vue | 24 +++++++++---------- .../job/fgProductReceiptDetail.vue | 11 +++++++-- .../job/fgProductReceiptJob.vue | 22 ++++++++++++++--- .../productReceipt/job/productReceiptJob.vue | 20 ++++++++++++++++ .../productReceipt/job/scrapReceiptJob.vue | 11 +++++++-- .../job/semiProductReceiptJob.vue | 17 +++++++++++-- 6 files changed, 84 insertions(+), 21 deletions(-) diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index ef6e69c2..42ba0c14 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -337,18 +337,18 @@ this.managementList = res.list; var params = this.setParams() console.log("提交" + JSON.stringify(params)) - inventoryMoveRecordSubmit(params).then(res => { - uni.hideLoading() - if (res.data) { - this.showCommitSuccessMessage("提交成功
生成" + this.title + "
" + - res.data) - } else { - this.showErrorMessage("提交失败[" + res.msg + "]") - } - }).catch(error => { - uni.hideLoading() - this.showErrorMessage(error) - }) + // inventoryMoveRecordSubmit(params).then(res => { + // uni.hideLoading() + // if (res.data) { + // this.showCommitSuccessMessage("提交成功
生成" + this.title + "
" + + // res.data) + // } else { + // this.showErrorMessage("提交失败[" + res.msg + "]") + // } + // }).catch(error => { + // uni.hideLoading() + // this.showErrorMessage(error) + // }) } else { uni.hideLoading(); diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue index 53a6c3a3..c0661eed 100644 --- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue @@ -211,6 +211,7 @@ result.uom = item.uom; if (item.subList.length > 0) { let subItem = item.subList[0]; + subItem.scaned=true; if (subItem.fgList == undefined) { subItem.fgList = []; } @@ -365,7 +366,6 @@ setParams() { var subList = [] var creator = this.$store.state.user.id - this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { @@ -376,6 +376,13 @@ detail.toContainerNumber = ''; detail.toInventoryStatus = detail.inventoryStatus detail.toLocationCode = this.toLocationCode + if(detail.fgList){ + detail.fgList.forEach(res=>{ + res.outsideItemCode =res.itemCode + res.outsideProduceDate = res.productDate + res.outsideSerialNumber =res.order + }) + } subList.push(detail) } }) @@ -429,7 +436,7 @@ showQuestionMessage(hint,callback){ this.$refs.comMessage.showQuestionMessage(hint, res => { if (res) { - callback() + callback(true) } }); } diff --git a/src/pages/productReceipt/job/fgProductReceiptJob.vue b/src/pages/productReceipt/job/fgProductReceiptJob.vue index 1c674ad6..5858e690 100644 --- a/src/pages/productReceipt/job/fgProductReceiptJob.vue +++ b/src/pages/productReceipt/job/fgProductReceiptJob.vue @@ -17,11 +17,27 @@ }; }, - - mounted() { - this.$refs.productreceiptjob.getList("refresh"); + onShow() { + if(this.$refs.productreceiptjob!=undefined){ + this.$refs.productreceiptjob.refresh(); + } + }, + onPullDownRefresh() { + this.$refs.productreceiptjob.refresh(); + }, + + onReachBottom() { + this.$refs.productreceiptjob.onReach(); + }, + onNavigationBarButtonTap(e) { + if (e.index === 0) { + this.$refs.productreceiptjob.toHome(); + } else if (e.index == 1) { + this.$refs.productreceiptjob.openFilter(); + } + }, methods: { } diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index f42615e5..a19c48b1 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -82,6 +82,11 @@ this.detailOptions = getDetailOption(); this.detailGiveupOptions = getDetailGiveupOption(); }, + + + mounted() { + this.getList('refresh'); + }, onReachBottom() { //避免多次触发 @@ -116,6 +121,9 @@ }, methods: { + refresh(){ + this.getList('refresh'); + }, getList(type) { let that = this; uni.showLoading({ @@ -308,6 +316,18 @@ } }); }, + openFilter() { + this.$refs.filter.openFilter(); + }, + toHome() { + goHome() + }, + onReach(){ + if (this.loadingType == 'loading' || this.loadingType == 'nomore') { + return; + } + this.getList("more"); + } } } diff --git a/src/pages/productReceipt/job/scrapReceiptJob.vue b/src/pages/productReceipt/job/scrapReceiptJob.vue index ef0ed0e2..9591e077 100644 --- a/src/pages/productReceipt/job/scrapReceiptJob.vue +++ b/src/pages/productReceipt/job/scrapReceiptJob.vue @@ -18,8 +18,15 @@ }; }, - mounted() { - this.$refs.productreceiptjob.getList("refresh"); + onPullDownRefresh() { + this.$refs.productreceiptjob.refresh(); + }, + onNavigationBarButtonTap(e) { + if (e.index === 0) { + this.$refs.productreceiptjob.toHome(); + } else if (e.index == 1) { + this.$refs.productreceiptjob.openFilter(); + } }, methods: { diff --git a/src/pages/productReceipt/job/semiProductReceiptJob.vue b/src/pages/productReceipt/job/semiProductReceiptJob.vue index 87dcbb32..5d2b70a2 100644 --- a/src/pages/productReceipt/job/semiProductReceiptJob.vue +++ b/src/pages/productReceipt/job/semiProductReceiptJob.vue @@ -17,9 +17,22 @@ }; }, + + onShow() { + if(this.$refs.productreceiptjob!=undefined){ + this.$refs.productreceiptjob.refresh(); + } + }, - mounted() { - this.$refs.productreceiptjob.getList("refresh"); + onPullDownRefresh() { + this.$refs.productreceiptjob.refresh(); + }, + onNavigationBarButtonTap(e) { + if (e.index === 0) { + this.$refs.productreceiptjob.toHome(); + } else if (e.index == 1) { + this.$refs.productreceiptjob.openFilter(); + } }, methods: {