bug修改

src/modules/exam/api.js

@@ -144,9 +144,7 @@ export const listTaskPrintStudent = datas => {
 export const submitTaskPrint = datas => {
   return $post("/api/admin/exam/task/submit_task_print", datas);
 };
-export const cancelTaskPrint = datas => {
-  return $post("/api/admin/exam/task/cancel_task_print", datas);
-};
+
 // 班级查询
 export const listTaskPrintClass = datas => {
   return $postParam("/api/admin/exam/task/list_task_print_class", datas);

src/modules/exam/components/ModifyTaskPaper.vue

@@ -61,7 +61,7 @@
       <div>
         <div v-if="IS_EDIT" class="mb-2 text-right">
           <el-button
-            type="primary"
+            type="info"
             icon="el-icon-circle-plus-outline"
             @click="addAtachment"
             >增加卷型</el-button

src/modules/exam/components/PublishPrintTask.vue

@@ -2,13 +2,17 @@
   <el-dialog
     class="publish-print-task"
     :visible.sync="modalIsShow"
-    title="发布印刷任务"
-    fullscreen
     :close-on-click-modal="false"
     :close-on-press-escape="false"
+    :show-close="false"
     append-to-body
+    fullscreen
     @opened="visibleChange"
   >
+    <div slot="title">
+      <span class="el-dialog__title">发布印刷任务</span>
+      <button class="el-dialog__headerbtn" @click="close"></button>
+    </div>
     <div class="md-4">
       <el-form ref="FilterForm" label-position="left" label-width="0" inline>
         <el-form-item>
@@ -48,16 +52,15 @@
       </el-form>
     </div>
     <div class="mb-2">
-      <el-button type="primary" @click="toAdd">增加考试对象</el-button>
+      <el-button :disabled="curPlanSubmit" type="primary" @click="toAdd"
+        >增加考试对象</el-button
+      >
       <el-button
-        v-if="curPlanSubmit"
-        type="danger"
+        type="success"
         :loading="loading"
-        @click="toCancel"
-        >撤回提交</el-button
-      >
-      <el-button v-else type="success" :loading="loading" @click="toSubmit"
-        >提交</el-button
+        :disabled="curPlanSubmit || !tableData.length"
+        @click="toSubmit"
+        >发布</el-button
       >
     </div>
     <el-table ref="TableList" :data="tableData">
@@ -65,8 +68,6 @@
       </el-table-column>
       <el-table-column prop="examRoom" label="考场"> </el-table-column>
       <el-table-column prop="examPlace" label="考点"> </el-table-column>
-      <el-table-column prop="invigilatorTeacher" label="监考老师">
-      </el-table-column>
       <el-table-column prop="className" label="考试对象"> </el-table-column>
       <el-table-column prop="studentCount" label="人数"> </el-table-column>
       <el-table-column prop="printHouseName" label="印刷室"> </el-table-column>
@@ -95,12 +96,19 @@
             >编辑</el-button
           >
           <el-button
-            v-if="!curPlanSubmit"
+            v-if="scope.row.status === 'NEW' || scope.row.status === 'READY'"
             class="btn-danger"
             type="text"
             @click="toDelete(scope.row)"
             >删除</el-button
           >
+          <el-button
+            v-if="scope.row.status === 'WAITING'"
+            class="btn-danger"
+            type="text"
+            @click="toCancel(scope.row)"
+            >撤回提交</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -124,12 +132,8 @@
 </template>
 
 <script>
-import {
-  listTaskPrint,
-  removeTaskPrint,
-  submitTaskPrint,
-  cancelTaskPrint
-} from "../api";
+import { listTaskPrint, removeTaskPrint, submitTaskPrint } from "../api";
+import { cancelPrintTask } from "../../print/api";
 import { examRuleDetail } from "../../base/api";
 import CreatePrintTask from "./CreatePrintTask";
 import PrintTaskStudents from "./PrintTaskStudents";
@@ -187,6 +191,10 @@ export default {
       this.filter = this.$objAssign(this.filter, this.instance);
       this.tableData = [];
       this.curRow = {};
+      this.timeDisabled = false;
+      this.createDate = "";
+      this.createTime = [...this.curCreateTime];
+      this.curPlanSubmit = false;
     },
     async getExtendFields() {
       const examRule = await examRuleDetail();
@@ -214,11 +222,10 @@ export default {
           });
           return item;
         });
-        this.total = data.iPage.total;
       } else {
         this.tableData = [];
       }
-      this.curPlanSubmit = data.isSubmit;
+      this.curPlanSubmit = data.submit;
       if (data.examStartTime && data.examEndTime) {
         this.createTime = [data.examStartTime, data.examEndTime];
         this.createDate = getTimeDatestamp(data.examStartTime);
@@ -233,12 +240,13 @@ export default {
         this.timeDisabled = false;
       }
     },
-    toPage(page) {
-      this.current = page;
-      this.getList();
-    },
     printPlanChange(val) {
-      if (!val) return;
+      if (!val) {
+        this.timeDisabled = false;
+        this.createDate = "";
+        this.createTime = [...this.curCreateTime];
+        return;
+      }
       this.filter.printPlanName = val && val.name;
       this.getList();
     },
@@ -261,6 +269,21 @@ export default {
     open() {
       this.modalIsShow = true;
     },
+    async close() {
+      if (this.tableData.length && !this.curPlanSubmit) {
+        const result = await this.$confirm(
+          `当前印刷计划下印刷任务还没有发布，是否要发布?`,
+          "提示",
+          {
+            type: "warning"
+          }
+        ).catch(() => {});
+        if (result === "confirm") {
+          await this.sumbitTask();
+        }
+      }
+      this.cancel();
+    },
     toAdd() {
       if (
         !this.filter.printPlanId ||
@@ -307,6 +330,10 @@ export default {
       ).catch(() => {});
       if (result !== "confirm") return;
 
+      await this.sumbitTask();
+      this.cancel();
+    },
+    async sumbitTask() {
       const datas = {
         printPlanId: this.filter.printPlanId,
         list: this.tableData.map(item => item.examDetailId)
@@ -319,27 +346,17 @@ export default {
       this.curPlanSubmit = true;
       this.$message.success("印刷任务发布成功！");
     },
-    async toCancel() {
-      const result = await this.$confirm(
-        `确定要撤回当前计划所有印刷任务吗?`,
-        "提示",
-        {
-          type: "warning"
-        }
-      ).catch(() => {});
+    async toCancel(row) {
+      const result = await this.$confirm(`确定撤回该印刷任务吗？`, "提示", {
+        type: "warning"
+      }).catch(() => {});
       if (result !== "confirm") return;
 
-      const datas = {
-        printPlanId: this.filter.printPlanId,
-        list: this.tableData.map(item => item.examDetailId)
-      };
-      this.loading = true;
-      const res = await cancelTaskPrint(datas).catch(() => {});
-      this.loading = false;
-      if (!res) return;
+      const data = await cancelPrintTask(row.examDetailId);
+      if (!data) return;
 
-      this.curPlanSubmit = false;
-      this.$message.success("印刷任务撤销成功！");
+      this.$message.success("撤回成功！");
+      this.getList();
     },
     async toDelete(row) {
       const result = await this.$confirm(`确定要删除当前卷袋吗?`, "提示", {
@@ -349,7 +366,7 @@ export default {
 
       await removeTaskPrint(row.id);
       this.$message.success("删除成功！");
-      this.deletePageLastItem();
+      this.getList();
     }
   }
 };

src/modules/print/views/PrintTaskManage.vue

@@ -265,7 +265,11 @@
               >撤回提交</el-button
             >
             <el-button
-              v-if="checkPrivilege('link', 'end')"
+              v-if="
+                (scope.row.status === 'END' ||
+                  scope.row.status === 'PRINT_FINISH') &&
+                  checkPrivilege('link', 'normal')
+              "
               :class="scope.row.normal ? 'btn-danger' : 'btn-primary'"
               type="text"
               @click="toNormal(scope.row)"

src/plugins/axios.js

@@ -23,7 +23,7 @@ axios.interceptors.request.use(
       load = Message({
         customClass: "el-message-loading",
         iconClass: "el-message__icon el-icon-loading",
-        message: "Loading...",
+        message: "加载中...",
         duration: 0
       });
     }

src/views/Home.vue

@@ -298,6 +298,7 @@ export default {
       return { menus: anchorNav(navTree), firstRouter };
     },
     toMenu(menu) {
+      if (this.curMenu.url === menu.url) return;
       this.curMenu = menu;
       const firstRouter = menu.children[0].children[0];
       this.toNav(firstRouter);