Merge remote-tracking branch 'websoft/master'

src/views/business/project-apply.vue

@@ -620,7 +620,7 @@
       >
           <template v-if="isChangeDialog">
             <el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
-            <el-button v-if="isProjectFormPage" @click="closeProjectForm">返回</el-button>
+            <el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
             <el-button type="primary" plain :loading="submitLoading" @click="saveChangeProject">
               保存
             </el-button>
@@ -630,7 +630,7 @@
           </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="isProjectFormPage" @click="closeProjectForm">取消</el-button>
             <el-button
               v-if="!dialogReadonly"
               type="primary"
@@ -2324,7 +2324,6 @@ export default {
 .project-apply-dialog__footer {
   display: flex;
   justify-content: flex-end;
-  gap: 8px;
 
   .project-apply-page-form & {
     position: fixed;