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

结算

This commit is contained in:
hongchao 2025-10-15 01:27:16 +08:00
parent 6795ee0cd7
commit 2e2978f24b
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/materialsStation/equipment/teamStorage/index.vue
View File

@ -176,7 +176,7 @@
></el-table-column>
<el-table-column label="班组名称" align="center" prop="teamName" :show-overflow-tooltip="true" />
<el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
<el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" />
<!-- <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" /> -->
<el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
<el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
@ -207,10 +207,10 @@
<thead>
<tr>
<th align="center" style="width: 50px;">序号</th>
<th align="center" style="width: 150px;">班组名称</th>
<th align="center" style="width: 170px;">班组名称</th>
<th align="center" style="width: 150px;">领料单号</th>
<th align="center" style="width: 80px;">领料人</th>
<th align="center" style="width: 150px;">机具名称</th>
<!-- <th align="center" style="width: 80px;">领料人</th> -->
<th align="center" style="width: 200px;">机具名称</th>
<th align="center">规格型号</th>
<th align="center" style="width: 70px;">单位</th>
<th align="center" style="width: 120px;">库存</th>
@ -221,7 +221,7 @@
<td align="center">{{ index + 1 }}</td>
<td align="center">{{ item.teamName }}</td>
<td align="center">{{ item.code }}</td>
<td align="center">{{ item.leasePerson }}</td>
<!-- <td align="center">{{ item.leasePerson }}</td> -->
<td align="center">{{ item.typeName }}</td>
<td align="center">{{ item.typeModelName }}</td>
<td align="center">{{ item.unitName }}</td>

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

@ -91,7 +91,7 @@
<el-button type="primary" size="mini" @click="handleExport4" :disabled="!hasData">报废明细导出</el-button>
<el-button type="primary" size="mini" @click="handleExport2" :disabled="!hasData">未归还明细导出</el-button>
<el-button type="primary" size="mini" @click="handleExport5" :disabled="!hasData">减免明细导出</el-button>
<el-button type="warning" size="mini" @click="handleExportAll" :disabled="!hasData">全部明细导出</el-button>
<!-- <el-button type="warning" size="mini" @click="handleExportAll" :disabled="!hasData">全部明细导出</el-button> -->
<!-- <el-button type="warning" size="mini" @click="handleExportEach" :disabled="!hasData">各结算明细导出</el-button> -->
<el-button type="success" size="mini" @click="handleAdd" :disabled="!hasData">提交</el-button>
</el-col>
@ -114,7 +114,7 @@
</div>
</div>
<div class="tabelAllTopUnit">
<div class="costTopUnit">出场时间</div>
<div class="costTopUnit">出场日期</div>
<div class="costRightUnit">
{{ actualTimeAndName || '请先选择班组并查询' }}
</div>
@ -137,6 +137,8 @@
<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="leaseDays" :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="overDay" :show-overflow-tooltip="true"/>
<el-table-column label="超期费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
<template slot-scope="scope" v-show="scope.row.costs">
@ -364,7 +366,7 @@ export default {
},
/** 项目部选择变化，加载工程 */
async handleDepartChange() {
this.queryParams.proName = null // 清空工程已选
this.selectedProject = null // 清空工程已选
this.projectList = [] // 清空原有下拉
try {