From 683049059387add39e8f1b24a1bbdd54e6a99ab1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 03 Dec 2021 17:24:44 +0800
Subject: [PATCH] 考试资格审查修改
---
src/api/qualificationExamination/signQualificationExamination.js | 12 +++
src/views/qualificationExamination/signQualificationExamination.vue | 203 ++++++++++++++++++++++++++++++++++++++------------
2 files changed, 165 insertions(+), 50 deletions(-)
diff --git a/src/api/qualificationExamination/signQualificationExamination.js b/src/api/qualificationExamination/signQualificationExamination.js
index 810ce7a..8173281 100644
--- a/src/api/qualificationExamination/signQualificationExamination.js
+++ b/src/api/qualificationExamination/signQualificationExamination.js
@@ -23,6 +23,18 @@
})
}
+export const getTrainList = (current, size, params) => {
+ return request({
+ url: '/api/trainingRegistration/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
export const adddata = (row) => {
return request({
// return newAxios({
diff --git a/src/views/qualificationExamination/signQualificationExamination.vue b/src/views/qualificationExamination/signQualificationExamination.vue
index 0c3faae..ee42fd4 100644
--- a/src/views/qualificationExamination/signQualificationExamination.vue
+++ b/src/views/qualificationExamination/signQualificationExamination.vue
@@ -3,7 +3,7 @@
* @Date: 2021-07-07 17:30:05
* @Last Modified by: Morpheus
* @Last Modified time: 2021-07-10 16:06:14
- * menu-name 监管信息
+ * menu-name 考试监管信息
*/
<template>
<basic-container>
@@ -12,6 +12,7 @@
:table-loading="loading"
:data="data"
:page.sync="page"
+ :search.sync="search"
:permission="permissionList"
v-model="form"
ref="crud"
@@ -32,8 +33,7 @@
<script>
import {
- getList,
- getListJSON,
+ getTrainList,
} from "@/api/qualificationExamination/signQualificationExamination";
import { mapGetters } from "vuex";
@@ -42,6 +42,7 @@
return {
form: {},
query: {},
+ search:{},
loading: true,
page: {
pageSize: 10,
@@ -71,26 +72,42 @@
{
label: "保安姓名",
prop: "realName",
+ search:true,
+ searchSpan: 3,
+ width:90
+ },
+ {
+ label: "性别",
+ prop: "sex",
+ width:80,
+ dicData: [
+ {
+ label: "男",
+ value: 1,
+ },
+ {
+ label: "女",
+ value: 2,
+ }
+ ],
+ },
+ {
+ label: "身份证号",
+ prop: "idCardNo",
+ search:true,
+ searchSpan: 5,
+ width:140
},
{
label: "保安公司",
prop: "deptName",
overHidden: true,
search: true,
- searchSpan: 4,
- // display: false,
- // labelWidth: 120,
- // width: 200,
+ searchSpan: 5,
},
- // {
- // label: "准考证号",
- // prop: "userId",
- // overHidden: true,
- // },
-
{
label: "报名时间",
- prop: "applyTime",
+ prop: "trainingTime",
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
@@ -102,43 +119,108 @@
// search: true,
searchSpan: 4,
// display: false,·
- width: 180,
+ width: 120,
},
- // {
- // label: "考试时间",
- // prop: "applyTime",
- // type: "date",
- // format: "yyyy-MM-dd",
- // valueFormat: "yyyy-MM-dd",
- // mock: {
- // type: "datetime",
- // labelWidth: 120,
- // format: "yyyy-MM-dd",
- // },
- // // search: true,
- // searchSpan: 4,
- // // display: false,
- // width: 180,
- // },
- // {
- // label: "证件类型",
- // prop: "certificatetype",
- // // labelWidth: 120,
- // // display: false,
- // },
- // {
- // label: "保安员证",
- // prop: "certificate",
- // // labelWidth: 120,
- // // display: false,
- // },
+ {
+ label: "考试名称",
+ prop: "trainExamName",
+ searchSpan: 5,
+ overHidden: true,
+ search:true
+ },
+ {
+ label: "培训学校名称",
+ searchLabelWidth:110,
+ searchSpan: 5,
+ prop: "trainUnitName",
+ overHidden: true,
+ search:true
+ },
+ {
+ label: "考试时间",
+ prop: "trainExamTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ // mock: {
+ // type: "datetime",
+ // labelWidth: 120,
+ // format: "yyyy-MM-dd",
+ // },
+ // search: true,
+ // searchSpan: 4,
+ // display: false,
+ width: 150,
+ },
+ {
+ label: "考试时间",
+ prop: "examTime",
+ type: "date",
+ hide:true,
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ // mock: {
+ // type: "datetime",
+ // labelWidth: 120,
+ // format: "yyyy-MM-dd",
+ // },
+ search: true,
+ searchSpan: 4,
+ // display: false,
+ width: 150,
+ },
+ {
+ label: "考试申请审核状态",
+ prop: "auditStatus",
+ searchLabelWidth:140,
+ type:"select",
+ width: 100,
+ search:true,
+ searchSpan:4,
+ dicData:[
+ {
+ label:"全部",
+ value:0
+ },
+ {
+ label:"待审核",
+ value:3
+ },
+ {
+ label:"审核通过",
+ value:1
+ },
+ {
+ label:"审核不通过",
+ value:2
+ },
+ {
+ label:"未提交审核",
+ value:4
+ },
+ ]
+ },
{
label: "审查状态",
prop: "examinationType",
- // // display: false,
- // width: 200,
- // labelWidth: 120,
- // overHidden: true,
+ type:"select",
+ width: 80,
+ search:true,
+ searchSpan:3,
+ dicData:[
+ {
+ label:"全部",
+ value:"2"
+ },
+ {
+ label:"正常",
+ value:"0"
+ },
+ {
+ label:"异常",
+ value:"1"
+ },
+ ]
},
{
label: "审查明细",
@@ -147,6 +229,13 @@
// width: 200,
// labelWidth: 120,
// overHidden: true,
+ },
+ {
+ label: "审查时间",
+ prop: "auditTime",
+ type: "date",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
},
// {
// label: "审查结果",
@@ -213,6 +302,9 @@
});
return ids.join(",");
},
+ },
+ created(){
+ this.search["auditStatus"] = 3;
},
methods: {
rowSave(row, done, loading) {
@@ -301,8 +393,11 @@
},
onLoad(page, params = {}) {
// this.loading = false;
+ params = this.search;
this.loading = true;
- getList(
+ //已提交考试审核
+ // params['auditStatus'] = 3;
+ getTrainList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
@@ -311,11 +406,19 @@
this.page.total = data.total;
var d = data.records;
for (var k in d) {
- if (d[k].examinationType == 1) {
+ if ( d[k].examinationType == "0" ||
+ d[k].examinationType == "" ||
+ d[k].examinationType == null ) {
d[k].examinationType = "正常";
- } else if (d[k].examinationType == 2) {
+ } else if (d[k].examinationType == "1") {
d[k].examinationType = "异常";
}
+ if(d[k].sex==-1){
+ d[k].sex = "";
+ }
+ if(d[k].auditStatus==-1){
+ d[k].auditStatus = "";
+ }
}
this.data = data.records;
this.loading = false;
--
Gitblit v1.9.3