bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

结算管理bug修复

This commit is contained in:
hongchao 2025-05-06 16:07:21 +08:00
parent a6c8b960dc
commit 0923b89cc2
4 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/views/material/cost/component/applyDetail.vue
View File

@ -56,12 +56,12 @@
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.num">
<template slot-scope="scope" v-show="scope.row.leasePrice">
{{ scope.row.leasePrice.toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true">
<template slot-scope="scope">
<template slot-scope="scope" v-show="scope.row.num">
{{ scope.row.num.toFixed(2) }}
</template>
</el-table-column>
@ -69,12 +69,12 @@
<!-- <el-table-column label="归还数量" align="center" prop="" :show-overflow-tooltip="true" /> -->
<el-table-column label="归还日期 " align="center" prop="endTime" :show-overflow-tooltip="true"/>
<el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.num">
<template slot-scope="scope" v-show="scope.row.leaseDays">
{{ Number(scope.row.leaseDays).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="租赁费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.costs">
<template slot-scope="scope" v-show="scope.row.costs">
{{ scope.row.costs.toFixed(2) }}
</template>
</el-table-column>
@ -97,13 +97,13 @@
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="维修数量" align="center" prop="num" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.num" >
<template slot-scope="scope" v-show="scope.row.num" >
{{ scope.row.num.toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/>
<el-table-column label="维修费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.costs" >
<template slot-scope="scope" v-show="scope.row.costs" >
{{ scope.row.costs.toFixed(2) }}
</template>
</el-table-column>
@ -125,13 +125,13 @@
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.num">
<template slot-scope="scope" v-show="scope.row.num">
{{ scope.row.num.toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/>
<el-table-column label="报废费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.costs">
<template slot-scope="scope" v-show="scope.row.costs">
{{ scope.row.costs.toFixed(2) }}
</template>
</el-table-column>
@ -153,12 +153,12 @@
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.num">
<template slot-scope="scope" v-show="scope.row.num">
{{ scope.row.num.toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="丢失费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.costs">
<template slot-scope="scope" v-show="scope.row.costs">
{{ scope.row.costs.toFixed(2) }}
</template>
</el-table-column>
@ -186,7 +186,7 @@
<el-table-column label="减免天数" align="center" prop="days" :show-overflow-tooltip="true"/>
<el-table-column label="减免原因" align="center" prop="remark" :show-overflow-tooltip="true"/>
<el-table-column label="减免费用（元）" align="center" prop="leaseMoney" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.leaseMoney">
<template slot-scope="scope" v-show="scope.row.leaseMoney">
{{ scope.row.leaseMoney.toFixed(2) }}
</template>
</el-table-column>
@ -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) => {

18
src/views/material/cost/component/examDetail.vue
View File

@ -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,},

4
src/views/material/cost/component/examHome.vue
View File

@ -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));
},
//结算审批

5
src/views/material/repair/scrapLedgerReview/index.vue
View File

@ -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;
});
},
/** 重置按钮操作 */