From 36bcd67363842d58ade5f460f4ecf2804d7a46ba Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 06 Sep 2021 16:52:20 +0800
Subject: [PATCH] 培训考试列表修改，新增审核状态，考试申请修改，考试成绩修改，新增缺考标记

---
 src/views/trainingRegistration/index.vue |   44 +++++++++++++++++++++-----------------------
 1 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index c02e989..9765753 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -5,6 +5,7 @@
       :table-loading="loading"
       :data="data"
       :page.sync="page"
+      :search.sync="search"
       ref="crud"
       @row-del="rowDel"
       v-model="form"
@@ -57,6 +58,7 @@
           :size="size"
           :type="type"
           v-if="permission.trainingRegistration_cancel"
+          :disabled="row.cancel==2"
           >取消报名</el-button
         >
         <el-button
@@ -64,7 +66,7 @@
           size="small"
           icon="el-icon-receiving"
           v-if="permission.trainingRegistration_print"
-          :disabled="row.candidateNo == ''"
+          :disabled="row.candidateNo == '' || row.cancel==2"
           @click="handlePrint(row)"
           >准考证打印
         </el-button>
@@ -133,6 +135,7 @@
       loading: true,
       excelBox: false,
       dialogExamFormVisible: false,
+      search:{},
       optionExamApply: {
         height: "auto",
         filterBtn: true,
@@ -343,6 +346,11 @@
         editBtn: this.vaildData(this.permission.notice_edit, false),
       };
     },
+   
+  },
+  created(){
+    this.search['cancel'] = 1;
+    this.search['auditStatus'] = 4;
   },
   methods: {
     //准考证查看
@@ -355,15 +363,12 @@
       });
     },
     sizeChange(val) {
-      this.page1.currentPage = 1;
-      this.page1.pageSize = val;
+      this.page.pageSize = val;
       this.getData();
-      //   this.$message.success("行数" + val);
     },
     currentChange(val) {
-      this.page1.currentPage = val;
+      this.page.currentPage = val;
       this.getData();
-      //   this.$message.success("页码" + val);
     },
     rowSave(form, done, loading) {
       var that = this;
@@ -405,8 +410,6 @@
       this.onLoad(this.page);
     },
     rowUpdate(row, index, done, loading) {
-      // console.log(row);
-
       update(row).then(
         () => {
           this.onLoad(this.page);
@@ -515,7 +518,7 @@
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      // params['cancel'] = 111;
+      params = this.search;
       this.loading = true;
       getdata(
         page.currentPage,
@@ -554,8 +557,8 @@
     //生成考试
     submitExamApply(row, done, loading) {
       var that = this;
-      var startTime = row.startTime + ":00";
-      var endTime = row.endTime + ":00";
+      row.startTime = row.startTime + ":00";
+      row.endTime = row.endTime + ":00";
       if(row.number!=((row.serialEnd-row.serialStart)+1)){
           this.$message({
             type: "error",
@@ -565,8 +568,8 @@
          return;
       }
 
-      var s = new Date(startTime);
-      var e = new Date(endTime);
+      var s = new Date(row.startTime);
+      var e = new Date(row.endTime);
       if(s>e){
         this.$message({
             type: "error",
@@ -576,12 +579,15 @@
          return;
       }
       
-      addExam(this.ids, null, startTime,row.number, endTime,row.serialStart,row.serialEnd).then(
+      addExam(Object.assign(row, this.search)).then(
         () => {
           this.onLoad(this.page);
-          
           that.$refs.formExamApply.resetFields();
           that.dialogExamFormVisible = false;
+          this.$message({
+            type: "success",
+            message: "操作成功",
+          });
           done();
         },
         (error) => {
@@ -594,14 +600,6 @@
     closeDialog() {
       this.$refs.formExamApply.resetFields();
     },
-  },
-  mounted() {
-    // this.Ourdata = data;
-    // this.getData();
-    // this.onLoad(this.page);
-    // var dept_id = JSON.parse(
-    //   window.localStorage.getItem("saber-userInfo")
-    // ).content.dept_id;
   },
 };
 </script>

--
Gitblit v1.9.3