新建任务位置调整

src/assets/styles/pages.scss

@@ -160,14 +160,14 @@
     }
   }
 }
-// create-task-apply
-.create-task-apply {
+// create-exam-and-print-task
+.create-exam-and-print-task {
   .apply-step {
     margin-bottom: 60px;
   }
   .apply-body {
     width: 900px;
-    margin: 0 auto;
+    margin: 0 auto 30px;
   }
 }
 // wait-task

src/modules/exam/components/createExamAndPrintTask/CreateTaskApply.vue → src/modules/exam/components/createExamAndPrintTask/CreateExamAndPrintTask.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    class="create-task-apply"
+    class="create-exam-and-print-task"
     :visible.sync="modalIsShow"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
@@ -156,7 +156,7 @@ const initPrintTask = {
 };
 
 export default {
-  name: "create-task-apply",
+  name: "create-exam-and-print-task",
   components: { InfoPrintPlan, InfoExamTask, InfoPrintTask },
   data() {
     return {

src/modules/exam/views/ExamTaskManage.vue

@@ -204,16 +204,6 @@
               @click="toEnable(scope.row)"
               >{{ scope.row.enable ? "禁用" : "启用" }}</el-button
             >
-            <el-button
-              v-if="
-                scope.row.approveFormStatus &&
-                  checkPrivilege('link', 'SelectForm')
-              "
-              class="btn-primary"
-              type="text"
-              @click="toDownloadForm(scope.row)"
-              >下载审批表</el-button
-            >
           </template>
         </el-table-column>
       </el-table>
@@ -242,18 +232,12 @@
       ref="BatchAddExamTask"
       @modified="taskModified"
     ></batch-add-exam-task>
-    <!-- PaperApproveTable -->
-    <paper-approve-table
-      :instance="curExamTask"
-      ref="PaperApproveTable"
-    ></paper-approve-table>
   </div>
 </template>
 
 <script>
 import ModifyExamTask from "../components/ModifyExamTask";
 import BatchAddExamTask from "../components/BatchAddExamTask";
-import PaperApproveTable from "../components/PaperApproveTable";
 import { ABLE_TYPE, EXAM_TASK_STATUS } from "@/constants/enumerate";
 import pickerOptions from "@/constants/datePickerOptions";
 import { examTaskListPage, ableExamTask } from "../api";
@@ -263,8 +247,7 @@ export default {
   name: "exam-task-manage",
   components: {
     ModifyExamTask,
-    BatchAddExamTask,
-    PaperApproveTable
+    BatchAddExamTask
   },
   data() {
     return {
@@ -377,10 +360,6 @@ export default {
       this.editType = "PREVIEW";
       this.$refs.ModifyExamTask.open();
     },
-    toDownloadForm(row) {
-      this.curExamTask = row;
-      this.$refs.PaperApproveTable.open();
-    },
     taskModified() {
       this.getList();
       this.updateWaitTaskCount();

src/modules/exam/views/TaskApplyManage.vue

@@ -82,6 +82,14 @@
         >
           新建命题申请
         </el-button>
+        <el-button
+          v-if="checkPrivilege('button', 'ExamTaskApplyManage')"
+          icon="el-icon-circle-plus-outline"
+          type="primary"
+          @click="toAddExamAndPrintTask"
+        >
+          新建任务
+        </el-button>
       </div>
     </div>
 
@@ -157,6 +165,16 @@
               @click="toCancel(scope.row)"
               >撤销申请</el-button
             >
+            <el-button
+              v-if="
+                scope.row.approveFormStatus &&
+                  checkPrivilege('link', 'SelectForm')
+              "
+              class="btn-primary"
+              type="text"
+              @click="toDownloadForm(scope.row)"
+              >下载审批表</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -186,12 +204,24 @@
       ref="CreateTaskApply"
       @modified="taskModified"
     ></create-task-apply>
+    <!-- CreateExamAndPrintTask -->
+    <create-exam-and-print-task
+      ref="CreateExamAndPrintTask"
+      @modified="taskModified"
+    ></create-exam-and-print-task>
+    <!-- PaperApproveTable -->
+    <paper-approve-table
+      :instance="curExamTask"
+      ref="PaperApproveTable"
+    ></paper-approve-table>
   </div>
 </template>
 
 <script>
 import ModifyTaskApply from "../components/ModifyTaskApply";
-import CreateTaskApply from "../components/createExamAndPrintTask/CreateTaskApply";
+import CreateExamAndPrintTask from "../components/createExamAndPrintTask/CreateExamAndPrintTask";
+import CreateTaskApply from "../components/CreateTaskApply";
+import PaperApproveTable from "../components/PaperApproveTable";
 import { AUDITING_STATUS } from "@/constants/enumerate";
 import pickerOptions from "@/constants/datePickerOptions";
 import { taskApplyListPage, cancelOrRestartTaskApply } from "../api";
@@ -201,7 +231,9 @@ export default {
   name: "task-apply-manage",
   components: {
     ModifyTaskApply,
-    CreateTaskApply
+    CreateExamAndPrintTask,
+    CreateTaskApply,
+    PaperApproveTable
   },
   data() {
     return {
@@ -306,6 +338,13 @@ export default {
     },
     toAddApply() {
       this.$refs.CreateTaskApply.open();
+    },
+    toAddExamAndPrintTask() {
+      this.$refs.CreateExamAndPrintTask.open();
+    },
+    toDownloadForm(row) {
+      this.curExamTask = row;
+      this.$refs.PaperApproveTable.open();
     }
   },
   beforeRouteLeave(to, from, next) {