update

src/components/project/Project.vue

@@ -224,19 +224,12 @@
             </el-form-item>
             <el-form-item v-if="!isModifyMode">
 
-              <el-button v-if="projectOperationControl.confirmFinish" type="success" size="mini" @click="endProject()">
-                结束项目
-              </el-button>
-              <el-button v-if="projectOperationControl.finish" type="primary" size="mini"
-                         @click="submitProjectRequest()">
-                提交项目
+              <el-button v-if="projectOperationControl.reject" type="danger" size="mini" @click="rejectProject()">
+                拒绝项目
               </el-button>
               <el-button v-if="projectOperationControl.receive" type="primary" size="mini" @click="receiveProject()">
                 接收项目
               </el-button>
-              <el-button v-if="projectOperationControl.reject" type="danger" size="mini" @click="rejectProject()">
-                拒绝项目
-              </el-button>
               <el-button v-if="projectOperationControl.update" type="primary" size="mini" @click="modifyForm()">
                 修改项目
               </el-button>
@@ -246,6 +239,13 @@
               <el-button v-if="projectOperationControl.uploadReport" type="primary" size="mini" @click="createReport()">
                 上传报告
               </el-button>
+              <el-button v-if="projectOperationControl.finish" type="primary" size="mini"
+                         @click="submitProjectRequest()">
+                提交项目
+              </el-button>
+              <el-button v-if="projectOperationControl.confirmFinish" type="success" size="mini" @click="endProject()">
+                结束项目
+              </el-button>
             </el-form-item>
           </el-form>
 

src/components/task/Task.vue

@@ -957,7 +957,7 @@ export default {
         cancelButtonText: '取消',
         type: 'success'
       }).then(() => {
-        this.getTaskDetail()
+        // this.getTaskDetail()
         this.showLoading()
         ensureEndTask(this.projectId, this.taskId, this.endTaskSuccess, this.endTaskFail)
       }).catch(() => {