zhangjie пре 2 година
родитељ
комит
cac6ce48ba

+ 7 - 0
src/assets/styles/home.scss

@@ -471,6 +471,13 @@
       &.item-done {
         background: #9877ff;
       }
+
+      &.item-wait {
+        cursor: pointer;
+        &:hover {
+          opacity: 0.8;
+        }
+      }
     }
 
     &-rp {

+ 1 - 1
src/modules/base/views/CourseManage.vue

@@ -47,7 +47,7 @@
           v-if="checkPrivilege('button', 'Delete')"
           type="danger"
           :disabled="!filterHasQuery"
-          @click="toBatchDeable"
+          @click="toBatchDelete"
           >批量删除</el-button
         >
         <el-button

+ 3 - 1
src/modules/card/views/CardEdit.vue

@@ -195,7 +195,8 @@ export default {
       return cardInfo;
     },
     async toPreview(cardModel) {
-      await this.toSave(cardModel);
+      const res = await this.toSave(cardModel);
+      if (!res) return;
 
       const { href } = this.$router.resolve({
         name: "CardPreview",
@@ -221,6 +222,7 @@ export default {
       this.cardId = result;
       this.$ls.set("cardId", this.cardId);
       this.$message.success("保存成功!");
+      return this.cardId;
     },
     async toSubmit(cardData) {
       const res = await this.$prompt("确定要提交当前题卡吗?", "提示", {

+ 1 - 1
src/modules/exam/components/ApplyContent.vue

@@ -706,7 +706,7 @@ export default {
         ? JSON.parse(this.curTaskApply.paperConfirmAttachmentIds)
         : [];
 
-      this.getCardList();
+      if (this.IS_APPLY) this.getCardList();
 
       // flow
       if (this.curTaskApply.flowStatus === "START") {

+ 6 - 6
src/modules/print/views/PrintTaskManage.vue

@@ -232,24 +232,24 @@
         <el-table-column
           prop="examPlace"
           label="考点"
-          min-width="100"
+          min-width="160"
         ></el-table-column>
         <el-table-column
           prop="examRoom"
           label="考场"
-          min-width="100"
+          min-width="160"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="singlePagesA3"
           label="单科次准印量A3(页)"
           width="80"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           prop="totalSubjects"
           label="科次"
           width="80"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="pagesA3"
           label="A3准印量小计(页)"
           width="80"
@@ -258,7 +258,7 @@
           prop="pagesA4"
           label="A4准印量小计(页)"
           width="80"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column prop="status" label="印刷状态" width="80">
           <span slot-scope="scope">{{
             scope.row.status | printTaskStatusFilter

+ 6 - 1
src/views/HomePage.vue

@@ -4,7 +4,7 @@
       <div v-if="hasWaitTaskPrivilege" class="hp-top-left">
         <el-row class="tab-summary" type="flex" :gutter="10">
           <el-col :span="12">
-            <div class="tab-summary-item">
+            <div class="tab-summary-item item-wait" @click="toWaitTask">
               <i class="tab-summary-icon icon icon-wait-task"></i>
               <h4 class="tab-summary-title">待办任务</h4>
               <p class="tab-summary-cont">{{ summary.waitTaskCount }}</p>
@@ -260,6 +260,11 @@ export default {
           type: item.type
         }
       });
+    },
+    toWaitTask() {
+      this.$router.push({
+        name: "WaitTask"
+      });
     }
   }
 };