From a2aa94ae99095ec3fb5c463eefca33f89fd25bca Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 05 三月 2024 08:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/commonMod/examApply/index.vue | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/views/commonMod/examApply/index.vue b/src/views/commonMod/examApply/index.vue
index be2cf37..7e5194d 100644
--- a/src/views/commonMod/examApply/index.vue
+++ b/src/views/commonMod/examApply/index.vue
@@ -42,22 +42,22 @@
size="mini"
@click="openExamApply({},'add')"
v-hasPermi="['system:experts:add']"
- >新增考试计划</el-button>
+ >考试计划申请</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="dataList">
- <el-table-column label="序号" align="center" type="index"/>
+ <el-table-column label="归档序号" align="center" type="index"/>
<el-table-column label="机构名称" align="center" prop="institutionName" />
<el-table-column label="考试点名称" align="center" prop="siteName" />
<el-table-column label="考试批次全称" align="center" prop="examName" />
<el-table-column label="考试人数" align="center" prop="examNum" />
- <el-table-column label="计划正考时间" align="center">
+ <el-table-column label="正考时间安排" align="center">
<template #default="scope">
{{scope.row.examStartTime.substring(0,16) + '--' + scope.row.examEndTime.substring(0,16)}}
</template>
</el-table-column>
- <el-table-column label="计划补考时间" align="center">
+ <el-table-column label="补考时间安排" align="center">
<template #default="scope">
{{scope.row.resitStartTime.substring(0,16) + '--' + scope.row.resitEndTime.substring(0,16)}}
</template>
@@ -77,22 +77,34 @@
{{scope.row.siteContacts + '(' + scope.row.siteContactsPhone + ')'}}
</template>
</el-table-column>
- <el-table-column label="提交时间" align="center" prop="updateTime" />
+ <el-table-column label="申请提交时间" align="center" prop="updateTime" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
+ @click="alpop('机构暂未导入报名详单。')"
+ >报名详情</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-view"
+ @click="alpop('成绩信息暂未上传。')"
+ >成绩清单查询</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-view"
@click="openExamApply(scope.row,'view')"
- >查看详情</el-button>
+ >申请审批</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="openExamApply(scope.row,'edit')"
v-hasPermi="['system:experts:remove']"
- >编辑</el-button>
+ >信息设定分配</el-button>
<el-button
size="mini"
type="text"
@@ -231,6 +243,9 @@
},
openExamApply(data,type){
this.$refs.examApplyDialog.openDialog(data,type);
+ },
+ alpop(value){
+ alert(value)
}
}
};
--
Gitblit v1.9.2