浏览代码

重考申请bug修改

zhangjie 4 年之前
父节点
当前提交
f94814ace2

+ 8 - 8
src/features/invigilation/ReexamApply/ApplyReexamDialog.vue

@@ -26,11 +26,11 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="examRecordId" label="证件号/姓名:">
+      <el-form-item prop="examStudentId" label="证件号/姓名:">
         <multiple-select-student
-          data-key="examRecordId"
+          data-key="examStudentId"
           :data-list="dataList"
-          :seleted-ids="modalForm.examRecordId"
+          :seleted-ids="modalForm.examStudentId"
           :show-add="true"
           @selected="idsChange"
           ref="MultipleSelectStudent"
@@ -75,7 +75,7 @@ import { REEXAM_TYPE, REEXAM_REASON } from "@/constant/constants";
 import MultipleSelectStudent from "../common/MultipleSelectStudent";
 
 const initModalForm = {
-  examRecordId: [],
+  examStudentId: [],
   model: 0,
   reason: null,
   remark: "",
@@ -121,7 +121,7 @@ export default {
             trigger: "change",
           },
         ],
-        examRecordId: [
+        examStudentId: [
           {
             required: true,
             validator: recordIdValidator,
@@ -141,8 +141,8 @@ export default {
   methods: {
     visibleChange() {
       this.modalForm = { ...initModalForm };
-      this.modalForm.examRecordId = this.students.map(
-        (item) => item.examRecordId
+      this.modalForm.examStudentId = this.students.map(
+        (item) => item.examStudentId
       );
       this.dataReady = true;
     },
@@ -156,7 +156,7 @@ export default {
       this.dialogVisible = true;
     },
     idsChange(ids) {
-      this.modalForm.examRecordId = ids;
+      this.modalForm.examStudentId = ids;
     },
     async confirm() {
       const valid = await this.$refs.modalFormComp.validate().catch(() => {});

+ 10 - 2
src/features/invigilation/ReexamChecked/ReexamChecked.vue

@@ -118,9 +118,17 @@
       <el-table-column prop="examName" label="原批次"></el-table-column>
       <el-table-column prop="examActivityCode" label="原场次"></el-table-column>
       <el-table-column prop="reason" label="申请理由"></el-table-column>
-      <el-table-column prop="applyTime" label="申请时间"></el-table-column>
+      <el-table-column prop="applyTime" label="申请时间">
+        <span slot-scope="scope">{{
+          scope.row.applyTime | datetimeFilter
+        }}</span>
+      </el-table-column>
       <el-table-column prop="applyName" label="申请人"></el-table-column>
-      <el-table-column prop="auditingTime" label="审核时间"></el-table-column>
+      <el-table-column prop="auditingTime" label="审核时间">
+        <span slot-scope="scope">{{
+          scope.row.auditingTime | datetimeFilter
+        }}</span>
+      </el-table-column>
       <el-table-column
         prop="auditingStatusStr"
         label="审核结果"

+ 5 - 1
src/features/invigilation/ReexamPending/ReexamPending.vue

@@ -126,7 +126,11 @@
       <el-table-column prop="examName" label="原批次"></el-table-column>
       <el-table-column prop="examActivityCode" label="原场次"></el-table-column>
       <el-table-column prop="reason" label="申请理由"></el-table-column>
-      <el-table-column prop="applyTime" label="申请时间"></el-table-column>
+      <el-table-column prop="applyTime" label="申请时间">
+        <span slot-scope="scope">{{
+          scope.row.applyTime | datetimeFilter
+        }}</span>
+      </el-table-column>
       <el-table-column prop="applyName" label="申请人"></el-table-column>
       <el-table-column label="操作" width="100" fixed="right">
         <template slot-scope="scope">