From dd52c0dd2ed4bf4ec31dfa5ec46219a6eacd08c2 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Tue, 2 Jan 2024 16:58:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/balance/balanceDetailPopup.vue | 146 ++++-------------- mycomponents/detail/detailItemInfo.vue | 6 +- mycomponents/detail/detailPackageInfo.vue | 30 ++-- .../detail/recordDetailCommonInfo.vue | 26 ++-- mycomponents/detail/recordDetailPopup.vue | 90 +++++------ mycomponents/record/recordComDetailCard.vue | 11 +- pages/inspect/job/inspectDetail.vue | 42 ++--- pages/purchaseReturn/record/returnRecord.vue | 14 +- 8 files changed, 139 insertions(+), 226 deletions(-) diff --git a/mycomponents/balance/balanceDetailPopup.vue b/mycomponents/balance/balanceDetailPopup.vue index 70393770..61947b28 100644 --- a/mycomponents/balance/balanceDetailPopup.vue +++ b/mycomponents/balance/balanceDetailPopup.vue @@ -1,7 +1,9 @@ diff --git a/mycomponents/detail/detailItemInfo.vue b/mycomponents/detail/detailItemInfo.vue index ad2f2849..dfbaf508 100644 --- a/mycomponents/detail/detailItemInfo.vue +++ b/mycomponents/detail/detailItemInfo.vue @@ -10,11 +10,7 @@ 数量 : - {{dataContent.qty}} - - - 计量单位 : - {{getUnitInfo(dataContent.uom)}} + {{dataContent.qty}}{{getUnitInfo(dataContent.uom)}} diff --git a/mycomponents/detail/detailPackageInfo.vue b/mycomponents/detail/detailPackageInfo.vue index ea844ea5..52c2e5c7 100644 --- a/mycomponents/detail/detailPackageInfo.vue +++ b/mycomponents/detail/detailPackageInfo.vue @@ -1,30 +1,28 @@ diff --git a/mycomponents/detail/recordDetailCommonInfo.vue b/mycomponents/detail/recordDetailCommonInfo.vue index ba8c253d..ef7a547f 100644 --- a/mycomponents/detail/recordDetailCommonInfo.vue +++ b/mycomponents/detail/recordDetailCommonInfo.vue @@ -1,13 +1,17 @@ diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue index 7ac5883d..5f8cf4e4 100644 --- a/mycomponents/record/recordComDetailCard.vue +++ b/mycomponents/record/recordComDetailCard.vue @@ -25,8 +25,8 @@ - - + + @@ -41,6 +41,7 @@ import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue' import comMessage from '@/mycomponents/common/comMessage.vue' import location from '@/mycomponents/balance/location.vue' + import recordDetailPopup from '@/mycomponents/detail/recordDetailPopup.vue' import { getDetailOption, @@ -56,7 +57,8 @@ balanceDetailPopup, purchaseLabel, comMessage, - location + location, + recordDetailPopup // winListHint }, props: { @@ -153,8 +155,7 @@ detail(item) { this.showItem = item; - this.$refs.balanceDetailPopup.openPopup(item); - // console.log(JSON.stringify(item)); + this.$refs.recordDetailPopup.openPopup(item); }, remove(item, index) { diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue index e59a139f..1021ce30 100644 --- a/pages/inspect/job/inspectDetail.vue +++ b/pages/inspect/job/inspectDetail.vue @@ -105,7 +105,7 @@ this.failedQty = option.failedQty; this.crackQty = option.crackQty; - if (this.id != undefined ) { + if (this.id != undefined) { // //新建的任务自动接收 this.getDetail(); } @@ -136,7 +136,7 @@ } }, - + onPullDownRefresh() { this.getDetail(); @@ -147,29 +147,29 @@ }, methods: { - deleteFileById(id){ - deleteFileById(id).then(res=>{ - - }) - + deleteFileById(id) { + deleteFileById(id).then(res => { + + }) + }, - getFileList(id){ + getFileList(id) { getFileList("jobInspectDetail", id).then(res => { - if(res.data){ - res.data.forEach(res=>{ + if (res.data) { + res.data.forEach(res => { this.deleteFileById(res.id) }) } }) }, - - clearPicList(subList){ - subList.forEach(item=>{ + + clearPicList(subList) { + subList.forEach(item => { this.getFileList(item.id) }) }, - - + + //接收 receive(callback) { uni.showLoading({ @@ -309,8 +309,9 @@ let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { - if(this.jobContent.allowModifyInventoryStatus=="TRUE"){ - this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + if (this.jobContent.allowModifyInventoryStatus == "TRUE") { + this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + + itemStatus + ']不一致,是否继续检验?', res => { if (res) { itemDetail.scaned = true; @@ -321,13 +322,14 @@ this.scanPopupGetFocus(); } }); - }else { - this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + } else { + this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + + itemStatus + ']不一致,不允许转移!', res => { this.scanPopupGetFocus(); }); } - + } else { itemDetail.scaned = true; itemDetail.balance = result.balance; diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue index 1303806f..58b1dafd 100644 --- a/pages/purchaseReturn/record/returnRecord.vue +++ b/pages/purchaseReturn/record/returnRecord.vue @@ -5,6 +5,9 @@ + + 供应商代码：{{supplierCode}} + 采购订单：{{poNumber}} @@ -93,6 +96,7 @@ fromlocationTypeList: [], tolocationTypeList: [], businessType: {}, //业务类型 + supplierCode: '', //供应商代码 poNumber: '', fromType: "", dataContent: {} @@ -149,7 +153,15 @@ }, getScanResult(result) { - debugger; + if (this.supplierCode == '') { + this.supplierCode = result.label.supplierCode; + } else { + if (this.supplierCode != result.label.supplierCode) { + this.showErrorMessage('扫描的供应商代码[' + result.label.supplierCode + ']与默认供应商代码[' + this.poNumber + ']不一致') + return; + } + } + if (this.poNumber == '') { this.poNumber = result.label.poNumber; } else {