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

费用推送审核修改

This commit is contained in:
syruan 2025-08-30 22:17:52 +08:00
parent 5305aa1169
commit 1116b9a9a5
2 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/costPush/costPush.js
View File

@ -30,7 +30,7 @@ export function submitFee(params){
// 查询费用推送审核租赁列表 // 查询费用推送审核租赁列表
export function getLeaseList(query) { export function getLeaseList(query) {
return request({ return request({
url: '/material/iws_cost_push/getLeaseCostsByAgreementIdAndMonth', url: '/material/slt_agreement_info/leasePeriodCostDetails',
method: 'get', method: 'get',
params: query params: query
}) })

80
src/views/material/costPush/pushReview/index.vue
View File

@ -111,13 +111,19 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="费用所属" align="center" prop="settlementType" width="100" >
<template slot-scope="scope" >
<el-tag v-if="scope.row.settlementType == 1" type="primary" size="small">工器具</el-tag>
<el-tag v-if="scope.row.settlementType == 2" type="warning" size="small">安全用品</el-tag>
</template>
</el-table-column>
<el-table-column label="租赁费用" align="center" prop="leaseMoney" > <el-table-column label="租赁费用" align="center" prop="leaseMoney" >
<template slot-scope="scope" > <template slot-scope="scope" >
<span class="clickText" v-if="scope.row.leaseMoney!=null && scope.$index!=pushReviewList.length-1" @click="openLease(scope.row)"> <span class="clickText" v-if="scope.row.leaseMoney!=null && scope.$index!=pushReviewList.length-1" @click="openLease(scope.row)">
{{scope.row.leaseMoney}} {{scope.row.leaseMoney}}
</span> </span>
<span v-if="scope.row.leaseMoney!=null && scope.$index==pushReviewList.length-1" > <span v-if="scope.row.leaseMoney!=null && scope.$index==pushReviewList.length-1" >
{{scope.row.leaseMoney}} {{Number(scope.row.leaseMoney).toFixed(3)}}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
@ -127,7 +133,7 @@
{{scope.row.repairMoney}} {{scope.row.repairMoney}}
</span> </span>
<span v-if="scope.row.repairMoney!=null && scope.$index==pushReviewList.length-1" > <span v-if="scope.row.repairMoney!=null && scope.$index==pushReviewList.length-1" >
{{scope.row.repairMoney}} {{Number(scope.row.repairMoney).toFixed(3)}}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
@ -137,7 +143,7 @@
{{scope.row.scrapMoney}} {{scope.row.scrapMoney}}
</span> </span>
<span v-if="scope.row.scrapMoney!=null && scope.$index==pushReviewList.length-1" > <span v-if="scope.row.scrapMoney!=null && scope.$index==pushReviewList.length-1" >
{{scope.row.scrapMoney}} {{Number(scope.row.scrapMoney).toFixed(3)}}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
@ -147,13 +153,16 @@
{{scope.row.lostMoney}} {{scope.row.lostMoney}}
</span> </span>
<span v-if="scope.row.lostMoney!=null && scope.$index==pushReviewList.length-1" > <span v-if="scope.row.lostMoney!=null && scope.$index==pushReviewList.length-1" >
{{scope.row.lostMoney}} {{Number(scope.row.lostMoney).toFixed(3)}}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合计费用" align="center" prop="money" show-overflow-tooltip > <el-table-column label="合计费用" align="center" prop="money" show-overflow-tooltip >
<template slot-scope="scope" > <template slot-scope="scope" >
<span v-if="scope.row.money!=null" > <span v-if="scope.row.money!=null && scope.$index==pushReviewList.length-1" >
{{Number(scope.row.money).toFixed(3)}}
</span>
<span v-if="scope.row.money!=null && scope.$index!=pushReviewList.length-1" >
{{scope.row.money}} {{scope.row.money}}
</span> </span>
</template> </template>
@ -184,7 +193,7 @@
</div> --> </div> -->
<!-- 租赁费用弹窗--> <!-- 租赁费用弹窗-->
<el-dialog :title="title" :visible.sync="showLease" width="1200px" append-to-body> <el-dialog :title="title" :visible.sync="showLease" width="1300px" append-to-body>
<el-form :model="dialogLease" ref="dialogLease" size="small" :inline="true" label-width="80px"> <el-form :model="dialogLease" ref="dialogLease" size="small" :inline="true" label-width="80px">
<el-form-item label="物资名称" prop="typeName"> <el-form-item label="物资名称" prop="typeName">
<el-input <el-input
@ -220,15 +229,22 @@
<el-table-column label="序号" align="center" width="80" type="index" /> <el-table-column label="序号" align="center" width="80" type="index" />
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/> <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="unitName" :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"/> <el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true"/>
<el-table-column label="租赁数量" align="center" prop="leaseNum" :show-overflow-tooltip="true"/> <el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true"/>
<el-table-column label="租赁日期" align="center" prop="leaseDate" width="170px"/> <el-table-column label="计算开始时间" align="center" prop="calcStartTime" width="120px"/>
<el-table-column label="归还日期" align="center" prop="backDate" width="170px"/> <el-table-column label="计算结束时间" align="center" prop="calcEndTime" width="120px"/>
<el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true"/> <el-table-column label="实际开始时间" align="center" prop="startTime" width="120px"/>
<el-table-column label="租赁费用" align="center" width="126px" prop="leaseMoney" :show-overflow-tooltip="true"> <el-table-column label="实际结束时间" align="center" prop="endTime" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.leaseMoney.toFixed(2) }} <span v-if="scope.row.endTime">{{ scope.row.endTime }}</span>
<span v-else style="color: #909399;">未归还</span>
</template>
</el-table-column>
<el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true"/>
<el-table-column label="租赁费用" align="center" width="126px" prop="leaseCost" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.leaseCost.toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -492,6 +508,7 @@ export default {
}, },
dialogLeaseTotal: 0, dialogLeaseTotal: 0,
leaseAllMoney: 0, leaseAllMoney: 0,
currentLeaseRow: null, // 当前租赁费用行数据
//维修费用弹窗 //维修费用弹窗
showRepair: false, showRepair: false,
@ -630,6 +647,13 @@ export default {
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
this.loading = true; this.loading = true;
// 重置合计变量，避免重复累加
this.leaseAll = 0;
this.repairAll = 0;
this.scrapAll = 0;
this.loseAll = 0;
this.moneyAll = 0;
console.log(this.queryParams.month) console.log(this.queryParams.month)
getPushReviewList(this.queryParams).then((response) => { getPushReviewList(this.queryParams).then((response) => {
this.pushReviewList = response.rows; this.pushReviewList = response.rows;
@ -653,12 +677,17 @@ export default {
this.pushReviewList.push(obj) this.pushReviewList.push(obj)
this.loading = false; this.loading = false;
}); });
this.loading = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
// 重置合计变量
this.leaseAll = 0;
this.repairAll = 0;
this.scrapAll = 0;
this.loseAll = 0;
this.moneyAll = 0;
this.queryParams = { this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@ -702,13 +731,26 @@ export default {
this.dialogLease.typeName = "" this.dialogLease.typeName = ""
this.dialogLease.modelName = "" this.dialogLease.modelName = ""
this.dialogLease.id = row.id; this.dialogLease.id = row.id;
this.currentLeaseRow = row; // 保存当前行数据
this.getLeaseList(row) this.getLeaseList(row)
}, },
//查询租赁费用 //查询租赁费用
getLeaseList(row) { getLeaseList(row) {
this.loading = true; this.loading = true;
// 根据选择的月份计算开始日期和结束日期
const selectedMonth = this.queryParams.month; // 格式: "2024-08"
const startDate = selectedMonth + '-01'; // 月份第一天
// 计算月份最后一天
const year = parseInt(selectedMonth.split('-')[0]);
const month = parseInt(selectedMonth.split('-')[1]);
const endDate = new Date(year, month, 0).toISOString().split('T')[0]; // 当月最后一天
let params = { let params = {
month: this.queryParams.month, month: this.queryParams.month,
startDate: startDate,
endDate: endDate,
agreementId: row.agreementId, agreementId: row.agreementId,
typeName: this.dialogLease.typeName, typeName: this.dialogLease.typeName,
modelName: this.dialogLease.modelName, modelName: this.dialogLease.modelName,
@ -717,14 +759,14 @@ export default {
this.dialogLeaseList = response.rows; this.dialogLeaseList = response.rows;
this.leaseAllMoney = 0; this.leaseAllMoney = 0;
this.dialogLeaseList.forEach(item => { this.dialogLeaseList.forEach(item => {
this.leaseAllMoney += Number(item.leaseMoney); this.leaseAllMoney += Number(item.leaseCost);
}) })
this.dialogLeaseTotal = response.total; this.dialogLeaseTotal = response.total;
this.loading = false; this.loading = false;
}); });
}, },
handleQueryLease() { handleQueryLease() {
this.getLeaseList() this.getLeaseList(this.currentLeaseRow)
}, },
//导出租赁费用 //导出租赁费用
handleExportLease() { handleExportLease() {
@ -875,13 +917,13 @@ export default {
objectSpanMethod ({ row, column, rowIndex, columnIndex }) { objectSpanMethod ({ row, column, rowIndex, columnIndex }) {
if (rowIndex === this.pushReviewList.length-1 && columnIndex == 1) { if (rowIndex === this.pushReviewList.length-1 && columnIndex == 1) {
let rowspan = 2 let rowspan = 2
let colspan = 6 let colspan = 7 // 增加了结算类型列，所以从6改为7
return { rowspan, colspan } return { rowspan, colspan }
} }
// 解决偏移的重要代码 // 解决偏移的重要代码
// 重点在 else if 判断必须加因为合并单元格数据会出现偏移、 // 重点在 else if 判断必须加因为合并单元格数据会出现偏移、
// 否则如果是 第二行 的 第二列 那么隐藏原有第二行 的 第二列的数据使他隐藏 // 否则如果是 第二行 的 第二列 那么隐藏原有第二行 的 第二列的数据使他隐藏
else if (rowIndex === this.pushReviewList.length-1 && columnIndex < 6) { else if (rowIndex === this.pushReviewList.length-1 && columnIndex < 7) { // 从6改为7
return { return {
rowspan: 0, rowspan: 0,
colspan: 0 colspan: 0