Merge remote-tracking branch 'websoft/master'

This commit is contained in:
2026-08-06 02:57:58 +08:00
4 changed files with 87 additions and 34 deletions

View File

@@ -225,6 +225,7 @@
.avue-crud__dialog .el-dialog__body {
max-height: calc(100vh - 200px);
overflow-y: auto;
//background: #f5f6fa;
}
// 统一表格线条颜色
@@ -350,12 +351,7 @@
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
}
.el-pagination .btn-prev,
.el-pagination .btn-next,
.erp-pagination-first,
.erp-pagination-last {
min-width: 54px;
}
// 上一页 / 下一页 箭头按钮与页码按钮等宽,不再单独加宽
.el-pagination .el-pager {
gap: 6px;
@@ -363,18 +359,7 @@
padding: 0;
}
.el-pagination .btn-prev .el-icon,
.el-pagination .btn-next .el-icon {
display: none;
}
.el-pagination .btn-prev::before {
content: '上一页';
}
.el-pagination .btn-next::before {
content: '下一页';
}
// 上一页 / 下一页 改为原生箭头图标:不再隐藏原生图标,也不再注入「上一页 / 下一页」文字
.el-pagination.is-background .el-pager li.is-active,
.el-pagination .el-pager li.is-active {
@@ -460,14 +445,7 @@
color: #fff;
}
// 全站统一:隐藏分页的「上一页 / 下一页」原生导航按钮
// (「首页 / 尾页」由 src/utils/pagination.js 的全局增强器统一不再注入)
.el-pagination {
.btn-prev,
.btn-next {
display: none !important;
}
}
// 全站统一:分页展示「上一页 / 下一页」原生箭头图标(不再隐藏;首页 / 尾页仍不注入)
// 全站统一:隐藏操作栏按钮前的图标
.avue-crud__menu .el-button--text i,

View File

@@ -1736,7 +1736,7 @@ export default {
<style lang="scss" scoped>
.project-apply-form {
padding: 0 8px;
padding: 0;
:deep(.el-input),
:deep(.el-select),
@@ -1754,12 +1754,30 @@ export default {
line-height: 20px;
}
// 分区标题融入白色卡片顶部(与下方内容块拼成一张完整卡片)
:deep(.dialog-section-title:not(.project-apply-form__material-title)) {
position: relative;
z-index: 1;
display: flex;
align-items: center;
gap: 8px;
background: #fff;
border-radius: 6px 6px 0 0;
padding: 14px 16px 4px;
margin-bottom: 0;
font-weight: 500;
}
&__grid {
display: grid;
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
column-gap: 72px;
row-gap: 0;
margin-bottom: 8px;
margin-bottom: 16px;
background: #fff;
border-radius: 0 0 6px 6px;
padding: 14px 16px 4px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
}
&__picker-icon {
@@ -1781,7 +1799,11 @@ export default {
&__table {
width: 100%;
margin-bottom: 24px;
margin-bottom: 16px;
background: #fff;
border-radius: 0 0 6px 6px;
padding: 12px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
:deep(.el-table__header th) {
background: #f5f7fa;
@@ -1795,6 +1817,12 @@ export default {
}
&__textarea-list {
margin-bottom: 16px;
background: #fff;
border-radius: 0 0 6px 6px;
padding: 14px 16px 4px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
:deep(.el-form-item) {
align-items: flex-start;
}
@@ -1808,12 +1836,15 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 8px;
margin-bottom: 16px;
background: #fff;
border-radius: 6px;
padding: 12px 16px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
}
&__material-title {
flex: 1;
margin-bottom: 14px;
}
&__material-warn {
@@ -1824,11 +1855,19 @@ export default {
}
&__upload {
margin: -12px 0 24px;
margin: 0 0 16px;
background: #fff;
border-radius: 6px;
padding: 12px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
}
&__change-textarea {
margin-bottom: 24px;
margin-bottom: 16px;
background: #fff;
border-radius: 0 0 6px 6px;
padding: 14px 16px 4px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
:deep(.el-form-item__content) {
width: 100%;
@@ -1840,7 +1879,9 @@ export default {
:global(.project-apply-dialog .el-dialog__body) {
max-height: 76vh;
overflow-y: auto;
padding: 16px 24px 8px;
overflow-x: hidden;
padding: 16px;
background: #f5f6fa;
}
.project-apply-dialog__footer {

View File

@@ -1175,4 +1175,5 @@ export default {
margin-left: 12px;
}
}
</style>