Merge remote-tracking branch 'websoft/master'

This commit is contained in:
2026-08-25 16:14:02 +08:00
16 changed files with 262 additions and 276 deletions
@@ -2165,6 +2165,7 @@
show-close
:class="[
'business-crud-page__detail-dialog',
$attrs.option?.dialogCustomClass,
{ 'is-transport-plan-detail': isTransportPlanDetailLayout },
]"
>
@@ -4997,6 +4998,7 @@
@closed="cargoImportRows = []"
>
<div class="business-crud-page__cargo-import">
<div class="business-crud-page__cargo-import-card">
<el-upload
action="#"
accept=".xls,.xlsx"
@@ -5011,6 +5013,7 @@
</template>
</el-upload>
<el-button type="primary" @click="handleCargoImportTemplate">点击下载模板</el-button>
</div>
</div>
<template #footer>
<el-button :disabled="cargoImportLoading" @click="closeCargoImportDialog">关闭</el-button>
@@ -13248,6 +13251,18 @@ export default {
}
}
&__cargo-import {
padding: 0 !important;
}
&__cargo-import-card {
background: #fff;
border-radius: 6px;
padding: 24px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
width: 90%;
}
&__cargo-table {
width: 100%;
min-width: 0;
+2 -1
View File
@@ -106,6 +106,7 @@
</template>
<template v-else>
<div class="archive-page-form__title">{{ formPageTitle }}</div>
<el-form
ref="contractForm"
:model="form"
@@ -2132,7 +2133,7 @@ export default {
}
.contract-manage-form {
padding: 12px 16px 24px;
//padding: 12px 16px 24px;
background: #f5f6fa;
&__section {
+1 -1
View File
@@ -1072,7 +1072,7 @@ export default {
editBtn: false,
delBtn: false,
// 操作列收窄:本项目操作按钮较少,320px 过宽,调整为 220px(链接会自动换行兜底)
menuWidth: 180,
menuWidth: 200,
column: (option.column || []).map(column => ({
...column,
display: false,
@@ -666,4 +666,8 @@ export default {
white-space: normal;
line-height: 1.2;
}
.temporary-credit-limit-dialog .business-crud-page__detail-content .el-descriptions__label {
width: 180px !important;
}
</style>