zhangjie 4 سال پیش
والد
کامیت
555fbf4fa9

+ 1 - 0
card/views/CardDesign.vue

@@ -549,6 +549,7 @@ export default {
       return true;
     },
     getModel() {
+      // 防止页面未渲染完成,各试题高度未及时更新,保存数据有误的问题
       return new Promise((resolve, reject) => {
         setTimeout(() => {
           const data = JSON.stringify(

+ 1 - 1
src/modules/base/components/SelectOrgs.vue

@@ -12,7 +12,7 @@
       node-key="id"
       ref="MenuTree"
       :props="defaultProps"
-      :check-strictly="!multiple"
+      check-strictly
       check-on-click-node
       :expand-on-click-node="false"
       @check="checkClick"

+ 2 - 2
src/modules/customer/views/CustomerCard.vue

@@ -139,6 +139,7 @@
       </el-table>
       <div class="part-page">
         <el-pagination
+          v-if="taskList.length"
           background
           layout="total,prev, pager, next"
           :current-page="current"
@@ -172,8 +173,7 @@ export default {
         finishEndTime: null
       },
       current: 1,
-      size: 1,
-      // size: this.GLOBAL.pageSize,
+      size: this.GLOBAL.pageSize,
       total: 0,
       multipleSelection: [],
       AUDITING_STATUS: {

+ 8 - 0
src/modules/exam/components/ModifyTaskPaper.vue

@@ -366,6 +366,14 @@ export default {
       return data;
     },
     checkDataValid() {
+      // 校验试卷类型是否连续
+      const lastPaperName = this.paperAttachments.slice(-1)[0].name;
+      const paperLength = this.abc.indexOf(lastPaperName) + 1;
+      if (this.paperAttachments.length !== paperLength) {
+        this.$message.error("请保持试卷类型连续!");
+        return;
+      }
+
       const attachmentValid = !this.paperAttachments.some(
         item => !item.attachmentId
       );

+ 3 - 2
src/modules/exam/components/WaitTaskExamTask.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="wait-task-exam part-box part-box-pad part-box-border">
+  <div class="wait-task-exam-task part-box part-box-pad part-box-border">
     <div class="task-head part-box part-box-flex">
       <h3>
         命题待办(<span class="color-danger">{{ total }}</span
@@ -35,6 +35,7 @@
     </div>
     <div class="text-center">
       <el-pagination
+        v-if="tasks.length"
         background
         layout="prev, pager, next"
         :current-page="current"
@@ -62,7 +63,7 @@ import { residueFloorTime } from "@/plugins/utils";
 import { TASK_WARNING_TIME } from "@/constants/enumerate";
 
 export default {
-  name: "wait-task-exam",
+  name: "wait-task-exam-task",
   components: { ModifyTaskApply },
   data() {
     return {

+ 1 - 0
src/modules/exam/views/TaskApplyManage.vue

@@ -173,6 +173,7 @@
       </el-table>
       <div class="part-page">
         <el-pagination
+          v-if="examTasks.length"
           background
           layout="total,prev, pager, next"
           :current-page="current"

+ 1 - 0
src/modules/exam/views/TaskPaperManage.vue

@@ -137,6 +137,7 @@
       </el-table>
       <div class="part-page">
         <el-pagination
+          v-if="papers.length"
           background
           layout="total,prev, pager, next"
           :current-page="current"

+ 1 - 1
src/modules/print/components/ModifyPrintPlan.vue

@@ -260,7 +260,7 @@ const initModalForm = {
   examStartTime: "",
   examEndTime: "",
   printContent: [],
-  backupMethod: "PLACE",
+  backupMethod: "ROOM",
   backupCount: 1,
   drawRule: "ONE",
   variableContent: [