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/views/business/process-config.vue
This commit is contained in:
b2894lxlx
2026-08-14 14:19:48 +08:00
parent 574b1a52f4 a69a2efe45
commit c6217fcff7
15 changed files with 119 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/business/components/business-crud-page.vue
+5 -6
View File
@@ -12704,10 +12704,9 @@ export default {
&__contract-expiry-search {
display: flex;
order: -1;
align-items: center;
gap: 8px;
margin-right: auto;
margin-left: auto;
min-width: 0;
:deep(.el-select) {
@@ -14232,7 +14231,7 @@ export default {
min-width: 56px;
height: 22px;
margin: 0 14px;
border-bottom: 3px solid #303133;
border-bottom: 4px solid #e4e7ed;
}
&__transport-plan-waybill-card {
@@ -14337,7 +14336,7 @@ export default {
&__waybill-summary-grid {
display: grid;
grid-template-columns: repeat(4, minmax(130px, 1fr)) minmax(360px, 2fr);
grid-template-columns: repeat(4, minmax(130px, 1fr)) minmax(420px, 2.5fr);
gap: 16px 24px;
}
@@ -14410,9 +14409,9 @@ export default {
&::before {
flex: 1;
order: 2;
height: 2px;
height: 4px;
content: '';
background: #606266;
background: #e4e7ed;
}
b.end {
src/views/business/components/master-order-detail.vue
+1 -1
View File
@@ -134,7 +134,7 @@ export default {
.route-map__node { display: grid; flex: 0 0 150px; justify-items: center; gap: 6px; text-align: center; strong { font-size: 16px; white-space: nowrap; } small { color: #606266; white-space: nowrap; } }
.route-map__progress { color: #409eff !important; }
.route-badge { display: inline-flex; width: 32px; height: 32px; align-items: center; justify-content: center; border-radius: 4px; background: #67c23a; color: #fff; font-weight: 600; &.start { background: #409eff; } &.end { background: #e6a23c; } }
.route-map__line { flex: 1 0 64px; min-width: 64px; height: 32px; border-bottom: 2px solid #606266; }
.route-map__line { flex: 1 0 64px; min-width: 64px; height: 32px; border-bottom: 6px solid #e4e7ed; }
.execution-detail-heading { padding: 20px 24px 12px; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } }
.segment-detail { padding: 16px 24px; border-top: 1px solid #eff1f7; header { display: flex; align-items: center; justify-content: space-between; margin: -16px -24px 8px; padding: 12px 24px; cursor: pointer; background: #fafbfc; h3 { display: flex; min-width: 0; align-items: center; flex-wrap: wrap; gap: 12px; margin: 0; font-size: 16px; } em { color: #409eff; font-style: normal; } } }
.segment-detail__progress { color: #606266; font-size: 14px; font-weight: 400; }
src/views/business/components/master-order-dispatch.vue
+1 -1
View File
@@ -672,7 +672,7 @@ export default {
.route-overview { display: flex; align-items: flex-start; justify-content: flex-end; padding-top: 8px; overflow-x: auto; }
.route-overview__node { display: grid; flex: 0 0 130px; justify-items: center; gap: 6px; text-align: center; strong { font-size: 16px; white-space: nowrap; } small { color: #606266; white-space: nowrap; } }
.route-badge { display: inline-flex; width: 32px; height: 32px; align-items: center; justify-content: center; border-radius: 4px; background: #67c23a; color: #fff; font-weight: 600; &.start { background: #409eff; } &.end { background: #e6a23c; } }
.route-overview__line { flex: 1 0 56px; min-width: 56px; height: 32px; margin-top: 0; border-bottom: 2px solid #606266; }
.route-overview__line { flex: 1 0 56px; min-width: 56px; height: 32px; margin-top: 0; border-bottom: 6px solid #e4e7ed; }
.segment-header { min-height: 46px; padding: 0 20px; border-bottom: 1px solid #eff1f7; font-weight: 600; em { color: #409eff; font-style: normal; } }
.segment-content { padding: 16px 24px; }
.dispatch-form { :deep(.el-form-item) { margin-bottom: 16px; } :deep(.el-input), :deep(.el-select), :deep(.el-date-editor), :deep(.el-input-number) { width: 100%; } }