parent
a5fd0bdb89
commit
b8ea5d89d7
@ -0,0 +1,37 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function index(params,isLoading = true) {
|
||||
return request({
|
||||
method: 'get',
|
||||
url: '/api/admin/batch-data/index',
|
||||
params,
|
||||
isLoading
|
||||
})
|
||||
}
|
||||
|
||||
export function show(params,isLoading = true) {
|
||||
return request({
|
||||
method: 'get',
|
||||
url: '/api/admin/batch-data/show',
|
||||
params,
|
||||
isLoading
|
||||
})
|
||||
}
|
||||
|
||||
export function save(data, isLoading = true) {
|
||||
return request({
|
||||
method: 'post',
|
||||
url: '/api/admin/batch-data/save',
|
||||
data,
|
||||
isLoading
|
||||
})
|
||||
}
|
||||
|
||||
export function destroy(params, isLoading = true) {
|
||||
return request({
|
||||
method: 'get',
|
||||
url: '/api/admin/batch-data/destroy',
|
||||
params,
|
||||
isLoading
|
||||
})
|
||||
}
|
||||
@ -0,0 +1,415 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card shadow="never" style="margin-top: 20px">
|
||||
<template #header>
|
||||
<slot name="header">
|
||||
<vxe-toolbar :print="isHasAuth('print')" custom ref="toolbar">
|
||||
<template #toolSuffix>
|
||||
<vxe-button
|
||||
style="margin-right: 10px"
|
||||
v-if="isHasAuth('export')"
|
||||
icon="vxe-icon-download"
|
||||
circle
|
||||
@click="exportMethod"
|
||||
></vxe-button>
|
||||
</template>
|
||||
<template #buttons>
|
||||
<el-button
|
||||
v-if="isHasAuth('search')"
|
||||
icon="el-icon-search"
|
||||
type="primary"
|
||||
plain
|
||||
size="small"
|
||||
@click="getList(true)"
|
||||
>搜索</el-button
|
||||
>
|
||||
</template>
|
||||
</vxe-toolbar>
|
||||
</slot>
|
||||
</template>
|
||||
|
||||
<vxe-table
|
||||
ref="table"
|
||||
stripe
|
||||
style="margin-top: 10px"
|
||||
:loading="loading"
|
||||
:height="tableHeight"
|
||||
keep-source
|
||||
show-overflow
|
||||
:menu-config="{
|
||||
className: 'my-menus',
|
||||
body: {
|
||||
options: [
|
||||
[
|
||||
{
|
||||
code: 'copy',
|
||||
name: '复制',
|
||||
prefixConfig: { icon: 'vxe-icon-copy' },
|
||||
suffixConfig: { content: 'Ctrl+C' },
|
||||
},
|
||||
{
|
||||
code: 'remove',
|
||||
name: '删除',
|
||||
prefixConfig: {
|
||||
icon: 'vxe-icon-delete-fill',
|
||||
className: 'color-red',
|
||||
},
|
||||
},
|
||||
],
|
||||
],
|
||||
},
|
||||
}"
|
||||
@menu-click="contextMenuClickEvent"
|
||||
:row-config="{ isCurrent: true, isHover: true }"
|
||||
:column-config="{ resizable: true }"
|
||||
:export-config="{}"
|
||||
:edit-rules="validRules"
|
||||
:edit-config="{
|
||||
trigger: 'manual',
|
||||
mode: 'row',
|
||||
showStatus: true,
|
||||
isHover: true,
|
||||
autoClear: false,
|
||||
}"
|
||||
:align="allAlign"
|
||||
:data="tableData"
|
||||
>
|
||||
<vxe-column type="checkbox" width="50" align="center" />
|
||||
<vxe-column type="seq" width="58" align="center" />
|
||||
<vxe-column min-width="160" title="填报名称" field="aspiration.title" header-align="center"></vxe-column>
|
||||
<vxe-column width="180" align="center" title="填报时间" field="created_at"></vxe-column>
|
||||
<vxe-column
|
||||
field="operate"
|
||||
header-align="center"
|
||||
title="操作"
|
||||
min-width="220"
|
||||
fixed="right"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<template v-if="isActiveStatus(row)">
|
||||
<el-button size="small" type="primary" @click="saveRowEvent(row)"
|
||||
>保存</el-button
|
||||
>
|
||||
<el-button
|
||||
size="small"
|
||||
type="primary"
|
||||
plain
|
||||
@click="cancelRowEvent(row)"
|
||||
>取消</el-button
|
||||
>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-button
|
||||
v-if="isHasAuth('detail')"
|
||||
size="small"
|
||||
type="primary"
|
||||
plain
|
||||
@click="detail(row)"
|
||||
>查看</el-button
|
||||
>
|
||||
<el-button
|
||||
v-if="isHasAuth('edit')"
|
||||
size="small"
|
||||
type="warning"
|
||||
@click="editRowEvent(row)"
|
||||
>编辑</el-button
|
||||
>
|
||||
<el-button
|
||||
v-if="isHasAuth('delete')"
|
||||
size="small"
|
||||
type="danger"
|
||||
@click="destroyRowEvent(row)"
|
||||
>删除</el-button
|
||||
>
|
||||
</template>
|
||||
</template>
|
||||
</vxe-column>
|
||||
</vxe-table>
|
||||
|
||||
<el-pagination
|
||||
style="margin-top: 10px; display: flex; justify-content: flex-end"
|
||||
:current-page.sync="select.page"
|
||||
:page-sizes="[20, 30, 40, 50]"
|
||||
:page-size.sync="select.page_size"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
:total="total"
|
||||
@size-change="
|
||||
(e) => {
|
||||
select.page_size = e;
|
||||
select.page = 1;
|
||||
getList();
|
||||
}
|
||||
"
|
||||
@current-change="
|
||||
(e) => {
|
||||
select.page = e;
|
||||
getList();
|
||||
}
|
||||
"
|
||||
/>
|
||||
</el-card>
|
||||
|
||||
<ShowBatchData ref="ShowBatchData" :is-show.sync="isShowDetail" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import VxeUI from "vxe-pc-ui";
|
||||
|
||||
import { authMixin } from "@/mixin/authMixin";
|
||||
import { uploadSize } from "@/settings";
|
||||
import { deepCopy } from "@/utils";
|
||||
import { download } from "@/utils/downloadRequest";
|
||||
import { destroy, index, save } from "@/api/batch-data/batch-data";
|
||||
import ShowBatchData from "./components/ShowBatchData.vue";
|
||||
import axios from "axios";
|
||||
import { getToken } from "@/utils/auth";
|
||||
|
||||
export default {
|
||||
name: "BatchData",
|
||||
mixins: [authMixin],
|
||||
components: {
|
||||
ShowBatchData,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
uploadSize,
|
||||
examineKey: 0,
|
||||
isShowDetail: false,
|
||||
|
||||
loading: false,
|
||||
tableHeight: 400,
|
||||
select: {
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
keyword: "",
|
||||
show_relation: ["aspiration"],
|
||||
},
|
||||
total: 0,
|
||||
allAlign: null,
|
||||
tableData: [],
|
||||
form: {
|
||||
id: "",
|
||||
},
|
||||
validRules: {},
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
isActiveStatus() {
|
||||
return function (row) {
|
||||
if (this.$refs["table"]) {
|
||||
return this.$refs["table"].isEditByRow(row);
|
||||
}
|
||||
};
|
||||
},
|
||||
isHasAuth() {
|
||||
return function (auth) {
|
||||
return this.auths_auth_mixin.indexOf(auth) !== -1;
|
||||
};
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
mounted() {
|
||||
this.bindToolbar();
|
||||
this.calcTableHeight();
|
||||
},
|
||||
methods: {
|
||||
exportMethod() {
|
||||
this.$confirm("请选择导出方式", "提示", {
|
||||
confirmButtonText: "全量导出",
|
||||
cancelButtonText: "部分导出",
|
||||
distinguishCancelAndClose: true,
|
||||
})
|
||||
.then((_) => {
|
||||
download("/api/admin/school/index", "get", {
|
||||
...this.select,
|
||||
page: 1,
|
||||
page_size: 9999,
|
||||
is_export: 1,
|
||||
export_fields: Object.keys(this.form),
|
||||
});
|
||||
})
|
||||
.catch((action) => {
|
||||
if (action === "cancel" && this.$refs["table"]) {
|
||||
this.$refs["table"].openExport();
|
||||
}
|
||||
});
|
||||
},
|
||||
calcTableHeight() {
|
||||
let clientHeight = document.documentElement.clientHeight;
|
||||
let cardTitle = document
|
||||
.querySelector(".el-card__header")
|
||||
?.getBoundingClientRect()?.height;
|
||||
let search = document
|
||||
.querySelector(".vxe-toolbar")
|
||||
?.getBoundingClientRect()?.height;
|
||||
let paginationHeight =
|
||||
(document.querySelector(".el-pagination")?.getBoundingClientRect()
|
||||
?.height ?? 0) + 10; //分页的高度
|
||||
let topHeight = 50; //页面 头部
|
||||
let padding = 80;
|
||||
let margin = 20;
|
||||
this.tableHeight =
|
||||
clientHeight -
|
||||
cardTitle -
|
||||
search -
|
||||
paginationHeight -
|
||||
topHeight -
|
||||
padding -
|
||||
margin;
|
||||
},
|
||||
contextMenuClickEvent({ menu, row, column }) {
|
||||
switch (menu.code) {
|
||||
case "copy":
|
||||
// 示例
|
||||
if (row && column) {
|
||||
if (VxeUI.clipboard.copy(row[column.field])) {
|
||||
this.$message.success("已复制到剪贴板！");
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "remove":
|
||||
if (row && column) {
|
||||
this.destroyRowEvent(row);
|
||||
}
|
||||
default:
|
||||
}
|
||||
},
|
||||
async detail(row) {
|
||||
await this.$refs["ShowBatchData"].getDetail(row.id);
|
||||
this.isShowDetail = true;
|
||||
},
|
||||
|
||||
uploadMethod(file) {
|
||||
const formData = new FormData();
|
||||
formData.append("file", file);
|
||||
window.$_uploading = true;
|
||||
return axios
|
||||
.post(process.env.VUE_APP_UPLOAD_API, formData, {
|
||||
headers: {
|
||||
Authorization: `Bearer ${getToken()}`,
|
||||
},
|
||||
})
|
||||
.then((response) => {
|
||||
window.$_uploading = false;
|
||||
if (response.status === 200 && !response.data.code) {
|
||||
return {
|
||||
response: response.data,
|
||||
name: response.data.original_name,
|
||||
url: response.data.url,
|
||||
};
|
||||
} else {
|
||||
this.$message.error("上传失败");
|
||||
}
|
||||
})
|
||||
.catch((_) => {
|
||||
window.$_uploading = false;
|
||||
});
|
||||
},
|
||||
bindToolbar() {
|
||||
this.$nextTick(() => {
|
||||
if (this.$refs["table"] && this.$refs["toolbar"]) {
|
||||
this.$refs["table"].connect(this.$refs["toolbar"]);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
editRowEvent(row) {
|
||||
if (this.$refs["table"]) {
|
||||
this.$refs["table"].setEditRow(row);
|
||||
}
|
||||
},
|
||||
cancelRowEvent(row) {
|
||||
if (this.$refs["table"]) {
|
||||
this.$refs["table"].clearEdit().then(() => {
|
||||
// 还原行数据
|
||||
this.$refs["table"].revertData(row);
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
async getList(isRefresh) {
|
||||
if(isRefresh) {
|
||||
this.select.page = 1
|
||||
}
|
||||
this.loading = true;
|
||||
try {
|
||||
const res = await index(this.select, false);
|
||||
this.tableData = res.data;
|
||||
this.total = res.total;
|
||||
this.loading = false;
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
this.loading = false;
|
||||
}
|
||||
},
|
||||
|
||||
async saveRowEvent(row) {
|
||||
if (window.$_uploading) {
|
||||
this.$message.warning("文件正在上传中");
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const errMap = await this.$refs["table"].validate();
|
||||
if (errMap) {
|
||||
throw new Error(errMap);
|
||||
}
|
||||
await this.$confirm("确认保存？", "提示", {
|
||||
confirmButtonText: "确认",
|
||||
cancelButtonText: "取消",
|
||||
});
|
||||
await this.$refs["table"].clearEdit();
|
||||
let form = deepCopy(this.form);
|
||||
for (const key in form) {
|
||||
form[key] = row[key];
|
||||
}
|
||||
|
||||
this.loading = true;
|
||||
await save(form, false);
|
||||
await this.getList();
|
||||
this.loading = false;
|
||||
} catch (err) {
|
||||
this.loading = false;
|
||||
}
|
||||
},
|
||||
async destroyRowEvent(row) {
|
||||
try {
|
||||
await this.$confirm("确认删除？", "提示", {
|
||||
confirmButtonText: "确认",
|
||||
cancelButtonText: "取消",
|
||||
});
|
||||
this.loading = true;
|
||||
if (row.id) {
|
||||
await destroy(
|
||||
{
|
||||
id: row.id,
|
||||
},
|
||||
false
|
||||
);
|
||||
await this.getList();
|
||||
} else {
|
||||
console.log(row);
|
||||
this.tableData.splice(
|
||||
this.tableData.findIndex((i) => i._X_ROW_KEY === row._X_ROW_KEY),
|
||||
1
|
||||
);
|
||||
}
|
||||
this.loading = false;
|
||||
} catch (err) {
|
||||
this.loading = false;
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
::v-deep .el-card__header {
|
||||
padding: 6px 20px;
|
||||
}
|
||||
::v-deep .el-tag + .el-tag {
|
||||
margin-left: 4px;
|
||||
}
|
||||
</style>
|
||||
@ -0,0 +1,179 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-drawer
|
||||
:title="$route.meta.title"
|
||||
direction="rtl"
|
||||
size="100%"
|
||||
:visible.sync="visible"
|
||||
append-to-body
|
||||
@close="$emit('update:isShow', false)"
|
||||
>
|
||||
<section class="drawer-container">
|
||||
<h3 class="title">{{ detail.aspiration ? detail.aspiration.title : '' }}</h3>
|
||||
|
||||
<vxe-table ref="table" :data="list" align="center" border :merge-cells="mergeCells">
|
||||
<vxe-colgroup title="录取批次" align="center">
|
||||
<vxe-column title="" field="name"></vxe-column>
|
||||
<vxe-column title="" field="batchSubs.name"></vxe-column>
|
||||
</vxe-colgroup>
|
||||
<vxe-column field="batchSubs.batchSubSchools.name" title="志愿序号"></vxe-column>
|
||||
<vxe-colgroup title="学校">
|
||||
<vxe-column title="代码" field="batchSubs.batchSubSchools.code"></vxe-column>
|
||||
<vxe-column title="名称" field="batchSubs.batchSubSchools.value"></vxe-column>
|
||||
</vxe-colgroup>
|
||||
<vxe-colgroup title="专业">
|
||||
<vxe-column title="序号" field="batchSubs.batchSubSchools.specialties.name"></vxe-column>
|
||||
<vxe-column title="代码" field="batchSubs.batchSubSchools.specialties.code"></vxe-column>
|
||||
<vxe-column title="名称" field="batchSubs.batchSubSchools.specialties.value"></vxe-column>
|
||||
</vxe-colgroup>
|
||||
<vxe-colgroup title="其他专业是否服从">
|
||||
<vxe-column title="（是/否）" field=""></vxe-column>
|
||||
</vxe-colgroup>
|
||||
</vxe-table>
|
||||
</section>
|
||||
</el-drawer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { show } from "@/api/batch-data/batch-data";
|
||||
export default {
|
||||
name: "BatchDataShow",
|
||||
props: {
|
||||
isShow: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
visible: false,
|
||||
detail: {},
|
||||
list: []
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
isShow(newVal) {
|
||||
this.visible = newVal;
|
||||
},
|
||||
visible(newVal) {
|
||||
this.$emit("update:isShow", newVal);
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
formatData(arr) {
|
||||
const transformedArray = [];
|
||||
arr.forEach(batch => {
|
||||
batch.batchSubs.forEach(sub => {
|
||||
sub.batchSubSchools.forEach(school => {
|
||||
if (school.specialties.length > 0) {
|
||||
school.specialties.forEach(specialty => {
|
||||
transformedArray.push({
|
||||
name: batch.name,
|
||||
batchId: batch.batchId,
|
||||
batchSubs: {
|
||||
name: sub.name,
|
||||
batchSubId: sub.batchSubId,
|
||||
batchSubSchools: {
|
||||
code: school.code,
|
||||
name: school.name,
|
||||
value: school.value,
|
||||
specialties: {
|
||||
code: specialty.code,
|
||||
name: specialty.name,
|
||||
value: specialty.value,
|
||||
specialtyId: specialty.specialtyId
|
||||
},
|
||||
batchSubSchoolId: school.batchSubSchoolId
|
||||
},
|
||||
[sub.notShowSchoolObey ? 'notShowSchoolObey' : 'schoolObey']: sub.notShowSchoolObey ? sub.notShowSchoolObey : sub.schoolObey,
|
||||
[sub.notShowSpecialtyObey ? 'notShowSpecialtyObey' : 'specialtyObey']: sub.notShowSpecialtyObey ? sub.notShowSpecialtyObey : sub.specialtyObey
|
||||
}
|
||||
});
|
||||
});
|
||||
} else {
|
||||
transformedArray.push({
|
||||
name: batch.name,
|
||||
batchId: batch.batchId,
|
||||
batchSubs: {
|
||||
name: sub.name,
|
||||
batchSubId: sub.batchSubId,
|
||||
batchSubSchools: {
|
||||
code: school.code,
|
||||
name: school.name,
|
||||
value: school.value,
|
||||
specialties: [],
|
||||
batchSubSchoolId: school.batchSubSchoolId
|
||||
},
|
||||
[sub.notShowSchoolObey ? 'notShowSchoolObey' : 'schoolObey']: sub.notShowSchoolObey ? sub.notShowSchoolObey : sub.schoolObey,
|
||||
[sub.notShowSpecialtyObey ? 'notShowSpecialtyObey' : 'specialtyObey']: sub.notShowSpecialtyObey ? sub.notShowSpecialtyObey : sub.specialtyObey
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
console.log(transformedArray);
|
||||
return transformedArray
|
||||
},
|
||||
async getDetail(id) {
|
||||
try {
|
||||
const detail = await show({
|
||||
id,
|
||||
show_relation: ["aspiration"]
|
||||
});
|
||||
this.detail = detail
|
||||
this.list = this.formatData(detail.data)
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
}
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
mergeCells() {
|
||||
let mergeCells = [];
|
||||
let c1rowspan = 1;
|
||||
|
||||
for (let i = 1; i < this.list.length; i++) {
|
||||
const item = this.list[i];
|
||||
const prevItem = this.list[i - 1];
|
||||
|
||||
if (item.batchId === prevItem.batchId) {
|
||||
c1rowspan++;
|
||||
} else {
|
||||
mergeCells.push({
|
||||
row: i - c1rowspan, col: 0, rowspan: c1rowspan, colspan: 1
|
||||
});
|
||||
c1rowspan = 1;
|
||||
}
|
||||
|
||||
if (i === this.list.length - 1 && item.batchId === prevItem.batchId) {
|
||||
mergeCells.push({
|
||||
row: i - (c1rowspan - 1), col: 0, rowspan: c1rowspan, colspan: 1
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
console.log(mergeCells);
|
||||
return mergeCells;
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.span2 {
|
||||
grid-column: span 2;
|
||||
}
|
||||
::v-deep .el-form-item > * {
|
||||
max-width: 100%;
|
||||
}
|
||||
.drawer-container {
|
||||
height: 100%;
|
||||
}
|
||||
.title {
|
||||
text-align: center;
|
||||
}
|
||||
</style>
|
||||
Loading…
Reference in new issue