From 1d4e3e12f071924c931bcbded15857eb78fb6a63 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:26:30 +0800
Subject: [PATCH] 报名清册修改，报名清册生成
---
src/api/applyexam/applyexam.js | 178 ++++++++++++++++++----------------
src/views/applydetailed/index.vue | 77 ++++++++++++++
2 files changed, 168 insertions(+), 87 deletions(-)
diff --git a/src/api/applyexam/applyexam.js b/src/api/applyexam/applyexam.js
index 14e597d..7769502 100644
--- a/src/api/applyexam/applyexam.js
+++ b/src/api/applyexam/applyexam.js
@@ -1,120 +1,130 @@
import request from '@/router/axios';
export const getList = (current, size, params, deptId) => {
- return request({
- url: '/api/blade-user/page',
- method: 'get',
- params: {
- ...params,
- current,
- size,
- deptId,
- }
- })
+ return request({
+ url: '/api/blade-user/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ deptId,
+ }
+ })
}
export const remove = (ids) => {
- return request({
- url: '/api/blade-user/remove',
- method: 'post',
- params: {
- ids,
- }
- })
+ return request({
+ url: '/api/blade-user/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
}
export const add = (row) => {
- return request({
- url: '/api/blade-user/submit',
- method: 'post',
- data: row
- })
+ return request({
+ url: '/api/blade-user/submit',
+ method: 'post',
+ data: row
+ })
}
export const update = (row) => {
- return request({
- url: '/api/blade-user/update',
- method: 'post',
- data: row
- })
+ return request({
+ url: '/api/blade-user/update',
+ method: 'post',
+ data: row
+ })
}
export const updatePlatform = (userId, userType, userExt) => {
- return request({
- url: '/api/blade-user/update-platform',
- method: 'post',
- params: {
- userId,
- userType,
- userExt,
- }
- })
+ return request({
+ url: '/api/blade-user/update-platform',
+ method: 'post',
+ params: {
+ userId,
+ userType,
+ userExt,
+ }
+ })
+}
+
+export const getApplyDetailList = (examId) => {
+ return request({
+ url: '/api/apply/getApplyDetailList',
+ method: 'get',
+ params: {
+ examId,
+ }
+ })
}
export const getUser = (id) => {
- return request({
- url: '/api/blade-user/detail',
- method: 'get',
- params: {
- id,
- }
- })
+ return request({
+ url: '/api/blade-user/detail',
+ method: 'get',
+ params: {
+ id,
+ }
+ })
}
export const getUserPlatform = (id) => {
- return request({
- url: '/api/blade-user/platform-detail',
- method: 'get',
- params: {
- id,
- }
- })
+ return request({
+ url: '/api/blade-user/platform-detail',
+ method: 'get',
+ params: {
+ id,
+ }
+ })
}
export const getUserInfo = () => {
- return request({
- url: '/api/blade-user/info',
- method: 'get',
- })
+ return request({
+ url: '/api/blade-user/info',
+ method: 'get',
+ })
}
export const resetPassword = (userIds) => {
- return request({
- url: '/api/blade-user/reset-password',
- method: 'post',
- params: {
- userIds,
- }
- })
+ return request({
+ url: '/api/blade-user/reset-password',
+ method: 'post',
+ params: {
+ userIds,
+ }
+ })
}
export const updatePassword = (oldPassword, newPassword, newPassword1) => {
- return request({
- url: '/api/blade-user/update-password',
- method: 'post',
- params: {
- oldPassword,
- newPassword,
- newPassword1,
- }
- })
+ return request({
+ url: '/api/blade-user/update-password',
+ method: 'post',
+ params: {
+ oldPassword,
+ newPassword,
+ newPassword1,
+ }
+ })
}
export const updateInfo = (row) => {
- return request({
- url: '/api/blade-user/update-info',
- method: 'post',
- data: row
- })
+ return request({
+ url: '/api/blade-user/update-info',
+ method: 'post',
+ data: row
+ })
}
export const grant = (userIds, roleIds) => {
- return request({
- url: '/api/blade-user/grant',
- method: 'post',
- params: {
- userIds,
- roleIds,
- }
- })
-}
+ return request({
+ url: '/api/blade-user/grant',
+ method: 'post',
+ params: {
+ userIds,
+ roleIds,
+ }
+ })
+}
\ No newline at end of file
diff --git a/src/views/applydetailed/index.vue b/src/views/applydetailed/index.vue
index 55532da..22310e7 100644
--- a/src/views/applydetailed/index.vue
+++ b/src/views/applydetailed/index.vue
@@ -35,7 +35,7 @@
size="small"
plain
icon="el-icon-position"
- @click="handleImport"
+ @click="handleImport1"
>报名清册生成
</el-button>
<el-button
@@ -86,6 +86,55 @@
</template>
</avue-form>
</el-dialog>
+ <el-dialog
+ title="报名清册生成"
+ append-to-body
+ :visible.sync="excelBox1"
+ width="1200px"
+ >
+ <el-table
+ :data="tableData"
+ :span-method="arraySpanMethod"
+ border
+ style="width: 100%">
+
+ <template slot-scope="{ row }" slot="sex">
+ {{row.sex==1?"男":row.sex==2?"女":row.sex==-1?'':row.sex}}
+ </template>
+ <el-table-column
+ prop="realName"
+ label="姓名">
+ </el-table-column>
+ <el-table-column
+ prop="idCardNo"
+ label="身份证号">
+ </el-table-column>
+ <el-table-column
+ prop="sex"
+ label="性别">
+ <template slot-scope="scope">
+ {{scope.row.sex==1?"男":scope.row.sex==2?"女":scope.row.sex==-1?'':scope.row.sex}}
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="candidateNo"
+ label="准考证号">
+ </el-table-column>
+ <el-table-column
+ prop="deptName"
+ width="180"
+ label="单位名称">
+ </el-table-column>
+ <el-table-column
+ prop="applyCard"
+ label="报考证件">
+ </el-table-column>
+ <el-table-column
+ prop="applyTime"
+ label="报名时间">
+ </el-table-column>
+ </el-table>
+ </el-dialog>
</div>
</el-card>
</el-col>
@@ -94,6 +143,7 @@
<script>
import { getApplyList, addApply, remove } from "@/api/examapi/applyexam";
+import { getApplyDetailList } from "@/api/applyexam/applyexam";
import { mapState } from "vuex";
var DIC = {
@@ -113,10 +163,12 @@
data() {
var examId = this.$route.query.id;
return {
+ tableData:[],
obj: {
name: "张三",
},
excelBox: false,
+ excelBox1: false,
questionBankOption: {
// 操作栏多余按钮去除
delBtn: false,
@@ -547,7 +599,7 @@
questionBankOnLoad(page, params = {}) {
// debugger;
params["examId"] = this.$route.query.id;
- // params["applyStatus"] = 2;
+ params["applyStatus"] = 3;
this.questionBankLoading = false;
getApplyList(
page.currentPage,
@@ -648,10 +700,29 @@
});
},
-
handleImport() {
this.excelBox = true;
},
+ handleImport1() {
+ this.excelBox1 = true;
+ //获取报名信息
+ getApplyDetailList(this.$route.query.id).then((res)=>{
+ // console.log(res.data,111452);
+ this.tableData = res.data.applyList;
+ this.tableData.push({
+ realName:"总人数",
+ idCardNo:res.data.num
+ })
+ })
+ },
+ arraySpanMethod({ rowIndex, columnIndex }) {
+ // console.log(rowIndex,columnIndex,333);
+ if(rowIndex == (this.tableData.length-1)){
+ if (columnIndex === 0) {
+ return [1, 6];
+ }
+ }
+ },
handleTemplate() {
window.open(`/api/apply/export-template`);
},
--
Gitblit v1.9.3