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/business/process-config.js
#	src/views/business/process-config.vue
#	src/views/vehicle/customer-archive.vue
This commit is contained in:
b2894lxlx
2026-08-06 17:41:03 +08:00
parent e6d4edf362 1862115e1d
commit 1e4de76978
9 changed files with 1392 additions and 1278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2115,7 +2115,7 @@
</div>
</div>
<div class="business-crud-page__dispatch-summary">
<div class="business-crud-page__dispatch-summary-left">
<section-card title="基本信息">
<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>
@@ -2171,8 +2171,9 @@
</div>
</div>
</div>
</div>
<div class="business-crud-page__dispatch-route">
</section-card>
<section-card title="收发货路线">
<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">
@@ -2197,18 +2198,18 @@
<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 class="business-crud-page__dispatch-route-contact">
{{ parseDispatchRoutePoint(dispatchRow, 'end').contact || '-' }}
</div>
</div>
</div>
</div>
</div>
</section-card>
</div>
</div>
<div class="business-crud-page__dispatch-list">
<div class="business-crud-page__dispatch-list-head">
<div class="business-crud-page__dispatch-list-title">待调度列表</div>
<section-card title="待调度列表">
<template #extra>
<el-button
type="primary"
:disabled="dispatchSummaryRemainingQuantity <= 0"
@@ -2216,10 +2217,10 @@
>
新增
</el-button>
<div class="business-crud-page__dispatch-list-summary">
<span class="business-crud-page__dispatch-list-summary">
{{ dispatchSummaryText }}
</div>
</div>
</span>
</template>
<el-table
:data="dispatchRows"
border
@@ -2312,7 +2313,7 @@
align="center"
show-overflow-tooltip
/>
<el-table-column label="操作" width="180" align="center" fixed="right">
<el-table-column label="操作" width="220" align="center" fixed="right">
<template #default="{ row, $index }">
<div class="business-crud-page__dispatch-actions">
<el-link type="primary" @click="handleDispatchEditRow(row, $index)">编辑</el-link>
@@ -2321,7 +2322,7 @@
</template>
</el-table-column>
</el-table>
</div>
</section-card>
</div>
<template #footer>
<div class="business-crud-page__dispatch-footer">
@@ -9304,7 +9305,10 @@ export default {
}
:deep(.el-dialog__body) {
padding: 0;
padding: 16px;
background: #f5f6fa;
max-height: calc(100vh - 140px);
overflow-y: auto;
}
}
@@ -9315,8 +9319,7 @@ export default {
}
&__dispatch-top {
padding: 22px 32px 14px;
border-bottom: 1px solid #e9edf5;
padding: 22px 0 0;
}
&__dispatch-heading {
@@ -9452,14 +9455,25 @@ export default {
}
&__dispatch-route-line {
position: relative;
width: 72px;
height: 4px;
background: #3b3b3b;
border-radius: 999px;
}
height: 2px;
background-image: linear-gradient(
to right,
var(--el-color-primary) 0,
var(--el-color-primary) 6px,
transparent 6px,
transparent 10px
);
&__dispatch-list {
padding: 12px 18px 18px;
&::after {
content: '';
position: absolute;
right: -1px;
top: -4px;
border: 5px solid transparent;
border-left-color: var(--el-color-primary);
}
}
&__dispatch-list-head {
@@ -9513,6 +9527,9 @@ export default {
justify-content: flex-end;
gap: 12px;
padding-right: 0;
padding-top: 16px;
margin-top: 16px;
border-top: 1px solid #e9edf5;
}
&__dispatch-item-dialog {