diff --git a/src/views/modules/other-inout/otherInboundDetail.vue b/src/views/modules/other-inout/otherInboundDetail.vue index 52b58de..665ab4d 100644 --- a/src/views/modules/other-inout/otherInboundDetail.vue +++ b/src/views/modules/other-inout/otherInboundDetail.vue @@ -231,6 +231,7 @@
物料编码
需求数量
可用数量
+
扫描数量
@@ -242,7 +243,8 @@
{{ index + 1 }}
{{ item.materialCode }}
{{ item.requiredQty || 0 }}
-
{{ item.actualQty || 0 }}
+
{{ item.pickedQty || 0 }}
+
{{ item.scansQty || 0 }}
@@ -1429,6 +1431,13 @@ export default { font-size: 12px; } +.material-table .col-scans-qty { + flex: 0.8; + text-align: center; + min-width: 65px; + font-size: 12px; +} + .material-modal .modal-footer { padding: 15px 20px; display: flex; diff --git a/src/views/modules/other-inout/otherOutboundDetail.vue b/src/views/modules/other-inout/otherOutboundDetail.vue index 0cfebe6..4e91719 100644 --- a/src/views/modules/other-inout/otherOutboundDetail.vue +++ b/src/views/modules/other-inout/otherOutboundDetail.vue @@ -132,6 +132,7 @@
物料编码
需求数量
出库数量
+
扫描数量
@@ -143,7 +144,8 @@
{{ index + 1 }}
{{ item.materialCode || item.partNo }}
{{ item.requiredQty || 0 }}
-
{{ item.availableQty || 0 }}
+
{{ item.pickedQty || 0 }}
+
{{ item.scansQty || 0 }}
@@ -987,6 +989,13 @@ export default { font-size: 12px; } +.material-table .col-scans-qty { + flex: 0.8; + text-align: center; + min-width: 65px; + font-size: 12px; +} + .material-modal .modal-footer { padding: 15px 20px; display: flex; diff --git a/src/views/modules/production-pick/productionPickingDetail.vue b/src/views/modules/production-pick/productionPickingDetail.vue index acceffb..34c4d8c 100644 --- a/src/views/modules/production-pick/productionPickingDetail.vue +++ b/src/views/modules/production-pick/productionPickingDetail.vue @@ -135,7 +135,7 @@
物料编码
需求数量
已领数量
-
本次扫描数量
+
扫描数量
diff --git a/src/views/modules/production/productionInboundStorage.vue b/src/views/modules/production/productionInboundStorage.vue index c7c49cf..fe449e1 100644 --- a/src/views/modules/production/productionInboundStorage.vue +++ b/src/views/modules/production/productionInboundStorage.vue @@ -176,6 +176,7 @@
物料编码
需求数量
已入库数
+
扫描数量
@@ -188,7 +189,8 @@
{{ item.materialCode || item.partNo }}
{{ item.labelCount || 0 }}
-
{{ item.totalinLabels || 0 }}
+
{{ item.pickedQty || 0 }}
+
{{ item.scansQty || 0 }}
@@ -1512,6 +1514,13 @@ export default { font-size: 12px; } +.material-table .col-scans-qty { + flex: 0.8; + text-align: center; + min-width: 65px; + font-size: 12px; +} + .material-modal .modal-footer { padding: 15px 20px; display: flex; diff --git a/src/views/modules/production/productionReturnStorage.vue b/src/views/modules/production/productionReturnStorage.vue index e947571..ec63958 100644 --- a/src/views/modules/production/productionReturnStorage.vue +++ b/src/views/modules/production/productionReturnStorage.vue @@ -168,6 +168,7 @@
物料编码
需求数量
已入库数
+
扫描数量
@@ -180,7 +181,8 @@
{{ item.materialCode || item.partNo }}
{{ item.labelCount || 0 }}
-
{{ item.totalinLabels || 0 }}
+
{{ item.pickedQty || 0 }}
+
{{ item.scansQty || 0 }}
@@ -1224,6 +1226,13 @@ export default { font-size: 12px; } +.material-table .col-scans-qty { + flex: 0.8; + text-align: center; + min-width: 65px; + font-size: 12px; +} + .material-modal .modal-footer { padding: 15px 20px; display: flex; diff --git a/src/views/modules/purchase-inbound/inboundStorage.vue b/src/views/modules/purchase-inbound/inboundStorage.vue index 7cefb80..be5d774 100644 --- a/src/views/modules/purchase-inbound/inboundStorage.vue +++ b/src/views/modules/purchase-inbound/inboundStorage.vue @@ -171,6 +171,7 @@
物料编码
需求数量
已入库数
+
扫描数量
@@ -183,7 +184,8 @@
{{item.partNo }}
{{ item.labelCount || 0 }}
-
{{ item.totalinLabels || 0 }}
+
{{ item.pickedQty || 0 }}
+
{{ item.scansQty || 0 }}
@@ -1343,6 +1345,12 @@ export default { flex: 0.8; text-align: center; min-width: 65px; +} + +.material-table .col-scans-qty { + flex: 0.8; + text-align: center; + min-width: 65px; font-size: 12px; } diff --git a/src/views/modules/purchase-return/purchaseReturnDetail.vue b/src/views/modules/purchase-return/purchaseReturnDetail.vue index 08e9b21..d2d110f 100644 --- a/src/views/modules/purchase-return/purchaseReturnDetail.vue +++ b/src/views/modules/purchase-return/purchaseReturnDetail.vue @@ -131,6 +131,7 @@
物料编码
需求数量
出库数量
+
扫描数量
@@ -142,7 +143,8 @@
{{ index + 1 }}
{{ item.materialCode || item.partNo }}
{{ item.requiredQty || 0 }}
-
{{ item.availableQty || 0 }}
+
{{ item.pickedQty || 0 }}
+
{{ item.scansQty || 0 }}
@@ -1031,6 +1033,13 @@ export default { font-size: 12px; } +.material-table .col-scans-qty { + flex: 0.8; + text-align: center; + min-width: 65px; + font-size: 12px; +} + .material-modal .modal-footer { padding: 15px 20px; display: flex; diff --git a/src/views/modules/sales-return/salesReturnStorage.vue b/src/views/modules/sales-return/salesReturnStorage.vue index 8a88990..20e92e5 100644 --- a/src/views/modules/sales-return/salesReturnStorage.vue +++ b/src/views/modules/sales-return/salesReturnStorage.vue @@ -166,6 +166,7 @@
物料编码
需求数量
已退货数
+
扫描数量
@@ -177,7 +178,8 @@
{{ index + 1 }}
{{ item.materialCode || item.partNo }}
{{ item.labelCount || 0 }}
-
{{ item.totalinLabels || 0 }}
+
{{ item.pickedQty || 0 }}
+
{{ item.scansQty || 0 }}
@@ -1326,6 +1328,13 @@ export default { font-size: 12px; } +.material-table .col-scans-qty { + flex: 0.8; + text-align: center; + min-width: 65px; + font-size: 12px; +} + .material-modal .modal-footer { padding: 15px 20px; display: flex; diff --git a/src/views/modules/sales/salesOutboundDetail.vue b/src/views/modules/sales/salesOutboundDetail.vue index 64d9f61..f11d25a 100644 --- a/src/views/modules/sales/salesOutboundDetail.vue +++ b/src/views/modules/sales/salesOutboundDetail.vue @@ -152,6 +152,7 @@
物料编码
需求数量
出库数量
+
扫描数量
@@ -163,7 +164,8 @@
{{ index + 1 }}
{{ item.materialCode || item.partNo }}
{{ item.requiredQty || 0 }}
-
{{ item.availableQty || 0 }}
+
{{ item.pickedQty || 0 }}
+
{{ item.scansQty || 0 }}
@@ -318,12 +320,12 @@ export default { this.$message.warning('请先扫描标签'); return; } - + // 获取库位(使用第一个标签的库位,如果有的话) - const locationCode = this.labelList.length > 0 && this.labelList[0].locationId - ? this.labelList[0].locationId + const locationCode = this.labelList.length > 0 && this.labelList[0].locationId + ? this.labelList[0].locationId : ''; - + const params = { site: this.outboundInfo.site, buNo: this.outboundInfo.buNo, @@ -1105,6 +1107,13 @@ export default { font-size: 12px; } +.material-table .col-scans-qty { + flex: 0.8; + text-align: center; + min-width: 65px; + font-size: 12px; +} + .material-modal .modal-footer { padding: 15px 20px; display: flex;