From cab6698bc541646e6069eadccb942176444e79b1 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Tue, 2 Jan 2024 14:31:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/purchaseReceipt/coms/comReceiptDetailCard.vue | 1 - pages/purchaseReceipt/job/receiptDetail.vue | 1 - 2 files changed, 2 deletions(-) diff --git a/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/pages/purchaseReceipt/coms/comReceiptDetailCard.vue index 07b4fb5f..558edb41 100644 --- a/pages/purchaseReceipt/coms/comReceiptDetailCard.vue +++ b/pages/purchaseReceipt/coms/comReceiptDetailCard.vue @@ -13,7 +13,6 @@ - diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue index f3da197b..6fcf56ed 100644 --- a/pages/purchaseReceipt/job/receiptDetail.vue +++ b/pages/purchaseReceipt/job/receiptDetail.vue @@ -17,7 +17,6 @@ @remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'> - From b3fa9e852ce7da2ce8b51258cf385cfc6716be94 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Tue, 2 Jan 2024 14:46:32 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/location/toLocation.vue | 55 +++++++++++++++++++ pages/purchaseReturn/record/returnRecord.vue | 20 +++++-- .../request/returnRequestCreate.vue | 6 +- 3 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 mycomponents/location/toLocation.vue diff --git a/mycomponents/location/toLocation.vue b/mycomponents/location/toLocation.vue new file mode 100644 index 00000000..b2286bf3 --- /dev/null +++ b/mycomponents/location/toLocation.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue index f79ec716..32cb1766 100644 --- a/pages/purchaseReturn/record/returnRecord.vue +++ b/pages/purchaseReturn/record/returnRecord.vue @@ -4,7 +4,18 @@ - + + + + + 采购订单：{{poNumber}} + + + + + @@ -143,11 +154,12 @@ }, getScanResult(result) { + debugger; if (this.poNumber == '') { - this.poNumber = result.label.order; + this.poNumber = result.label.poNumber; } else { - if (this.poNumber != result.label.order) { - this.showErrorMessage('扫描的采购订单号[' + result.label.order + ']与默认采购订单号[' + this.poNumber + ']不一致') + if (this.poNumber != result.label.poNumber) { + this.showErrorMessage('扫描的采购订单号[' + result.label.poNumber + ']与默认采购订单号[' + this.poNumber + ']不一致') return; } } diff --git a/pages/purchaseReturn/request/returnRequestCreate.vue b/pages/purchaseReturn/request/returnRequestCreate.vue index 986c8772..dbc33c07 100644 --- a/pages/purchaseReturn/request/returnRequestCreate.vue +++ b/pages/purchaseReturn/request/returnRequestCreate.vue @@ -137,10 +137,10 @@ getScanResult(result) { if (this.poNumber == '') { - this.poNumber = result.label.order; + this.poNumber = result.label.poNumber; } else { - if (this.poNumber != result.label.order) { - this.showErrorMessage('扫描的采购订单号[' + result.label.order + ']与默认采购订单号[' + this.poNumber + ']不一致') + if (this.poNumber != result.label.poNumber) { + this.showErrorMessage('扫描的采购订单号[' + result.label.poNumber + ']与默认采购订单号[' + this.poNumber + ']不一致') return; } } From 74312fb293259708f7555450272324771f5f534b Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Tue, 2 Jan 2024 14:48:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/balance/toLocation.vue | 31 ++++++++++++++++ mycomponents/location/toLocation.vue | 55 ---------------------------- 2 files changed, 31 insertions(+), 55 deletions(-) create mode 100644 mycomponents/balance/toLocation.vue delete mode 100644 mycomponents/location/toLocation.vue diff --git a/mycomponents/balance/toLocation.vue b/mycomponents/balance/toLocation.vue new file mode 100644 index 00000000..d5956aa4 --- /dev/null +++ b/mycomponents/balance/toLocation.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/mycomponents/location/toLocation.vue b/mycomponents/location/toLocation.vue deleted file mode 100644 index b2286bf3..00000000 --- a/mycomponents/location/toLocation.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - \ No newline at end of file From 92ae61d55de6fe6faa339196f1ed516650c6a67c Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Tue, 2 Jan 2024 15:27:21 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=BC=B9=E5=87=BA=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/new_style.css | 5 ++ mycomponents/balance/balance.vue | 5 +- mycomponents/balance/toLocation.vue | 2 +- mycomponents/detail/comRequestDetailCard.vue | 1 - .../detail/requestDetailBasicInfo.vue | 58 ++++--------------- .../detail/requestDetailCommonInfo.vue | 11 +++- mycomponents/recommend/recommend.vue | 9 ++- .../coms/requestDetailInfoPopup.vue | 6 +- pages/purchaseReturn/record/returnRecord.vue | 7 +-- .../purchaseReturn/request/returnRequest.vue | 2 +- .../request/returnRequestDetail.vue | 10 ++-- 11 files changed, 46 insertions(+), 70 deletions(-) diff --git a/common/style/new_style.css b/common/style/new_style.css index 783cb8ca..3c571912 100644 --- a/common/style/new_style.css +++ b/common/style/new_style.css @@ -2104,6 +2104,11 @@ button::after { padding: 5px; } +.card_to_location { + color: #329362; + padding: 5px; +} + .card_location_content { font-size: 32rpx; padding: 5px; diff --git a/mycomponents/balance/balance.vue b/mycomponents/balance/balance.vue index cc47d918..f22ba25b 100644 --- a/mycomponents/balance/balance.vue +++ b/mycomponents/balance/balance.vue @@ -5,7 +5,8 @@ - + + + - diff --git a/mycomponents/detail/requestDetailCommonInfo.vue b/mycomponents/detail/requestDetailCommonInfo.vue index 01a6279a..0ee0c863 100644 --- a/mycomponents/detail/requestDetailCommonInfo.vue +++ b/mycomponents/detail/requestDetailCommonInfo.vue @@ -3,10 +3,13 @@ - + + + - + + + @@ -24,6 +27,7 @@ import comItem from '@/mycomponents/item/item.vue' import requestDetailBasicInfo from '@/mycomponents/detail/requestDetailBasicInfo.vue' import detailRecommendInfo from '@/mycomponents/detail/detailRecommendInfo.vue' + import detailBasicInfo from '@/mycomponents/detail/detailBasicInfo.vue' export default { emits: ['onClose'], @@ -31,6 +35,7 @@ comItem, requestDetailBasicInfo, detailRecommendInfo, + detailBasicInfo }, data() { return {} diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue index 37fc81cc..0efadef8 100644 --- a/mycomponents/recommend/recommend.vue +++ b/mycomponents/recommend/recommend.vue @@ -1,14 +1,15 @@ @@ -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 {