From 25dc13f1f52280e8054e895aea0a91c9933e8fc2 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 31 Oct 2024 15:45:41 +0800
Subject: [PATCH] =?UTF-8?q?YT-581=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1PDA=E6=89=AB=E6=8F=8F=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/qty/recommendQtyEdit.vue | 6 +++-
.../coms/comReceiptDetailCard.vue | 2 +-
.../coms/comReceiptDetailCardBacth.vue | 33 ++++++-------------
.../purchaseReceipt/job/receiptDetail.vue | 26 +++++++--------
4 files changed, 29 insertions(+), 38 deletions(-)
diff --git a/src/mycomponents/qty/recommendQtyEdit.vue b/src/mycomponents/qty/recommendQtyEdit.vue
index 56b6ccb1..29b5316a 100644
--- a/src/mycomponents/qty/recommendQtyEdit.vue
+++ b/src/mycomponents/qty/recommendQtyEdit.vue
@@ -41,7 +41,7 @@
-
+
库存数量 :
{{Number(dataContent.balanceQty)}}
@@ -119,6 +119,10 @@ import { nextTick } from 'vue';
type: Boolean,
default: true
},
+ showBalanceQty: {
+ type: Boolean,
+ default: false
+ },
},
methods: {
getPackUnitName(packUnit) {
diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
index bd31d00b..0756ec5d 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
@@ -12,7 +12,7 @@
diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
index 95e4da69..bd31d00b 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
@@ -4,17 +4,16 @@
-
+
-
-
-
-
+
@@ -34,13 +33,9 @@
import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
import receiptDetailInfoPopup from '@/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+ import pack from '@/mycomponents/balance/pack.vue'
import detailList from '@/mycomponents/detail/detailList.vue'
import packageList from '@/mycomponents/package/packageList.vue'
-
- import pack from '@/mycomponents/balance/pack.vue'
- import location from '@/mycomponents/balance/location.vue'
- import toLocation from '@/mycomponents/balance/toLocation.vue'
- import batch from '@/mycomponents/balance/batch.vue'
import {
getDetailOption,
@@ -58,11 +53,7 @@
receiptDetailInfoPopup,
winScanLocation,
detailList,
- packageList,
- pack,
- location,
- toLocation,
- batch
+ packageList
},
props: {
dataContent: {
@@ -77,6 +68,8 @@
type: Object,
default: null
},
+
+
},
watch: {
@@ -99,9 +92,6 @@
},
mounted() {
- this.$nextTick(()=>{
- console.log(this.dataContent)
- })
if (this.detailOptions.length == 0) {
this.detailOptions = getDetailOption();
}
@@ -109,7 +99,6 @@
this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
.allowModifyLocation)
}
- console.log(111,this.scanOptions)
if (this.removeOptions.length == 0) {
this.removeOptions = getRemoveOption();
@@ -208,14 +197,12 @@
// });
// },
confirm(qty) {
- console.log(qty)
this.editItem.handleQty = qty;
this.$emit('updateData')
},
updateData() {
this.$emit('updateData')
- },
-
+ }
}
}
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 7db13922..4dace67f 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -390,7 +390,7 @@
pack.labelQty = Number(result.label.qty);
}
}
- calcTreeHandleQty(this.detailSource);
+ calcHandleQty(this.detailSource);
itemDetail.packList.sort(compareDesc('scanDate')); //按扫描信息排序
this.$forceUpdate()
}
@@ -456,7 +456,6 @@
item.scaned = true;
itemDetail.scanDate = new Date();
item.handleQty = calc.add(item.handleQty,result.label.qty)
- item.balanceQty = balanceInfo.qty;
item.toLocationCode = this.toLocationCode;
})
// calcHandleQty(this.detailSource);
@@ -497,7 +496,9 @@
}
if (isScan) {
pack.scanDate = new Date();
- this.showMessage("箱码【" + packingNumber + "】已经扫描");
+ // this.showMessage("箱码【" + packingNumber + "】已经扫描");
+
+ pack.handleQty = calc.add(pack.handleQty,result.label.qty)
} else {
this.packingNumberList.push(packingNumber)
pack.scaned = true
@@ -507,8 +508,7 @@
pack.labelQty = Number(result.label.qty);
}
}
- itemDetail.balanceQty = balanceInfo.qty;
- calcTreeHandleQty(this.detailSource);
+ calcHandleQty(this.detailSource);
itemDetail.packList.sort(compareDesc('scanDate')); //按扫描信息排序
this.$forceUpdate()
}
@@ -529,7 +529,8 @@
}
if (isScan) {
itemDetail.scanDate = new Date();
- this.showMessage("箱码【" + packingNumber + "】已经扫描")
+ // this.showMessage("箱码【" + packingNumber + "】已经扫描")
+ itemDetail.handleQty = calc.add(itemDetail.handleQty,result.label.qty)
} else {
this.packingNumberList.push(packingNumber)
itemDetail.scaned = true;
@@ -539,7 +540,6 @@
console.log(itemDetail.handleQty)
itemDetail.toLocationCode = this.toLocationCode;
itemDetail.labelQty = Number(result.label.qty);
- itemDetail.balanceQty = balanceInfo.qty;
itemDetail.packList.forEach(pac => {
pac.scaned = true
pac.scanDate = new Date();
@@ -551,6 +551,7 @@
this.continueScan()
this.$forceUpdate()
}
+ calcHandleQty(this.detailSource);
}
}
}
@@ -570,11 +571,11 @@
},
updateData() {
- if(this.managementType == 'BY_BATCH'){
- }else{
- calcTreeHandleQty(this.detailSource)
- }
- // calcHandleQty(this.detailSource);
+ // if(this.managementType == 'BY_BATCH'){
+ // }else{
+ // calcTreeHandleQty(this.detailSource)
+ // }
+ calcHandleQty(this.detailSource);
},
scanLocationCode(location, code) {
@@ -715,7 +716,6 @@
var params = this.setParams();
let that = this
console.log(params)
- return
purchaseReceiptJobSubmit(params).then(res => {
if (res.data) {
let isCheckPrint = getSwitchInfoByCode(this.switchCode)//是否显示上架指引单