Compare commits

...

12 Commits

Author SHA1 Message Date
sunhaoyuan
d36572c01b Merge branch 'rescue' 2025-11-28 16:41:24 +08:00
sunhaoyuan
e6703288a4 Merge remote-tracking branch 'origin/master' 2025-11-28 16:39:08 +08:00
sunhaoyuan
1676510d4d 11.28 2025-11-28 16:38:30 +08:00
sunhaoyuan
7a6baac3e7 Merge remote-tracking branch 'origin/master' 2025-11-24 17:35:07 +08:00
sunhaoyuan
bd92fdc7e6 Merge branch 'master' of http://114.55.243.137:6688/dianliang/lanan-system-vue 2025-11-24 17:10:37 +08:00
xuyuncong
bf8e197914 更新 2025-11-24 17:04:43 +08:00
xuyuncong
9a1929bc58 更新 2025-11-24 17:04:42 +08:00
xuyuncong
6d9289cca9 更新 2025-11-24 17:04:42 +08:00
xuyuncong
a238b5502c 更新 2025-11-24 17:04:42 +08:00
xuyuncong
bb28d0922c 更新 2025-11-24 17:04:41 +08:00
xuyuncong
f14bf7149b 更新 2025-11-24 17:04:40 +08:00
xuyuncong
ecbc2d1fa8 更新 2025-11-24 17:04:40 +08:00
2 changed files with 7 additions and 5 deletions

View File

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