zhangjie 2 жил өмнө
parent
commit
ca06230775

+ 8 - 2
src/modules/base/components/ModifyCardRule.vue

@@ -64,6 +64,7 @@
         class="inline-block"
       >
         <el-input-number
+          v-if="modalForm.examNumberStyle === 'FILL'"
           v-model="modalForm.examNumberDigit"
           :min="5"
           :max="15"
@@ -72,7 +73,9 @@
           :controls="false"
           style="width: 100px"
         ></el-input-number>
-        <!-- {{ modalForm.examNumberDigit }} -->
+        <span v-else>
+          {{ modalForm.examNumberDigit }}
+        </span>
       </el-form-item>
       <!-- <el-form-item prop="paperType" label="AB卷版式:" class="inline-block">
         <el-select
@@ -184,7 +187,7 @@ const initModalForm = {
   name: "",
   remark: "",
   examNumberStyle: "",
-  examNumberDigit: 8,
+  examNumberDigit: 10,
   paperType: "PRINT",
   examAbsent: true,
   discipline: true,
@@ -360,6 +363,9 @@ export default {
     },
     numStyleChange() {
       this.modalForm.writeSign = this.modalForm.examNumberStyle !== "FILL";
+      if (this.modalForm.examNumberStyle !== "FILL") {
+        this.modalForm.examNumberDigit = 10;
+      }
     },
     async submit() {
       const valid = await this.$refs.modalFormComp.validate().catch(() => {});

+ 4 - 4
src/modules/base/components/ModifyCourse.vue

@@ -32,11 +32,11 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item prop="teachingRoomId" label="开课部门:">
+        <el-form-item prop="teachingRoomId" label="开课学院:">
           <org-select
             v-model="modalForm.teachingRoomId"
             style="width: 100%"
-            placeholder="开课部门"
+            placeholder="开课学院"
           ></org-select>
         </el-form-item>
         <el-form-item label="授课班级:">
@@ -51,7 +51,7 @@
       </el-form>
       <el-form>
         <el-form-item label="授课老师:">
-          <el-button class="btn-primary" type="text" @click="toSelectTeacher"
+          <el-button type="primary" size="mini" @click="toSelectTeacher"
             >选择</el-button
           >
           <br />
@@ -138,7 +138,7 @@ export default {
         teachingRoomId: [
           {
             required: true,
-            message: "请选择开课部门",
+            message: "请选择开课学院",
             trigger: "change",
           },
         ],

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

@@ -12,7 +12,7 @@
           v-for="field in modalForm.requiredFields"
           :key="field.code"
           v-model="field.enable"
-          disabled
+          :disabled="field.disabled"
           >{{ field.name }}</el-checkbox
         >
       </el-form-item>

+ 2 - 2
src/modules/base/views/CardRuleManage.vue

@@ -204,7 +204,7 @@ export default {
         .map((item) => {
           return {
             code: item.code,
-            name: item.desc,
+            name: item.name,
           };
         });
       let examRule = await examRuleDetail();
@@ -250,7 +250,7 @@ export default {
         requiredFields: this.cardRequiredFields.map((item) => {
           return {
             code: item.code,
-            name: item.desc,
+            name: item.name,
             enable: true,
           };
         }),

+ 1 - 0
src/modules/card/views/CardRulePreview.vue

@@ -55,6 +55,7 @@ export default {
           cardDesc: "",
         },
       };
+      config.fillNumber = data.examNumberDigit;
       config.aOrB = true; // 默认开启A/B卷型
       config.requiredFields = JSON.parse(config.requiredFields);
       config.extendFields = JSON.parse(config.extendFields);

+ 1 - 0
src/modules/exam/components/createExamAndPrintTask/ModifyExamStudent.vue

@@ -221,6 +221,7 @@ export default {
     },
     async visibleChange() {
       if (this.basicCourseCode !== this.courseCode) {
+        this.clearSelectedExamObjectType();
         this.basicCourseCode = this.courseCode;
         await this.getStudents("TEACH_CLAZZ_STUDENT");
       }