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

优化

This commit is contained in:
mashuai 2026-01-14 10:43:43 +08:00
parent f74f28afb0
commit d0ea91450e
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/material/cost/component/reportHome.vue
View File

@ -182,8 +182,8 @@
<el-table-column label="单价（元）" align="center" prop="unitPrice" width="100" /> <el-table-column label="单价（元）" align="center" prop="unitPrice" width="100" />
<el-table-column label="数量" align="center" prop="quantity" width="80" /> <el-table-column label="数量" align="center" prop="quantity" width="80" />
<!-- <el-table-column label="归还数量" align="center" prop="returnQuantity" width="100" /> --> <!-- <el-table-column label="归还数量" align="center" prop="returnQuantity" width="100" /> -->
<el-table-column label="租赁日期" align="center" prop="leaseDate" width="120" /> <el-table-column label="租赁开始日期" align="center" prop="leaseDate" width="120" />
<el-table-column label="退还日期" align="center" prop="returnDate" width="120" /> <el-table-column label="租赁结束日期" align="center" prop="returnDate" width="120" />
<el-table-column label="天数" align="center" prop="days" width="80" /> <el-table-column label="天数" align="center" prop="days" width="80" />
<el-table-column label="费用（元）" align="center" prop="cost" width="100"> <el-table-column label="费用（元）" align="center" prop="cost" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -287,12 +287,12 @@
{{ scope.row.costType === 'lease' ? (scope.row.returnQuantity || 0) : '-' }} {{ scope.row.costType === 'lease' ? (scope.row.returnQuantity || 0) : '-' }}
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="租赁日期" align="center" width="120"> <el-table-column label="租赁开始日期" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.costType === 'lease' ? (scope.row.leaseDate || '-') : '-' }} {{ scope.row.costType === 'lease' ? (scope.row.leaseDate || '-') : '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="退还日期" align="center" width="120"> <el-table-column label="租赁结束日期" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.costType === 'lease' ? (scope.row.returnDate || '-') : '-' }} {{ scope.row.costType === 'lease' ? (scope.row.returnDate || '-') : '-' }}
</template> </template>
@ -788,8 +788,8 @@ export default {
{ key: 'unitPrice', title: '单价（元）' }, { key: 'unitPrice', title: '单价（元）' },
{ key: 'quantity', title: '数量' }, { key: 'quantity', title: '数量' },
// { key: 'returnQuantity', title: '归还数量' }, // { key: 'returnQuantity', title: '归还数量' },
{ key: 'leaseDate', title: '租赁日期' }, { key: 'leaseDate', title: '租赁开始日期' },
{ key: 'returnDate', title: '退还日期' }, { key: 'returnDate', title: '租赁结束日期' },
{ key: 'days', title: '天数' }, { key: 'days', title: '天数' },
{ key: 'cost', title: '费用（元）' } { key: 'cost', title: '费用（元）' }
]; ];
@ -837,8 +837,8 @@ export default {
{ key: 'unitPrice', title: '单价（元）' }, { key: 'unitPrice', title: '单价（元）' },
{ key: 'quantity', title: '数量' }, { key: 'quantity', title: '数量' },
// { key: 'returnQuantity', title: '归还数量' }, // { key: 'returnQuantity', title: '归还数量' },
{ key: 'leaseDate', title: '租赁日期' }, { key: 'leaseDate', title: '租赁开始日期' },
{ key: 'returnDate', title: '退还日期' }, { key: 'returnDate', title: '租赁结束日期' },
{ key: 'days', title: '天数' }, { key: 'days', title: '天数' },
{ key: 'cost', title: '费用（元）' }, { key: 'cost', title: '费用（元）' },
{ key: 'costType', title: '费用类型' } { key: 'costType', title: '费用类型' }

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

@ -221,8 +221,8 @@
<el-table-column label="单价（元）" align="center" prop="unitPrice" width="100" /> <el-table-column label="单价（元）" align="center" prop="unitPrice" width="100" />
<el-table-column label="数量" align="center" prop="quantity" width="80" /> <el-table-column label="数量" align="center" prop="quantity" width="80" />
<el-table-column label="归还数量" align="center" prop="returnQuantity" width="100" /> <el-table-column label="归还数量" align="center" prop="returnQuantity" width="100" />
<el-table-column label="租赁日期" align="center" prop="leaseDate" width="120" /> <el-table-column label="租赁开始日期" align="center" prop="leaseDate" width="120" />
<el-table-column label="退还日期" align="center" prop="returnDate" width="120" /> <el-table-column label="租赁结束日期" align="center" prop="returnDate" width="120" />
<el-table-column label="天数" align="center" prop="days" width="80" /> <el-table-column label="天数" align="center" prop="days" width="80" />
<el-table-column label="费用（元）" align="center" prop="cost" width="100"> <el-table-column label="费用（元）" align="center" prop="cost" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -352,13 +352,13 @@
<span v-else>-</span> <span v-else>-</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="租赁日期" align="center" width="120"> <el-table-column label="租赁开始日期" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.costType === 'lease'">{{ scope.row.leaseDate || '-' }}</span> <span v-if="scope.row.costType === 'lease'">{{ scope.row.leaseDate || '-' }}</span>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="退还日期" align="center" width="120"> <el-table-column label="租赁结束日期" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.costType === 'lease'">{{ scope.row.returnDate || '-' }}</span> <span v-if="scope.row.costType === 'lease'">{{ scope.row.returnDate || '-' }}</span>
<span v-else>-</span> <span v-else>-</span>
@ -514,8 +514,8 @@
<el-table-column label="单价（元）" align="center" prop="unitPrice" width="100" /> <el-table-column label="单价（元）" align="center" prop="unitPrice" width="100" />
<el-table-column label="数量" align="center" prop="quantity" width="80" /> <el-table-column label="数量" align="center" prop="quantity" width="80" />
<el-table-column label="归还数量" align="center" prop="returnQuantity" width="100" /> <el-table-column label="归还数量" align="center" prop="returnQuantity" width="100" />
<el-table-column label="租赁日期" align="center" prop="leaseDate" width="120" /> <el-table-column label="租赁开始日期" align="center" prop="leaseDate" width="120" />
<el-table-column label="退还日期" align="center" prop="returnDate" width="120" /> <el-table-column label="租赁结束日期" align="center" prop="returnDate" width="120" />
<el-table-column label="天数" align="center" prop="days" width="80" /> <el-table-column label="天数" align="center" prop="days" width="80" />
<el-table-column label="费用（元）" align="center" prop="cost" width="100"> <el-table-column label="费用（元）" align="center" prop="cost" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -1284,8 +1284,8 @@ export default {
{ key: 'unitPrice', title: '单价（元）' }, { key: 'unitPrice', title: '单价（元）' },
{ key: 'quantity', title: '数量' }, { key: 'quantity', title: '数量' },
{ key: 'returnQuantity', title: '归还数量' }, { key: 'returnQuantity', title: '归还数量' },
{ key: 'leaseDate', title: '租赁日期' }, { key: 'leaseDate', title: '租赁开始日期' },
{ key: 'returnDate', title: '退还日期' }, { key: 'returnDate', title: '租赁结束日期' },
{ key: 'days', title: '天数' }, { key: 'days', title: '天数' },
{ key: 'cost', title: '费用（元）' } { key: 'cost', title: '费用（元）' }
]; ];
@ -1345,8 +1345,8 @@ export default {
{ key: 'unitPrice', title: '单价（元）' }, { key: 'unitPrice', title: '单价（元）' },
{ key: 'quantity', title: '数量' }, { key: 'quantity', title: '数量' },
{ key: 'returnQuantity', title: '归还数量' }, { key: 'returnQuantity', title: '归还数量' },
{ key: 'leaseDate', title: '租赁日期' }, { key: 'leaseDate', title: '租赁开始日期' },
{ key: 'returnDate', title: '退还日期' }, { key: 'returnDate', title: '租赁结束日期' },
{ key: 'days', title: '天数' }, { key: 'days', title: '天数' },
{ key: 'cost', title: '费用（元）' }, { key: 'cost', title: '费用（元）' },
{ key: 'costType', title: '费用类型' } { key: 'costType', title: '费用类型' }

6
src/views/settlement/add.vue
View File

@ -62,7 +62,7 @@
placeholder="请选择班组" placeholder="请选择班组"
clearable clearable
filterable filterable
multiple multiple
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
@ -134,8 +134,8 @@
</template> </template>
</el-table-column> </el-table-column>
<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="startTime" :show-overflow-tooltip="true" /> <el-table-column label="租赁开始日期" align="center" prop="startTime" :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="leaseDays" :show-overflow-tooltip="true"/> <el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true"/>
<el-table-column label="出场日期" align="center" prop="actualExitTime" :show-overflow-tooltip="true"/> <el-table-column label="出场日期" align="center" prop="actualExitTime" :show-overflow-tooltip="true"/>
<el-table-column label="超期日期" align="center" prop="overTime" :show-overflow-tooltip="true"/> <el-table-column label="超期日期" align="center" prop="overTime" :show-overflow-tooltip="true"/>