feat(core): 统一全站时间列加排序并优化司机管理显示
- 所有含时间的列表列(创建时间、更新时间、起止日期等)均增加排序功能,兼顾Avue option和手写el-table-column - 司机管理「姓名身份证号」列拆分为独立的「姓名」「身份证号」两列,分别使用插槽渲染 - 修复车辆/船舶/司机管理「所属组织」列前导空格问题,value 使用无缩进原始标签 - 调整司机管理页到期筛选标签位置,移至搜索菜单行并优化样式,删除过渡占位筛选字段 - 增加组织名称列自定义插槽,去除已入库旧数据的前导空白 - 更新相关样式,删除无用样式代码,增加表格列排序样式支持
This commit is contained in:
@@ -41,7 +41,7 @@
|
||||
>批量删除
|
||||
</el-button>
|
||||
</template>
|
||||
<template #expireStatus-search>
|
||||
<template #search-menu>
|
||||
<div class="driver-page__expiry-tags">
|
||||
<el-check-tag
|
||||
v-for="item in expiryTagOptions"
|
||||
@@ -54,10 +54,13 @@
|
||||
</div>
|
||||
</template>
|
||||
<template #driverName="{ row }">
|
||||
<div class="driver-page__identity">
|
||||
<el-link type="primary" @click="openDriver(row, true)">{{ row.driverName }}</el-link>
|
||||
<span>{{ row.idCardNo || '-' }}</span>
|
||||
</div>
|
||||
<el-link type="primary" @click="openDriver(row, true)">{{ row.driverName }}</el-link>
|
||||
</template>
|
||||
<template #idCardNo="{ row }">
|
||||
<span>{{ row.idCardNo || '-' }}</span>
|
||||
</template>
|
||||
<template #organizationName="{ row }">
|
||||
{{ String(row.organizationName || '').replace(/^[\s\u3000]+/, '') }}
|
||||
</template>
|
||||
<template #status="{ row }">
|
||||
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
|
||||
@@ -756,11 +759,11 @@ export default {
|
||||
formatDeptOptions(tree = [], level = 0) {
|
||||
const result = [];
|
||||
tree.forEach(item => {
|
||||
const label = item.title || item.deptName || item.name;
|
||||
const rawLabel = item.title || item.deptName || item.name;
|
||||
result.push({
|
||||
label: `${' '.repeat(level)}${label}`,
|
||||
value: label,
|
||||
rawLabel: label,
|
||||
label: `${' '.repeat(level)}${rawLabel}`,
|
||||
value: rawLabel,
|
||||
rawLabel,
|
||||
id: item.id || item.value,
|
||||
});
|
||||
if (item.children && item.children.length) {
|
||||
@@ -1341,18 +1344,14 @@ export default {
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.driver-page {
|
||||
&__identity {
|
||||
display: flex;
|
||||
gap: 4px;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
&__expiry-tags {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
width: 100%;
|
||||
order: -1;
|
||||
margin-right: auto;
|
||||
min-width: 0;
|
||||
|
||||
:deep(.el-check-tag) {
|
||||
margin: 0;
|
||||
@@ -1441,11 +1440,4 @@ export default {
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
@media (max-width: 1200px) {
|
||||
.driver-page {
|
||||
&__expiry-tags {
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user