Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/BusinessBenchmark

src/components/evaluationSystem/achievementKDetail.vue

@@ -283,10 +283,10 @@ export default {
                     }
                     .detaTableBtns{
                         display: flex;
-                        width: 200px;
+                        justify-content: flex-end;
+                        width: 100%;
                         position: relative;
                         top: 32px;
-                        left: 88vw;
                         z-index: 11111;
                         .tableBtn {
                             display: flex;

src/components/taskCenter/taskApplicationFrom.vue

@@ -667,7 +667,7 @@ export default {
             })
         },
         engProssionFn() {
-            this.submitIsdoAction('end')
+            this.submitIsdoAction('manualEnd')
         },
         examineAndApprove(type) {
             let actionCS = ''