dedsudiyu 12 hours ago
parent
commit
adefe09c22

+ 4 - 4
src/views/safetyEducationExaminationNew/examManagement/examinationArrange/index.vue

@@ -269,21 +269,21 @@
         let self = this;
         if(type == 1){
           //新增
-          this.$set(this,'pageType',2);
           this.$set(this,'propsData',{});
+          this.$set(this,'pageType',2);
         }else if(type == 2){
           //补考
-          this.$set(this,'pageType',3);
           this.$set(this,'propsData',{
             id:row.id,
             makeupExamId:row.makeupExamId,
             makeupStarted:row.makeupStarted,
           });
+          this.$set(this,'pageType',3);
         }else if(type == 3){
           //编辑
-          this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
           this.$set(this,'propsData',obj);
+          this.$set(this,'pageType',2);
         }else if(type == 4){
           //复制
           this.$confirm('是否确认复制?', "提示", {
@@ -316,10 +316,10 @@
           this.getList();
         }else if(type == 7){
           //详情
-          this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
           obj.showType = true;
           this.$set(this,'propsData',obj);
+          this.$set(this,'pageType',2);
         }
       },
       //查询全部专业类别

+ 5 - 2
src/views/safetyEducationExaminationNew/examManagement/examinationArrange/studentsTakingMakeUpExams.vue

@@ -180,7 +180,7 @@
     >
       <!--选择试卷/选择试题-->
       <selectTestPaper v-if="drawerType === 1&&drawer"></selectTestPaper>
-      <examDetails v-if="drawerType === 2&&drawer"></examDetails>
+      <examDetails v-if="drawerType === 2&&drawer" :examDetailsPropsData="examDetailsPropsData"></examDetails>
     </el-drawer>
   </div>
 </template>
@@ -269,6 +269,8 @@
         drawer: false,
         //补考是否已开始 0未开始 1开始
         makeupStarted:null,
+        //补考试卷详情数据
+        examDetailsPropsData:null,
       }
     },
     created() {
@@ -360,9 +362,10 @@
           this.$parent.tableButton(6)
         })
       },
-      lockExam(){
+      lockExam(row){
         this.$set(this, 'drawerTitle', '试卷详情')
         this.$set(this, 'drawerType', 2)
+        this.$set(this, 'examDetailsPropsData', row)
         this.$set(this, 'drawer', true)
       },
       //查询按钮