diff --git a/src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue b/src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue index 84e8b95..60f10f0 100644 --- a/src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue +++ b/src/views/modules/outsourcing-return/outsourcingReturnPDAIssueList.vue @@ -297,6 +297,8 @@ export default { locationId: '', quantity: 0, }, + engChgLevel: '1', // 工程变更等级 + wdrNo:'', // WDR号 } }, computed: { @@ -420,7 +422,7 @@ export default { this.newLabelForm = { partNo: this.partNo, partDesc: this.orderInfo.description || '', - wdrNo: '*', + wdrNo: this.wdrNo || '*', locationId: '', quantity: 0, } @@ -460,7 +462,7 @@ export default { locationId: this.newLabelForm.locationId || '', warehouseId: '', wdrNo: this.newLabelForm.wdrNo || '*', - engChgLevel: '1', + engChgLevel: this.engChgLevel || '1', height: Number(this.newLabelForm.height) || 0, newPrint: 'NEW', }) @@ -724,6 +726,8 @@ export default { this.unissureQty = this.$route.query.material.unissureQty this.itemNo = this.$route.query.material.itemNo this.qtyReversed = this.$route.query.material.qtyReversedBy || 0 + this.engChgLevel = this.$route.query.material.engChgLevel || '1' + this.wdrNo = this.$route.query.material.wdrNo || '*' if (!this.orderNo) { this.$message.error('参数错误') diff --git a/src/views/modules/outsourcing-return/outsourcingReturnPDAList.vue b/src/views/modules/outsourcing-return/outsourcingReturnPDAList.vue index 16ebf04..4ec787a 100644 --- a/src/views/modules/outsourcing-return/outsourcingReturnPDAList.vue +++ b/src/views/modules/outsourcing-return/outsourcingReturnPDAList.vue @@ -16,7 +16,7 @@
- +
@@ -38,15 +38,15 @@
发料数量
-
{{ item.QUANTITY }}
+
{{ formatQty(item.QUANTITY) }}
已退数量
-
{{ item.QTY_REVERSED || 0 }}
+
{{ formatQty(item.QTY_REVERSED || 0) }}
可退数量
-
{{ item.QUANTITY - (item.QTY_REVERSED || 0) }}
+
{{ formatQty(item.QUANTITY - (item.QTY_REVERSED || 0)) }}
@@ -166,13 +166,23 @@ export default { ifsTransactionID: item.TRANSACTION_ID, quantity: item.QUANTITY, batchNo: item.LOT_BATCH_NO, - unissureQty: this.unissureQty, + unissureQty: item.QUANTITY - (item.QTY_REVERSED || 0) , ifsAccountingID:item.ACCOUNTING_ID, qtyReversed:item.QTY_REVERSED || 0, + engChgLevel:item.ENG_CHG_LEVEL || '1', + wdrNo:item.WAIV_DEV_REJ_NO || '*', } }, }); }, + // 保留数量精度,避免二进制浮点导致的长小数展示 + formatQty(value) { + const num = Number(value || 0); + if (Number.isNaN(num)) { + return value; + } + return num.toFixed(3).replace(/\.?0+$/, ''); + }, }, mounted() { // 如果是从详情页返回,则恢复页面状态 diff --git a/src/views/modules/production-return/productionReturnPDAIssueList.vue b/src/views/modules/production-return/productionReturnPDAIssueList.vue index 6a42c98..d06812e 100644 --- a/src/views/modules/production-return/productionReturnPDAIssueList.vue +++ b/src/views/modules/production-return/productionReturnPDAIssueList.vue @@ -449,6 +449,7 @@ export default { releaseNo:'', sequenceNo:'', enablePrint: true, // 是否打印标签,默认勾选 + engChgLevel: '1', // 变更等级,默认1 } }, computed: { @@ -647,7 +648,7 @@ export default { locationId: this.newLabelForm.locationId || '', warehouseId: '', wdrNo: this.newLabelForm.wdrNo || '*', - engChgLevel: '1', + engChgLevel: this.engChgLevel, height: Number(this.newLabelForm.height) || 0, newPrint: 'NEW', })