From 47a0f58d4334939b08a55b9356f94de23c8b1367 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Jun 2022 14:56:26 +0800
Subject: [PATCH] 新增保安员导入

---
 src/views/trainExam/performance.vue |   59 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index 5eb320a..f81da23 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -114,6 +114,7 @@
         >
         <el-button
           icon="el-icon-s-promotion"
+          style="display:none"
           @click="openzhengjian(row)"
           :disabled="row.qualified != 0"
           :size="size"
@@ -123,6 +124,7 @@
         <el-button
           icon="el-icon-edit"
           @click="modifiedGrades(row)"
+          v-if="permission.apply_modifiedGrades"
           :size="size"
           :type="type"
           >申请修改成绩</el-button
@@ -428,14 +430,14 @@
             ]
           },
           {
-            label: "身份证号",
+            label: "身份证号码",
             prop: "account",
             labelWidth: 110,
             disabled: true,
             rules: [
               {
                 required: true,
-                message: "请输入身份证号",
+                message: "请输入身份证号码",
                 trigger: "blur"
               }
             ]
@@ -590,7 +592,7 @@
         dialogClickModal: false,
         // 操作栏宽度
         menu: true,
-        menuWidth: 330,
+        menuWidth: 280,
         labelWidth: 120,
         ...this.$store.state.control.clearOtherBut,
 
@@ -669,7 +671,6 @@
             // 表单编辑时是否可见
             editDisplay: true,
             searchLabelWidth: 50,
-            searchSpan: 3,
             // 表单编辑时是否为查看模式
             editDetail: false,
             rules: [
@@ -684,7 +685,7 @@
           },
           {
             label: "身份证号",
-            prop: "account",
+            prop: "cardNo",
             search: true,
             searchSpan: 4,
             slot: true,
@@ -737,18 +738,18 @@
             ],
             width: 110
           },
-          {
-            label: "照片",
-            prop: "avatar",
-            type: "upload",
-            listType: "picture-img",
-            width: 60,
-            editDisabled: false,
-            // 表单编辑时是否可见
-            editDisplay: false,
-            // 表单编辑时是否为查看模式
-            editDetail: false
-          },
+          // {
+          //   label: "照片",
+          //   prop: "avatar",
+          //   type: "upload",
+          //   listType: "picture-img",
+          //   width: 60,
+          //   editDisabled: false,
+          //   // 表单编辑时是否可见
+          //   editDisplay: false,
+          //   // 表单编辑时是否为查看模式
+          //   editDetail: false
+          // },
           {
             label: "所属公司",
             prop: "companyName",
@@ -780,7 +781,7 @@
                 trigger: "blur"
               }
             ],
-            width: 180,
+            minWidth: 180,
             overHidden: true
           },
           {
@@ -1479,33 +1480,33 @@
       getNowDate().then(res => {
         var num = 24 * 3600 * 1000;
         if (this.userInfo.role_name == "培训公司管理员") {
-          if (res.data.data - longtime <= num) {
+          // if (res.data.data - longtime <= num) {
             this.form = {
               id: null,
               examScoreId: row.id,
               examName: row.examName,
               candidateNo: row.candidateNo,
-              account: row.account,
+              account: row.cardNo,
               securityName: row.securityName,
               theoryGrade: row.theoryGrade,
               learnGrade: row.learnGrade,
               allGrade: row.allGrade
             };
             this.gradeBoxVisible = true;
-          } else {
-            //提示
-            that.$message({
-              type: "warning",
-              message: "成绩修改申请只能在考试截止时间后的24小内提交!"
-            });
-          }
+          // } else {
+          //   //提示
+          //   that.$message({
+          //     type: "warning",
+          //     message: "成绩修改申请只能在考试截止时间后的24小内提交!"
+          //   });
+          // }
         } else {
           this.form = {
             id: null,
             examScoreId: row.id,
             examName: row.examName,
             candidateNo: row.candidateNo,
-            account: row.account,
+            account: row.cardNo,
             securityName: row.securityName,
             theoryGrade: row.theoryGrade,
             learnGrade: row.learnGrade,
@@ -1632,7 +1633,7 @@
         //获取查询条件
         // console.log(this.questionBankSearch, 456);
         var data = {
-          account: this.questionBankSearch.account,
+          account: this.questionBankSearch.cardNo,
           companyName: this.questionBankSearch.companyName,
           examDate: this.questionBankSearch.examDate,
           isExam: this.questionBankSearch.isExam,

--
Gitblit v1.9.3