From 1103f3e67d9f843cf6bae07610ca9ed93bd8045d Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Tue, 3 Sep 2024 11:32:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A7=E4=BB=B6?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/api/storage/oldPartsRecovery.js | 13 +++++++++++++ .../oldPartsRecovery/oldPartsRecoveryAdd.vue | 4 ++-- .../oldpPartStocktakingEditReport.vue | 8 ++++---- .../oldpPartStocktakingReportDetail.vue | 8 ++++---- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/yxt-as-ui/src/api/storage/oldPartsRecovery.js b/yxt-as-ui/src/api/storage/oldPartsRecovery.js index a26ab8cc6a..063722cf10 100644 --- a/yxt-as-ui/src/api/storage/oldPartsRecovery.js +++ b/yxt-as-ui/src/api/storage/oldPartsRecovery.js @@ -46,6 +46,19 @@ export default { }); }, + // 初始化旧件入库 + getOldDetailsByBillSid: function(params) { + return request({ + // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", + url: '/as/v1/AsBusrepairInventorybillDetail/getOldDetailsByBillSid', + method: 'post', + params: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 保存旧件入库 saveInventory: function(data) { return request({ diff --git a/yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue b/yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue index f5dbaa4e4f..bf13192a6e 100644 --- a/yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue +++ b/yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue @@ -212,10 +212,10 @@ showEdit(row) { this.init() var params = { - sid: row.sid + busRepairBillSid: row.billSid } - req.init(row.sid) + req.getOldDetailsByBillSid(params) .then(resp => { if (resp.success) { this.formobj = resp.data diff --git a/yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingEditReport.vue b/yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingEditReport.vue index 62107feab2..044ae2a697 100644 --- a/yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingEditReport.vue +++ b/yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingEditReport.vue @@ -131,9 +131,9 @@ - + - + @@ -153,9 +153,9 @@ - + - + diff --git a/yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingReportDetail.vue b/yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingReportDetail.vue index cb4aa51af0..2382dcccd7 100644 --- a/yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingReportDetail.vue +++ b/yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingReportDetail.vue @@ -127,9 +127,9 @@ - + - + @@ -149,9 +149,9 @@ - + - + From d7bc4beb34dfea700b5fbb36fa849e658d64d446 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 3 Sep 2024 14:45:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/purchase/purchasereturn/purchasereturnInfo.vue | 2 +- .../views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue | 2 +- .../src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue | 2 +- .../src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue index 529f56497d..5fe2206b70 100644 --- a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue +++ b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue @@ -142,7 +142,7 @@ export default { if (this.formobj.pmsPurchasebackDetailList.length > 0) { this.formobj.pmsPurchasebackDetailList.forEach((e) => { if (e.goodsSpuName !== '') { - th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100 + th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100 } }) } diff --git a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue index fad6d2d542..1b2a53b7f2 100644 --- a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue @@ -239,7 +239,7 @@ export default { if (this.formobj.pmsPurchasebackDetailList.length > 0) { this.formobj.pmsPurchasebackDetailList.forEach((e) => { if (e.goodsSpuName !== '') { - th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100 + th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100 } }) } diff --git a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue index 34c0319630..f3cffb8371 100644 --- a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue +++ b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue @@ -173,7 +173,7 @@ export default { if (this.formobj.pmsPurchasebackDetailList.length > 0) { this.formobj.pmsPurchasebackDetailList.forEach((e) => { if (e.goodsSpuName !== '') { - th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100 + th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100 } }) } diff --git a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue index d7224ce50b..93462af49f 100644 --- a/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue @@ -168,7 +168,7 @@ export default { if (this.formobj.pmsPurchasebackDetailList.length > 0) { this.formobj.pmsPurchasebackDetailList.forEach((e) => { if (e.goodsSpuName !== '') { - th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100 + th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100 } }) }