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

结算及费用减免调整

This commit is contained in:
syruan 2026-01-15 14:00:05 +08:00
parent 24fe0963f0
commit b6cf74026d
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/business/costRecord/component/applyDetail.vue
View File

@ -227,7 +227,7 @@
<div class="tabelAllBottom"> <div class="tabelAllBottom">
<div class="columnAllNum">费用小计：</div> <div class="columnAllNum">费用小计：</div>
<div class="columnAll"> <div class="columnAll">
{{ reducCost }} {{ reducCost.toFixed(2) }}
</div> </div>
</div> </div>
<div class="tabelAllBottom"> <div class="tabelAllBottom">

20
src/views/business/discountApply/index.vue
View File

@ -196,9 +196,9 @@
<span v-else>{{ scope.$index + 1 }}</span> <span v-else>{{ scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备名称" align="center" prop="maName" show-overflow-tooltip /> <el-table-column label="设备名称" align="center" prop="typeName" show-overflow-tooltip />
<el-table-column label="规格型号" align="center" prop="maModel" show-overflow-tooltip /> <el-table-column label="规格型号" align="center" prop="modelName" show-overflow-tooltip />
<el-table-column label="单位" align="center" prop="maUnit" show-overflow-tooltip /> <el-table-column label="单位" align="center" prop="mtUnitName" show-overflow-tooltip />
<el-table-column label="租赁单价" align="center" prop="leasePrice" :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-if="scope.row.num">
{{ scope.row.leasePrice.toFixed(2) }} {{ scope.row.leasePrice.toFixed(2) }}
@ -212,12 +212,12 @@
<el-table-column label="租赁日期" align="center" prop="startTime" :show-overflow-tooltip="true" /> <el-table-column label="租赁日期" align="center" prop="startTime" :show-overflow-tooltip="true" />
<!-- <el-table-column label="归还数量" align="center" prop="backNum" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="归还数量" align="center" prop="backNum" :show-overflow-tooltip="true" /> -->
<el-table-column label="归还日期 " align="center" prop="endTime" :show-overflow-tooltip="true" /> <el-table-column label="归还日期 " align="center" prop="endTime" :show-overflow-tooltip="true" />
<el-table-column label="租赁天数" align="center" prop="days" :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-if="scope.row.num">
{{ Number(scope.row.leaseDays).toFixed(2) }} {{ Number(scope.row.leaseDays).toFixed(2) }}
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="租赁费用（元）" align="center" prop="leaseMoney" :show-overflow-tooltip="true"> <el-table-column label="租赁费用（元）" align="center" prop="leaseCost" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope" v-if="scope.row.costs"> <!-- <template slot-scope="scope" v-if="scope.row.costs">
{{ scope.row.costs.toFixed(2) }} {{ scope.row.costs.toFixed(2) }}
</template> --> </template> -->
@ -384,8 +384,8 @@
border border
:row-class-name="getRowClassName" :row-class-name="getRowClassName"
> >
<el-table-column label="机具名称" align="center" prop="maName" :show-overflow-tooltip="true" /> <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="maModel" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
<el-table-column label="领料数量" align="center" prop="num" :show-overflow-tooltip="true" /> <el-table-column label="领料数量" align="center" prop="num" :show-overflow-tooltip="true" />
<el-table-column label="减免数量" align="center" prop="reduceNum" width="120px"> <el-table-column label="减免数量" align="center" prop="reduceNum" width="120px">
<template v-slot="scope"> <template v-slot="scope">
@ -663,7 +663,7 @@ export default {
if (!value) return if (!value) return
try { try {
let edit =true; let edit =true;
const res = await getUnitProDepList({ projectId: value, enableFilter: edit }) const res = await getListUnite({ projectId: value, enableFilter: edit })
this.uniteList = res.data || [] this.uniteList = res.data || []
// 自动选中唯一叶子节点 // 自动选中唯一叶子节点
@ -817,11 +817,11 @@ export default {
console.log('22222222', this.pushReviewList) console.log('22222222', this.pushReviewList)
this.leaseAll = this.pushReviewList.reduce((total, item) => { this.leaseAll = this.pushReviewList.reduce((total, item) => {
// return total + Number(item.leaseMoney); // return total + Number(item.leaseMoney);
return new Decimal(total).add(new Decimal(item.leaseMoney || 0)).toString() return new Decimal(total).add(new Decimal(item.leaseCost || 0)).toString()
}, 0) }, 0)
let obj = { let obj = {
id: null, id: null,
leaseMoney: this.leaseAll leaseCost: this.leaseAll
} }
this.pushReviewList.push(obj) this.pushReviewList.push(obj)
}) })

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

@ -417,8 +417,7 @@
<td>{{ item.typeName }}</td> <td>{{ item.typeName }}</td>
<td>{{ item.modeName }}</td> <td>{{ item.modeName }}</td>
<td>{{ item.unitName }}</td> <td>{{ item.unitName }}</td>
<td v-if="item.leasePrice">{{ item.leasePrice }}</td> <td>{{ item.leasePrice }}</td>
<td v-else></td>
<td v-if="item.reduceNum">{{ item.reduceNum }}</td> <td v-if="item.reduceNum">{{ item.reduceNum }}</td>
<td v-else></td> <td v-else></td>
<td>{{ item.startTime }}</td> <td>{{ item.startTime }}</td>
@ -426,7 +425,7 @@
<td>{{ item.days }}</td> <td>{{ item.days }}</td>
<td>{{ item.remark }}</td> <td>{{ item.remark }}</td>
<td v-if="item.leaseMoney">{{ item.leaseMoney.toFixed(3) }}</td> <td v-if="item.leaseMoney">{{ item.leaseMoney.toFixed(3) }}</td>
<td v-else></td> <td v-else>{{ 0 }}</td>
<td>{{ item.unitName }}</td> <td>{{ item.unitName }}</td>
</tr> </tr>
</table> </table>
@ -651,6 +650,8 @@ export default {
Number(this.reducCost) Number(this.reducCost)
this.costAll = costSum this.costAll = costSum
console.log(this.leaseCost + "," + this.repairCost + "," + this.scrapCost + "," + this.loseCost + "," + this.reducCost)
this.subCostFlag = costSum this.subCostFlag = costSum
}) })
.catch(error => { .catch(error => {

2
src/views/material/cost/component/unreportHome.vue
View File

@ -186,7 +186,7 @@
<el-tag type="warning" v-if="scope.row.isFinish == 0" effect="plain">未竣工</el-tag> <el-tag type="warning" v-if="scope.row.isFinish == 0" effect="plain">未竣工</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="竣工日期" align="center" prop="actualEndDate" :show-overflow-tooltip="true"/> <el-table-column label="竣工日期" align="center" prop="actualEndDate"/>
</el-table> </el-table>
<pagination <pagination