Compare commits

..

No commits in common. "master" and "repair" have entirely different histories.

2 changed files with 5 additions and 7 deletions

View File

@ -50,7 +50,7 @@
start-placeholder="开始日期" end-placeholder="结束日期" @change="fetchDriverStats" class="full-width-picker" />
<!-- 司机汇总表 -->
<el-table :data="driverList" row-key="_rowKey" border stripe :header-cell-style="tableHeaderStyle"
<el-table :data="driverList" row-key="driverId" border stripe :header-cell-style="tableHeaderStyle"
:cell-style="cellCenter" :expand-row-keys="expandedRows" @expand-change="onExpandChange">
<!-- 司机展开行渠道明细 -->
<el-table-column type="expand">
@ -305,13 +305,12 @@ export default {
methods: {
/** 手风琴式展开:只保留当前这一行,其他全部收起 */
onExpandChange(row) {
const key = row._rowKey //
//
if (this.expandedRows[0] === key) {
if (this.expandedRows[0] === row.driverId) {
this.expandedRows = []
} else {
//
this.expandedRows = [key]
this.expandedRows = [row.driverId]
}
},
@ -360,8 +359,7 @@ export default {
const { data } = await request.get('/app/rescueInfo/getRescueStatisticsInfoByDriver', { params });
/* ③③ 后端金额单位是“分” => 前端显示“元”,同时把字段名转成表格用的 */
this.driverList = (data || []).map((driver,idx) => ({
_rowKey: `${driver.driverId}-${idx}`, // 👈
this.driverList = (data || []).map(driver => ({
driverId: driver.driverId,
driverName: driver.driverName,

View File

@ -304,7 +304,7 @@
</el-form-item>
<!-- 渠道 -->
<el-form-item label="渠道">
<el-select v-model="batchQuery.channel" placeholder="请选择渠道" clearable
<el-select v-model="batchQuery.channel" placeholder="请选择渠道" clearable @change="handleBatchChannelChange"
style="width:160px">
<el-option v-for="c in channelList" :key="c.id" :label="c.name" :value="c.name" />
</el-select>