From 72d5914b7de341dabab1c232427688fcb21fa2fd Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 03 Sep 2021 18:21:01 +0800
Subject: [PATCH] 考试申请修改
---
src/views/trainingRegistration/data.js | 7 ++
src/views/traincompany/index.vue | 17 +++++
src/api/trainingRegistration/trainingRegistration.js | 6 +
src/views/trainingRegistration/index.vue | 107 ++++++++++++++++++++++++++++++++---
src/views/companyApply/index.vue | 1
5 files changed, 123 insertions(+), 15 deletions(-)
diff --git a/src/api/trainingRegistration/trainingRegistration.js b/src/api/trainingRegistration/trainingRegistration.js
index 46ec956..9550dfd 100644
--- a/src/api/trainingRegistration/trainingRegistration.js
+++ b/src/api/trainingRegistration/trainingRegistration.js
@@ -57,7 +57,7 @@
}
-export const addExam = (ids, examTime, startTime, number, endTime) => {
+export const addExam = (ids, examTime, startTime, number, endTime, serialStart, serialEnd) => {
return request({
url: '/api/trainingRegistration/batchExam',
method: 'post',
@@ -66,7 +66,9 @@
examTime,
startTime,
number,
- endTime
+ endTime,
+ serialStart,
+ serialEnd
}
})
}
\ No newline at end of file
diff --git a/src/views/companyApply/index.vue b/src/views/companyApply/index.vue
index 03360a1..6627bc6 100644
--- a/src/views/companyApply/index.vue
+++ b/src/views/companyApply/index.vue
@@ -56,6 +56,7 @@
size="small"
icon="el-icon-folder-checked"
v-if="row.isApply != 1 && permission.company_add"
+ :disabled="row.examinationType=='1'"
@click="questionBankRowSave(row)"
>报名
</el-button>
diff --git a/src/views/traincompany/index.vue b/src/views/traincompany/index.vue
index ae0f2a9..9c6095c 100644
--- a/src/views/traincompany/index.vue
+++ b/src/views/traincompany/index.vue
@@ -35,6 +35,7 @@
size="small"
icon="el-icon-edit"
v-if="permission.traincompany_addTrain"
+ :disabled="auditStatus"
@click="handleTrainApply(row)"
>报名
</el-button>
@@ -71,12 +72,13 @@
import {adddata,batchTrain} from "@/api/trainingRegistration/trainingRegistration";
import { mapGetters } from "vuex";
import { mapState } from 'vuex';
-
+import {getUser} from "@/api/system/user";
export default {
data() {
return {
form: {},
+ auditStatus:false,
formTrainApply: {},
query: {},
deptId:null,
@@ -254,8 +256,21 @@
this.optionTrainApply.column[1].dicUrl =
"/api/blade-user/security-apply-tree?examType=2&deptId=" +
this.userInfo.dept_id;
+
+ this.getUserDetail();
},
methods: {
+ //获取用户信息
+ getUserDetail(){
+ var that = this;
+ getUser(this.userInfo.Id).then((res)=>{
+ var status = res.data.data.examinationType;
+ if(status=='1'){
+ that.auditStatus = true;
+ }
+ console.log(that.auditStatus,3333);
+ })
+ },
//保安公司批量报名
handleTrainApplyBatch(row){
this.dialogDisable = true;
diff --git a/src/views/trainingRegistration/data.js b/src/views/trainingRegistration/data.js
index 3178237..5e3c3ba 100644
--- a/src/views/trainingRegistration/data.js
+++ b/src/views/trainingRegistration/data.js
@@ -126,10 +126,12 @@
message: "请输入单位名称",
trigger: "blur"
}],
+
},
{
label: "考试名称",
- prop: "trainExamName"
+ prop: "trainExamName",
+ width: 220,
},
{
label: "考试证件",
@@ -137,6 +139,9 @@
},
{
label: "审核状态",
+ search: true,
+ type: "select",
+ searchSpan: 4,
prop: "auditStatus",
// search: true,
dicData: [{
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index 9775b39..c02e989 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -154,7 +154,7 @@
label: "考试人数",
prop: "number",
type: 'number',
- span: 6,
+ span: 12,
precision:0,
step:50,
mock:{
@@ -173,7 +173,50 @@
minRows: 0,
maxRows: 1000,
value:50,
- row:true,
+ },
+ {
+ label: "序号开始",
+ prop: "serialStart",
+ span: 6,
+ value:1,
+ mock:{
+ type:'number',
+ max:1000,
+ min:1,
+ precision:0
+ },
+ minRows: 1,
+ maxRows: 1000,
+ type:"number",
+ rules: [
+ {
+ required: true,
+ message: "请输入序号",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "序号结束",
+ prop: "serialEnd",
+ span: 6,
+ value:50,
+ mock:{
+ type:'number',
+ max:1000,
+ min:1,
+ precision:0
+ },
+ minRows: 1,
+ maxRows: 1000,
+ type:"number",
+ rules: [
+ {
+ required: true,
+ message: "请输入序号",
+ trigger: "blur",
+ },
+ ],
},
{
label: "考试时间",
@@ -200,7 +243,34 @@
trigger: "blur",
},
],
- span: 24,
+ span: 12,
+ },
+ {
+ label: "截止时间",
+ prop: "endTime",
+ type: "datetime",
+ format: "yyyy-MM-dd HH:mm",
+ valueFormat: "yyyy-MM-dd HH:mm",
+ // 表单新增时是否禁止
+ addDisabled: false,
+ // 表单新增时是否可见
+ addDisplay: true,
+ // 表单新增时是否为查看模式
+ addDetail: false,
+ // 表单编辑时是否禁止
+ editDisabled: false,
+ // 表单编辑时是否可见
+ editDisplay: true,
+ // 表单编辑时是否为查看模式
+ editDetail: false,
+ rules: [
+ {
+ required: true,
+ message: "请选择考试时间",
+ trigger: "blur",
+ },
+ ],
+ span: 12,
},
],
},
@@ -485,16 +555,31 @@
submitExamApply(row, done, loading) {
var that = this;
var startTime = row.startTime + ":00";
- // var endTime = row.examTime[1];
- // var examTime = JSON.stringify(row.examTime);
- // console.log(this.ids,111);
- addExam(this.ids, null, startTime,row.number, null).then(
+ var endTime = row.endTime + ":00";
+ if(row.number!=((row.serialEnd-row.serialStart)+1)){
+ this.$message({
+ type: "error",
+ message: "考试人数也序号不匹配!",
+ });
+ done();
+ return;
+ }
+
+ var s = new Date(startTime);
+ var e = new Date(endTime);
+ if(s>e){
+ this.$message({
+ type: "error",
+ message: "截止时间不能早于考试考试开始时间!",
+ });
+ done();
+ return;
+ }
+
+ addExam(this.ids, null, startTime,row.number, endTime,row.serialStart,row.serialEnd).then(
() => {
this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
+
that.$refs.formExamApply.resetFields();
that.dialogExamFormVisible = false;
done();
--
Gitblit v1.9.3