Merge remote-tracking branch 'websoft/master'

This commit is contained in:
2026-08-26 23:18:19 +08:00
25 changed files with 629 additions and 100 deletions
+8 -11
View File
@@ -619,20 +619,22 @@
:class="{ 'project-apply-dialog__footer--change': isChangeDialog }"
>
<template v-if="isChangeDialog">
<el-button type="primary" :loading="submitLoading" @click="saveChangeProject">
<el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
<el-button v-if="isProjectFormPage" @click="closeProjectForm">返回</el-button>
<el-button type="primary" plain :loading="submitLoading" @click="saveChangeProject">
保存
</el-button>
<el-button type="primary" :loading="submitLoading" @click="submitChangeProject">
提交
</el-button>
<el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
<el-button v-if="isProjectFormPage" @click="closeProjectForm">返回</el-button>
</template>
<template v-else>
<el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
<el-button v-if="isProjectFormPage" @click="closeProjectForm">返回</el-button>
<el-button
v-if="!dialogReadonly"
type="primary"
plain
:loading="submitLoading"
@click="saveProject"
>
@@ -646,7 +648,6 @@
>
提交
</el-button>
<el-button v-if="isProjectFormPage" @click="closeProjectForm">返回</el-button>
</template>
</div>
</component>
@@ -2131,7 +2132,7 @@ export default {
}
:deep(.el-form-item) {
margin-bottom: 16px;
margin-bottom: 14px;
}
:deep(.el-form-item__label) {
@@ -2198,9 +2199,7 @@ export default {
padding: 12px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
:deep(.el-table__header th) {
background: #f5f7fa;
color: #303133;
:deep(.el-table__header th .cell) {
font-weight: 600;
}
@@ -2244,9 +2243,7 @@ export default {
width: 100%;
margin-bottom: 12px;
:deep(.el-table__header th) {
background: #f5f7fa;
color: #303133;
:deep(.el-table__header th .cell) {
font-weight: 600;
}