From 0923b89cc28da5a167fbcd0aed1681ce8309ab7d Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Tue, 6 May 2025 16:07:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86bug?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../material/cost/component/applyDetail.vue | 29 +++++++++----------
.../material/cost/component/examDetail.vue | 18 ++++++++----
.../material/cost/component/examHome.vue | 4 +--
.../repair/scrapLedgerReview/index.vue | 5 ++--
4 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/src/views/material/cost/component/applyDetail.vue b/src/views/material/cost/component/applyDetail.vue
index eec880d3..0b827bff 100644
--- a/src/views/material/cost/component/applyDetail.vue
+++ b/src/views/material/cost/component/applyDetail.vue
@@ -56,12 +56,12 @@
-
+
{{ scope.row.leasePrice.toFixed(2) }}
-
+
{{ scope.row.num.toFixed(2) }}
@@ -69,12 +69,12 @@
-
+
{{ Number(scope.row.leaseDays).toFixed(2) }}
-
+
{{ scope.row.costs.toFixed(2) }}
@@ -97,13 +97,13 @@
-
+
{{ scope.row.num.toFixed(2) }}
-
+
{{ scope.row.costs.toFixed(2) }}
@@ -125,13 +125,13 @@
-
+
{{ scope.row.num.toFixed(2) }}
-
+
{{ scope.row.costs.toFixed(2) }}
@@ -153,12 +153,12 @@
-
+
{{ scope.row.num.toFixed(2) }}
-
+
{{ scope.row.costs.toFixed(2) }}
@@ -186,7 +186,7 @@
-
+
{{ scope.row.leaseMoney.toFixed(2) }}
@@ -281,7 +281,6 @@ export default {
this.loseList = response.data.loseList //丢失费用列表
this.loseCost = this.countCost(this.loseList)
this.reducList = response.data.reductionList //减免费用列表
- console.log('111111111111111111',this.reducList)
if(this.reducList!=null){
this.reducList.forEach((item) => {
this.reducCost = Number(this.reducCost) + Number(item.leaseMoney)
@@ -319,8 +318,6 @@ export default {
let arrCost = 0
list.forEach((item) => {
// arrCost += parseInt(item.costs)
-
- console.log(item)
if (item.partType != 0 && item.scrapType != 0) {
arrCost = arrCost + Number(item.costs)
}
@@ -334,8 +331,8 @@ export default {
.confirm('是否确认提交？')
.then(() => {
let params = {
- 'agreementId': this.rowData.agreementId, 'agreementCode': this.rowData.agreementCode,'totalCostAll': this.costAll,
- 'leaseList': this.leaseList, 'repairList': this.repairList, 'scrapList': this.scrapList,'loseList': this.loseList,
+ 'agreementIds': Array.isArray(this.rowData) ? this.rowData.map(item => item.agreementId) : [],'totalCostAll': this.costAll,
+ 'leaseList': this.leaseList, 'repairList': this.repairList, 'scrapList': this.scrapList,'loseList': this.loseList,'reductionList': this.reducList,
}
console.log('2222222222222',params)
submitCosts(params).then((response) => {
diff --git a/src/views/material/cost/component/examDetail.vue b/src/views/material/cost/component/examDetail.vue
index 5bda5ff8..8a7963b5 100644
--- a/src/views/material/cost/component/examDetail.vue
+++ b/src/views/material/cost/component/examDetail.vue
@@ -378,7 +378,8 @@ export default {
/** 导出按钮操作 */
//租赁
handleExport1() {
- const params = this.rowData
+ let data = _.cloneDeep(this.rowData);
+ const params = {params:JSON.stringify(data)}
this.download(
'material/slt_agreement_info/exportLease',
{...params,},
@@ -387,7 +388,8 @@ export default {
},
//丢失
handleExport2() {
- const params = this.rowData
+ let data = _.cloneDeep(this.rowData);
+ const params = {params:JSON.stringify(data)}
this.download(
'material/slt_agreement_info/exportLose',
{...params,},
@@ -396,7 +398,8 @@ export default {
},
// 维修
handleExport3() {
- const params = this.rowData
+ let data = _.cloneDeep(this.rowData);
+ const params = {params:JSON.stringify(data)}
this.download(
'material/slt_agreement_info/exportRepair',
{...params,},
@@ -405,7 +408,8 @@ export default {
},
//报废
handleExport4() {
- const params = this.rowData
+ let data = _.cloneDeep(this.rowData);
+ const params = {params:JSON.stringify(data)}
this.download(
'material/slt_agreement_info/exportScrap',
{...params,},
@@ -418,7 +422,8 @@ export default {
// )
},
handleExport5() {
- const params = this.rowData
+ let data = _.cloneDeep(this.rowData);
+ const params = {params:JSON.stringify(data)}
this.download(
'material/slt_agreement_info/exportReduction',
{...params,},
@@ -427,7 +432,8 @@ export default {
},
handleExportAll() {
- const params = this.rowData
+ let data = _.cloneDeep(this.rowData);
+ const params = {params:JSON.stringify(data)}
this.download(
'material/slt_agreement_info/exportAll',
{...params,},
diff --git a/src/views/material/cost/component/examHome.vue b/src/views/material/cost/component/examHome.vue
index e84b90bc..f1d315e8 100644
--- a/src/views/material/cost/component/examHome.vue
+++ b/src/views/material/cost/component/examHome.vue
@@ -404,8 +404,8 @@ export default {
},
//结算审批查看
handleView(row) {
- let arr = row
- console.log('2222222222222',row)
+ let arr = [];
+ arr.push(row);
this.$emit("goDetail",JSON.stringify(arr));
},
//结算审批
diff --git a/src/views/material/repair/scrapLedgerReview/index.vue b/src/views/material/repair/scrapLedgerReview/index.vue
index 0dc414ac..a3f6239a 100644
--- a/src/views/material/repair/scrapLedgerReview/index.vue
+++ b/src/views/material/repair/scrapLedgerReview/index.vue
@@ -244,8 +244,9 @@ export default {
// 获取待审核周期和审核金额
getTopData() {
getTotalPrice().then((response) => {
- this.reviewPeriod = response.data.month;
- this.reviewCost = response.data.totalCost;
+ console.log("xxxxxxxx",response)
+ this.reviewPeriod = response.data.month==null ? '': response.data.month;
+ this.reviewCost = response.data.totalCost==null ? 0: response.data.totalCost;
});
},
/** 重置按钮操作 */