zhangjie 3 년 전
부모
커밋
2ff4df3ccc
2개의 변경된 파일11개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 1
      card/store/card.js
  2. 9 1
      src/modules/exam/components/createExamAndPrintTask/InfoPrintTask.vue

+ 2 - 1
card/store/card.js

@@ -336,6 +336,7 @@ const actions = {
 
     const newElements = getExplainElements(element);
     const lastPos = elementGroupPosInfos.slice(-1)[0].slice(-1)[0];
+    let lastNewElementPos = lastPos._elementNo;
     for (let i = 0; i < element.questionsCount; i++) {
       if (elementGroupPosInfos[i]) {
         elementGroupPosInfos[i].forEach(pos => {
@@ -345,7 +346,7 @@ const actions = {
           child.topicNo = element.topicNo;
         });
       } else {
-        state.topics.splice(lastPos._elementNo + 1, 0, newElements[i]);
+        state.topics.splice(++lastNewElementPos, 0, newElements[i]);
       }
     }
   },

+ 9 - 1
src/modules/exam/components/createExamAndPrintTask/InfoPrintTask.vue

@@ -58,6 +58,7 @@
               :step="1"
               step-strictly
               :controls="false"
+              @change="backupCountChange"
             ></el-input-number>
           </template>
         </el-table-column>
@@ -234,6 +235,10 @@ export default {
             errorFields.push(field.name);
           }
         });
+
+        if (!row.printHouseId) {
+          errorFields.push("印刷室");
+        }
         if (errorFields.length) {
           errorMsg.push(
             `考试对象${row.className}中,${errorFields.join("、")}必须填写`
@@ -308,7 +313,7 @@ export default {
       );
       this.packageInfos.paperReleaseCount = this.packageInfos.studentCount;
       this.packageInfos.paperBackupCount = calcSum(
-        this.tableData.map(item => item.backupCount)
+        this.tableData.map(item => item.backupCount || 0)
       );
       this.packageInfos.paperCount =
         this.packageInfos.paperReleaseCount +
@@ -355,6 +360,9 @@ export default {
       this.modalForm.examStartTime = curDate + this.createTime[0] - timeDate;
       this.modalForm.examEndTime = curDate + this.createTime[1] - timeDate;
     },
+    backupCountChange() {
+      this.updatePackageInfos();
+    },
     printHouseChange(row) {
       const curHouse = this.printHouses.find(
         item => item.houseId === row.printHouseId