Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/vehicle/customer-archive.vue
This commit is contained in:
2026-08-11 15:26:57 +08:00
5 changed files with 47 additions and 13 deletions
+21 -3
View File
@@ -217,8 +217,8 @@
// 1) 所有弹窗内容区统一灰底 + 16px 内边距(与 project-apply 一致,避免内容贴边)
.el-dialog__body {
background-color: #f5f6fa;
padding: 16px;
background-color: #f3f3f3;
padding: 8px;
}
// 2) Avue 默认弹窗表单自动包成白卡,无需逐页改 option 即统一标准
@@ -249,6 +249,24 @@
}
}
// 3b) Avue 弹窗内自定义标题分组(formslot + dialog-section-title)渲染为白卡
.el-dialog .avue-form__group:has(.dialog-section-title) {
background: #fff;
border-radius: 6px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
padding: 16px;
margin-bottom: 16px;
.avue-form__group--title {
padding: 0 !important;
margin-bottom: 12px;
}
.avue-form__row {
padding: 0 !important;
}
}
// 4) 弹窗内表单项默认上下间距 16px(覆盖默认 18px / 22px
.el-dialog .el-form-item {
margin-bottom: 16px;
@@ -259,7 +277,7 @@
background: #fff;
border-radius: 6px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
margin-bottom: 16px;
margin-bottom: 8px;
overflow: hidden;
&:last-child {
@@ -261,7 +261,7 @@
<div
class="dialog-section-title dialog-section-title--action business-crud-page__shipping-title"
>
<span>收发货信息</span>
<span>收发货信息1</span>
<el-link
v-if="!dialogReadonly"
type="primary"
@@ -2153,7 +2153,7 @@
</el-descriptions>
</section-card>
<section-card v-if="config.enableTransportPlanForm" title="货物信息">
<el-table :data="transportCargoRows" border empty-text="暂无货物信息">
<el-table :data="transportCargoRows" empty-text="暂无货物信息">
<el-table-column type="index" label="序号" width="70" align="center" />
<el-table-column prop="cargoName" label="货物名称" min-width="180" />
<el-table-column prop="cargoType" label="货物类型" min-width="150" />
@@ -2169,7 +2169,7 @@
</el-table>
</section-card>
<section-card v-if="config.enableAttachmentTable" :title="config.attachmentTitle || '附件'">
<el-table :data="attachmentRows" border empty-text="暂无附件">
<el-table :data="attachmentRows" empty-text="暂无附件">
<el-table-column type="index" label="序号" width="70" align="center" />
<el-table-column label="文件名" min-width="260">
<template #default="{ row }">{{ row.originalName || row.name || '-' }}</template>
@@ -10674,10 +10674,6 @@ export default {
white-space: pre-wrap;
word-break: break-word;
}
:deep(.el-table) {
border-color: #eff1f7;
}
}
}