b2894lxlx/tms-erp-web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'websoft/master'

Browse Source 
# Conflicts:
#	src/option/transportCapacity/transport-ship.js
#	src/option/transportCapacity/transport-vehicle.js
This commit is contained in:
b2894lxlx
2026-08-07 08:28:42 +08:00
parent 6a02e9126b bb580b2bfc
commit 52d4b6b486
24 changed files with 300 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/option/base/common-address.js
View File

@@ -28,7 +28,7 @@ export const createOption = () => ({
addBtn: false,
dialogClickModal: false,
menuFixed: 'right',
menuWidth: 220,
menuWidth: 180,
column: [
{
label: '地址名称',

6
src/option/business/process-config.js
View File

@@ -6,7 +6,6 @@ import {
selectRule,
textRule,
} from './common';
import { applyTableMenuWidth } from '@/utils/table-menu';
export const config = {
title: '过程配置',
@@ -20,7 +19,7 @@ export const config = {
deleteStatus: [0, 2],
};
export const option = applyTableMenuWidth({
export const option = {
...createCrudOption([
{
label: '',
@@ -179,4 +178,5 @@ export const option = applyTableMenuWidth({
updateBtnText: '保存',
dialogTop: '10px',
dialogWidth: '96%',
}, 5);
menuWidth: 200,
};

2
src/option/transportCapacity/driver.js
View File

@@ -16,7 +16,7 @@ export const option = {
editBtn: false,
delBtn: false,
viewBtn: false,
menuWidth: 220,
menuWidth: 180,
dialogClickModal: false,
column: [
{

2
src/option/vehicle/accident-record.js
View File

@@ -53,7 +53,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车船类型',

2
src/option/vehicle/annual-inspection-record.js
View File

@@ -52,7 +52,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车船类型',

2
src/option/vehicle/etc-record.js
View File

@@ -42,7 +42,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
menuFixed: 'right',
column: [
{

2
src/option/vehicle/insurance-record.js
View File

@@ -50,7 +50,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车船类型',

2
src/option/vehicle/mileage-record.js
View File

@@ -38,7 +38,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
menuFixed: 'right',
column: [
{

2
src/option/vehicle/oil-electric-record.js
View File

@@ -39,7 +39,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
menuFixed: 'right',
column: [
{

2
src/option/vehicle/other-expense-record.js
View File

@@ -50,7 +50,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
menuFixed: 'right',
column: [
{

2
src/option/vehicle/tire-replacement-record.js
View File

@@ -43,7 +43,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车牌号',

2
src/option/vehicle/transport-change-record.js
View File

@@ -30,7 +30,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
menuFixed: 'right',
column: [
{

2
src/option/vehicle/violation-record.js
View File

@@ -53,7 +53,7 @@ export const option = {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车船类型',

18
src/styles/element-ui.scss
View File

@@ -567,6 +567,24 @@
gap: 8px;
}
// 全站统一：表格操作列文字链接统一为主色（蓝色）
// 覆盖 Avue #menu 槽位与手写表格操作列中 el-link 的 warning / success / danger 等类型，
// 同时统一 hover / active / disabled 态，保证全站操作列风格一致。
// 选择器同时覆盖 Avue 行菜单（.avue-crud__menu）与任意含 el-link 的表格体单元格（手写操作列）。
.avue-crud__menu .el-link,
.el-table .el-table__body .cell:has(.el-link) .el-link {
--el-link-text-color: var(--el-color-primary);
--el-link-hover-text-color: var(--el-color-primary-light-3);
--el-link-active-text-color: var(--el-color-primary-dark-2);
--el-link-disabled-text-color: var(--el-color-primary-light-5);
}
// 全站统一：去除操作列 el-link 默认 margin，避免与 8px gap 叠加导致文字间距过宽
.avue-crud .avue-crud__menu .el-link,
.el-table .el-table__body .cell:not(.avue-crud__menu):has(> .el-link) .el-link {
margin: 0;
}
.avue-crud__menu > .el-button,
.avue-crud__menu > .el-dropdown {
margin: 0;

249
src/views/business/components/business-crud-page.vue
View File

@@ -2102,7 +2102,6 @@
<span class="business-crud-page__dispatch-heading-name">
{{ dispatchDialogTitle }}
</span>
<span class="business-crud-page__dispatch-heading-split">|</span>
<span class="business-crud-page__dispatch-heading-no">
{{ dispatchDialogNo || '-' }}
</span>
@@ -2114,8 +2113,9 @@
</el-tag>
</div>
</div>
<div class="business-crud-page__dispatch-summary">
<section-card title="基本信息">
<section-card title="基本信息" class="business-crud-page__dispatch-summary-card">
<div class="business-crud-page__dispatch-summary-grid">
<div class="business-crud-page__dispatch-summary-item">
<div class="business-crud-page__dispatch-summary-label">客户</div>
@@ -2135,22 +2135,22 @@
{{ dispatchRow.contractName || dispatchRow.contractNo || '-' }}
</div>
</div>
<div class="business-crud-page__dispatch-summary-item">
<div class="business-crud-page__dispatch-summary-label">货物信息</div>
<div class="business-crud-page__dispatch-summary-value">
{{ dispatchPlanCargoInfo || '-' }}
</div>
</div>
<div class="business-crud-page__dispatch-summary-item">
<div class="business-crud-page__dispatch-summary-label">计划执行时间</div>
<div class="business-crud-page__dispatch-summary-value">
{{
[dispatchRow.planStartDate, dispatchRow.planEndDate]
.filter(Boolean)
.join('-') || '-'
.join(' ~ ') || '-'
}}
</div>
</div>
<div class="business-crud-page__dispatch-summary-item is-wide">
<div class="business-crud-page__dispatch-summary-label">货物信息</div>
<div class="business-crud-page__dispatch-summary-value">
{{ dispatchPlanCargoInfo || '-' }}
</div>
</div>
<div
class="business-crud-page__dispatch-summary-item business-crud-page__dispatch-summary-item--attachments"
>
@@ -2172,40 +2172,43 @@
</div>
</div>
</section-card>
<section-card title="收发货路线">
<section-card title="收发货路线" class="business-crud-page__dispatch-route-card">
<div class="business-crud-page__dispatch-route">
<div class="business-crud-page__dispatch-route-item">
<span class="business-crud-page__dispatch-route-badge is-start">起</span>
<div class="business-crud-page__dispatch-route-body">
<div class="business-crud-page__dispatch-route-title">
{{ parseDispatchRoutePoint(dispatchRow, 'start').name || '-' }}
<div class="business-crud-page__dispatch-route-item">
<span class="business-crud-page__dispatch-route-badge is-start">起</span>
<div class="business-crud-page__dispatch-route-body">
<div class="business-crud-page__dispatch-route-title">
{{ parseDispatchRoutePoint(dispatchRow, 'start').name || '-' }}
</div>
<div class="business-crud-page__dispatch-route-address">
{{ parseDispatchRoutePoint(dispatchRow, 'start').address || '-' }}
</div>
<div class="business-crud-page__dispatch-route-contact">
{{ parseDispatchRoutePoint(dispatchRow, 'start').contact || '-' }}
</div>
</div>
<div class="business-crud-page__dispatch-route-address">
{{ parseDispatchRoutePoint(dispatchRow, 'start').address || '-' }}
</div>
<div class="business-crud-page__dispatch-route-contact">
{{ parseDispatchRoutePoint(dispatchRow, 'start').contact || '-' }}
</div>
<div class="business-crud-page__dispatch-route-vehicle">
<el-icon><Van /></el-icon>
</div>
<div class="business-crud-page__dispatch-route-item">
<span class="business-crud-page__dispatch-route-badge is-end">终</span>
<div class="business-crud-page__dispatch-route-body">
<div class="business-crud-page__dispatch-route-title">
{{ parseDispatchRoutePoint(dispatchRow, 'end').name || '-' }}
</div>
<div class="business-crud-page__dispatch-route-address">
{{ parseDispatchRoutePoint(dispatchRow, 'end').address || '-' }}
</div>
<div class="business-crud-page__dispatch-route-contact">
{{ parseDispatchRoutePoint(dispatchRow, 'end').contact || '-' }}
</div>
</div>
</div>
</div>
<div class="business-crud-page__dispatch-route-line" />
<div class="business-crud-page__dispatch-route-item">
<span class="business-crud-page__dispatch-route-badge is-end">终</span>
<div class="business-crud-page__dispatch-route-body">
<div class="business-crud-page__dispatch-route-title">
{{ parseDispatchRoutePoint(dispatchRow, 'end').name || '-' }}
</div>
<div class="business-crud-page__dispatch-route-address">
{{ parseDispatchRoutePoint(dispatchRow, 'end').address || '-' }}
</div>
<div class="business-crud-page__dispatch-route-contact">
{{ parseDispatchRoutePoint(dispatchRow, 'end').contact || '-' }}
</div>
</div>
</div>
</div>
</section-card>
</div>
</section-card>
</div>
</div>
<section-card title="待调度列表">
@@ -3866,6 +3869,11 @@ export default {
type: Object,
default: () => ({ column: [] }),
},
// 可选：固定操作列宽度；不传则按按钮数量自动估算（沿用既有逻辑）
menuWidth: {
type: Number,
default: null,
},
},
data() {
return {
@@ -3913,7 +3921,11 @@ export default {
defaultDialogButtons: null,
contractCreateActionLoading: '',
transportPlanCreateActionLoading: '',
option: this.cloneOption(this.crudOption, estimateMenuButtonCount(this.config)),
option: (() => {
const opt = this.cloneOption(this.crudOption, estimateMenuButtonCount(this.config));
if (this.menuWidth != null) opt.menuWidth = this.menuWidth;
return opt;
})(),
selectedProjectId: '',
projectOptions: [],
projectLoading: false,
@@ -9319,11 +9331,11 @@ export default {
}
&__dispatch-top {
padding: 22px 0 0;
padding: 0;
}
&__dispatch-heading {
margin-bottom: 20px;
margin-bottom: 14px;
}
&__dispatch-heading-title {
@@ -9334,51 +9346,60 @@ export default {
}
&__dispatch-heading-name {
font-size: 22px;
font-size: 18px;
font-weight: 600;
color: #303133;
}
&__dispatch-heading-split {
font-size: 20px;
color: #606266;
}
&__dispatch-heading-no {
font-size: 15px;
color: #303133;
font-size: 14px;
color: #606266;
}
&__dispatch-summary {
display: grid;
grid-template-columns: minmax(0, 1.15fr) minmax(520px, 1fr);
gap: 32px;
align-items: start;
grid-template-columns: minmax(0, 2fr) minmax(0, 3fr);
gap: 16px;
align-items: stretch;
margin-bottom: 12px;
}
&__dispatch-summary-card,
&__dispatch-route-card {
display: flex;
flex-direction: column;
:deep(.section-card__body) {
flex: 1;
}
}
&__dispatch-summary-grid {
display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr));
column-gap: 48px;
row-gap: 18px;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 12px 16px;
}
&__dispatch-summary-item {
min-width: 0;
&.is-wide {
grid-column: span 2;
}
}
&__dispatch-summary-label {
margin-bottom: 8px;
font-size: 14px;
color: #666;
font-weight: 500;
margin-bottom: 4px;
font-size: 12px;
color: #909399;
line-height: 1.4;
}
&__dispatch-summary-value {
min-height: 24px;
font-size: 15px;
min-height: 20px;
font-size: 14px;
line-height: 1.45;
color: #333;
color: #303133;
word-break: break-word;
}
@@ -9388,24 +9409,30 @@ export default {
&__dispatch-attachment-link {
display: inline-block;
margin-right: 22px;
margin-bottom: 6px;
margin-right: 16px;
margin-bottom: 4px;
font-size: 14px;
}
&__dispatch-route {
position: relative;
display: grid;
grid-template-columns: minmax(0, 1fr) 72px minmax(0, 1fr);
gap: 24px;
grid-template-columns: minmax(0, 1fr) 56px minmax(0, 1fr);
gap: 40px;
align-items: center;
justify-items: center;
min-height: 200px;
//height: 100%;
margin: 20px 0;
}
&__dispatch-route-item {
display: flex;
align-items: flex-start;
gap: 16px;
max-width: 100%;
align-items: center;
gap: 12px;
max-width: 90%;
padding: 16px;
min-height: 80px;
border: 1px dashed #e3e4ec;
border-radius: 12px;
}
&__dispatch-route-badge {
@@ -9413,12 +9440,13 @@ export default {
flex: 0 0 auto;
align-items: center;
justify-content: center;
width: 46px;
height: 46px;
border-radius: 6px;
width: 40px;
height: 40px;
border-radius: 50%;
color: #fff;
font-size: 16px;
font-weight: 600;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
&.is-start {
background: #2a92ff;
@@ -9430,49 +9458,67 @@ export default {
}
&__dispatch-route-body {
max-width: 340px;
text-align: center;
min-width: 0;
text-align: left;
}
&__dispatch-route-title {
font-size: 22px;
line-height: 1.25;
font-size: 18px;
line-height: 1.35;
color: #303133;
font-weight: 600;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
&__dispatch-route-address {
margin-top: 12px;
font-size: 15px;
line-height: 1.45;
color: #333;
margin-top: 4px;
font-size: 13px;
line-height: 1.5;
color: #606266;
}
&__dispatch-route-contact {
margin-top: 10px;
font-size: 15px;
color: #333;
margin-top: 2px;
font-size: 13px;
color: #909399;
}
&__dispatch-route-line {
&__dispatch-route-vehicle {
position: relative;
width: 72px;
height: 2px;
background-image: linear-gradient(
to right,
var(--el-color-primary) 0,
var(--el-color-primary) 6px,
transparent 6px,
transparent 10px
);
display: flex;
align-items: center;
justify-content: center;
width: 44px;
height: 44px;
margin: 0 auto;
border-radius: 50%;
background: #fff;
border: 2px solid var(--el-color-primary);
color: var(--el-color-primary);
font-size: 22px;
box-shadow: 0 2px 8px rgba(64, 158, 255, 0.18);
&::before,
&::after {
content: '';
position: absolute;
right: -1px;
top: -4px;
border: 5px solid transparent;
border-left-color: var(--el-color-primary);
top: 50%;
width: 20px;
height: 0;
border-top: 2px dashed var(--el-color-primary-light-5);
transform: translateY(-50%);
}
&::before {
right: 100%;
margin-right: 6px;
}
&::after {
left: 100%;
margin-left: 6px;
}
}
@@ -9525,7 +9571,7 @@ export default {
&__dispatch-footer {
display: flex;
justify-content: flex-end;
gap: 12px;
gap: 10px;
padding-right: 0;
padding-top: 16px;
margin-top: 16px;
@@ -9850,4 +9896,7 @@ export default {
}
}
}
.section-card{
margin-bottom: 0 !important;
}
</style>

2
src/views/business/contract-manage.vue
View File

@@ -1,5 +1,5 @@
<template>
<business-crud-page :api="api" :config="config" :crud-option="option" />
<business-crud-page :api="api" :config="config" :crud-option="option" :menu-width="245" />
</template>
<script>

24
src/views/business/project-apply.vue
View File

@@ -695,7 +695,6 @@ import { getDictionary as getSystemDictionary } from '@/api/system/dict';
import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
import { getList as getUserList } from '@/api/system/user';
import { getToken } from '@/utils/auth';
import { applyTableMenuWidth } from '@/utils/table-menu';
import { downloadFileByUrl, downloadXls } from '@/utils/util';
import { mapGetters } from 'vuex';
import NProgress from 'nprogress';
@@ -1036,18 +1035,17 @@ export default {
},
methods: {
buildTableOption() {
return applyTableMenuWidth(
{
...option,
dialogType: 'dialog',
addBtn: false,
viewBtn: false,
editBtn: false,
delBtn: false,
column: (option.column || []).map(column => ({ ...column, display: false })),
},
4
);
return {
...option,
dialogType: 'dialog',
addBtn: false,
viewBtn: false,
editBtn: false,
delBtn: false,
// 操作列收窄：本项目操作按钮较少，320px 过宽，调整为 220px（链接会自动换行兜底）
menuWidth: 180,
column: (option.column || []).map(column => ({ ...column, display: false })),
};
},
hasPermission(code) {
return this.isAdmin || this.validData(this.permission && this.permission[code], false);

2
src/views/business/shipping-template.vue
View File

@@ -1,5 +1,5 @@
<template>
<business-crud-page :api="api" :config="config" :crud-option="option" />
<business-crud-page :api="api" :config="config" :crud-option="option" :menu-width="270" />
</template>
<script>

2
src/views/business/temporary-credit-limit.vue
View File

@@ -1,5 +1,5 @@
<template>
<business-crud-page :api="api" :config="config" :crud-option="option" />
<business-crud-page :api="api" :config="config" :crud-option="option" :menu-width="270" />
</template>
<script>

2
src/views/business/transport-plan.vue
View File

@@ -1,5 +1,5 @@
<template>
<business-crud-page :api="api" :config="config" :crud-option="option" />
<business-crud-page :api="api" :config="config" :crud-option="option" :menu-width="220" />
</template>
<script>

2
src/views/vehicle/maintenance-plan.vue
View File

@@ -206,7 +206,7 @@ export default {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车船类型',

2
src/views/vehicle/maintenance-record.vue
View File

@@ -193,7 +193,7 @@ export default {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车船类型',