zhangjie 7 сар өмнө
parent
commit
bba9084731

+ 10 - 1
src/modules/base/components/ModifyExamStudent.vue

@@ -226,6 +226,12 @@ export default {
         return {};
       },
     },
+    examData: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
   },
   computed: {
     isEdit() {
@@ -415,6 +421,10 @@ export default {
         this.courseList = [];
       }
 
+      this.curExam = { ...this.examData };
+
+      this.updateRules();
+
       this.$nextTick(() => {
         this.$refs.modalFormComp.clearValidate();
       });
@@ -442,7 +452,6 @@ export default {
       [...this.optionalFields, ...this.extendFields].forEach((item) => {
         this.initModalForm[item.code] = "";
       });
-      this.updateRules();
     },
     checkRequiredFieldValid(fieldName) {
       return this.requiredFields.includes(fieldName);

+ 9 - 1
src/modules/base/views/ExamStudentManage.vue

@@ -6,6 +6,7 @@
           v-model="filterSe"
           defaultSelectExam
           @exam-default="search"
+          @exam-change="examChange"
         ></secp-select>
         <el-form-item label="任课老师:">
           <el-input
@@ -53,7 +54,7 @@
           <el-button
             v-if="checkPrivilege('button', 'select')"
             type="primary"
-            @click="toPage(1)"
+            @click="search"
             >查询</el-button
           >
         </el-form-item>
@@ -296,6 +297,7 @@
 
     <modify-exam-student
       :instance="curRow"
+      :exam-data="curExam"
       @modified="getList"
       ref="ModifyExamStudent"
     ></modify-exam-student>
@@ -396,6 +398,8 @@ export default {
       importTaskType: "BASIC_EXAM_STUDENT_IMPORT",
       curTaskType: "BASIC_EXAM_STUDENT_IMPORT",
       taskTypes: [],
+      curExam: {},
+      selectExam: {},
       // import
       uploadUrl: "/api/admin/basic/exam_student/import",
       dfilename: "考生导入模板.xlsx",
@@ -443,10 +447,14 @@ export default {
     },
     search() {
       this.toPage(1);
+      this.curExam = { ...this.selectExam };
     },
     handleSelectionChange(val) {
       this.multipleSelection = val.map((item) => item.id);
     },
+    examChange(val) {
+      this.selectExam = val;
+    },
     async downloadHandle(filename) {
       if (this.download) return;
 

+ 4 - 4
src/modules/print/components/PrintPlanBkDetail.vue

@@ -337,10 +337,10 @@ export default {
     },
     toEdit(row) {
       if (row.status === "FINISH") return;
-      if (!row.totalSubjects) {
-        this.$message.error("请输入印刷份数");
-        return;
-      }
+      // if (!row.totalSubjects) {
+      //   this.$message.error("请输入印刷份数");
+      //   return;
+      // }
       this.updateData([row]);
     },
     toBatchEdit() {