提交 c535af5e 编写于 作者: 刘英杰's avatar 刘英杰

测试提交

上级 ef5a8053
# 所有环境默认 # 所有环境默认
# 页面 title # 页面 title
VUE_APP_TITLE=竞赛管理系统 VUE_APP_TITLE=竞赛管理
文件已添加
无法预览此类型文件
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": "^7.2.0", "@babel/runtime": "^7.2.0",
"@vue-office/pdf": "^1.5.4", "@vue-office/pdf": "^1.5.4",
"animate.css": "^4.1.1",
"axios": "^0.18.0", "axios": "^0.18.0",
"better-scroll": "^1.12.1", "better-scroll": "^1.12.1",
"dayjs": "^1.8.9", "dayjs": "^1.8.9",
...@@ -3117,6 +3118,11 @@ ...@@ -3117,6 +3118,11 @@
"integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==", "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==",
"dev": true "dev": true
}, },
"node_modules/animate.css": {
"version": "4.1.1",
"resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-4.1.1.tgz",
"integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
},
"node_modules/ansi-colors": { "node_modules/ansi-colors": {
"version": "3.2.4", "version": "3.2.4",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
...@@ -24602,6 +24608,11 @@ ...@@ -24602,6 +24608,11 @@
"integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==", "integrity": "sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==",
"dev": true "dev": true
}, },
"animate.css": {
"version": "4.1.1",
"resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-4.1.1.tgz",
"integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
},
"ansi-colors": { "ansi-colors": {
"version": "3.2.4", "version": "3.2.4",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
"dependencies": { "dependencies": {
"@babel/runtime": "^7.2.0", "@babel/runtime": "^7.2.0",
"@vue-office/pdf": "^1.5.4", "@vue-office/pdf": "^1.5.4",
"animate.css": "^4.1.1",
"axios": "^0.18.0", "axios": "^0.18.0",
"better-scroll": "^1.12.1", "better-scroll": "^1.12.1",
"dayjs": "^1.8.9", "dayjs": "^1.8.9",
......
...@@ -508,12 +508,20 @@ export function GetFlowDesignList(data) { ...@@ -508,12 +508,20 @@ export function GetFlowDesignList(data) {
export function GetFlowTaskList(data) { export function GetFlowTaskList(data) {
//待办流程 //待办流程
return request({ return request({
url: `/api/FlowView/api/FlowView/GetFlowTaskList?page_index=${data.page_index}&page_size=${data.page_size}`, url: `/api/FlowView/api/FlowView/GetFlowTaskList?page_index=${data.page_index}&page_size=${data.page_size}&flow_id=${data.flow_id}`,
method: 'get', method: 'get',
data data
}); });
} }
export function GetFlowIdSelect(data) {
//待办流程
return request({
url: `/api/FlowView/api/Flow/GetFlowIdSelect`,
method: 'get',
data
});
}
export function GetMyFlowTaskList(data) { export function GetMyFlowTaskList(data) {
//我的流程 //我的流程
...@@ -1095,3 +1103,231 @@ export function CertificateExportToExcel(data) { ...@@ -1095,3 +1103,231 @@ export function CertificateExportToExcel(data) {
}); });
} }
/**
* common
* 赛事批次和赛事目录
* **/
export function GetBatchList(data) {
//获取批次列表
return request({
url: `/api/Common/GetBatchList?page_index=${data.page_index}&page_size=${data.page_size}`,
method: 'get',
data,
});
}
export function BatchSave(data) {
//保存批次
return request({
url: `/api/Common/BatchSave`,
method: 'post',
data
});
}
export function BatchDel(data) {
//删除批次
return request({
url: `/api/Common/BatchDel?id=${data.id}`,
method: 'get',
data,
});
}
export function GetBatchBySelect(data) {
//获取批次下拉框
return request({
url: `/api/Common/GetBatchBySelect`,
method: 'get',
data,
});
}
export function GetTypeList(data) {
//赛事类型列表
return request({
url: `/api/Common/GetTypeList`,
method: 'get',
data,
});
}
export function GetTypeBySelect(data) {
//获取赛事类型下拉框
return request({
url: `/api/Common/GetTypeBySelect`,
method: 'get',
data,
});
}
export function TypeSave(data) {
//保存赛事类型
return request({
url: `/api/Common/TypeSave`,
method: 'post',
data,
});
}
export function TypeDel(data) {
//删除赛事类型
return request({
url: `/api/Common/TypeDel?id=${data.id}`,
method: 'get',
data,
});
}
export function GetLevelList(data) {
//获取赛事级别列表
return request({
url: `/api/Common/GetLevelList`,
method: 'get',
data,
});
}
export function GetLevelBySelect(data) {
//获取赛事下拉框
return request({
url: `/api/Common/GetLevelBySelect`,
method: 'get',
data,
});
}
export function LevelSave(data) {
//保存赛事级别
return request({
url: `/api/Common/LevelSave`,
method: 'post',
data,
});
}
export function LevelDel(data) {
//删除赛事级别
return request({
url: `/api/Common/LevelDel?id=${data.id}`,
method: 'get',
data,
});
}
export function GetReportImportTemplate(data) {
//赛事模板下载
return request({
url: `/api/CompetitionReport/api/CompetitionReport/GetReportImportTemplate`,
method: 'get',
data,
});
}
export function ReportImport(data) {
//模板导入
return request({
url: `/api/CompetitionReport/api/Competition/ReportImport`,
method: 'post',
data,
});
}
export function ReportChangeById(data) {
//赛事带出字段-根据id
return request({
url: `/api/CompetitionReport/api/CompetitionReport/ReportChangeById?id=${data.id}`,
method: 'get',
data,
});
}
export function GetCodeList(data) {
//获取赛项
return request({
url: `/api/CompetitionReport/api/Competition/GetCodeList?condition=${data.condition}&page_index=${data.page_index}&page_size=${data.page_size}`,
method: 'get',
data,
});
}
export function GetStudentListToMembers(data) {
//报名添加团队 学生列表
return request({
url: `/api/Team/api/Team/GetStudentListToMembers?condition=${data.condition}&page_index=${data.page_index}&page_size=${data.page_size}&signid=${data.signid}`,
method: 'get',
data,
});
}
export function GetTeacherListToMembers(data) {
//报名添加团队 教师列表
return request({
url: `/api/Team/api/Team/GetTeacherListToMembers?condition=${data.condition}&page_index=${data.page_index}&page_size=${data.page_size}&signid=${data.signid}`,
method: 'get',
data,
});
}
export function MembersIns(data) {
//报名团队添加成员
return request({
url: `/api/Team/api/Team/MembersIns`,
method: 'post',
data,
});
}
export function TeamAndMemberSel(data) {
//初始化团队成员
return request({
url: `/api/Team/api/Team/TeamAndMemberSel?signid=${data.signid}`,
method: 'get',
data,
});
}
export function TeamAndMemberIns(data) {
//创还能团队
return request({
url: `/api/Team/api/Team/TeamAndMemberIns`,
method: 'post',
data,
});
}
export function ReportChangeByCode(data) {
//初始化团队成员
return request({
url: `/api/CompetitionReport/api/CompetitionReport/ReportChangeByCode?code=${data.code}`,
method: 'get',
data,
});
}
export function GetUserRoleDeptInfo(data) {
//获取用户的权限和院系
return request({
url: `/api/UserInfo/api/UserInfo/GetUserRoleDeptInfo?userid=${data.userid}`,
method: 'get',
data,
});
}
export function UserRoleDeptSave(data) {
//保存用户权限和院系
return request({
url: `/api/UserInfo/api/UserInfo/UserRoleDeptSave`,
method: 'post',
data,
});
}
export function GetFlowLogList(data) {
//获取用户的权限和院系
return request({
url: `/api/FlowView/api/FlowView/GetFlowLogList?form_id=${data.form_id}`,
method: 'get',
data,
});
}
...@@ -16,7 +16,7 @@ export default { ...@@ -16,7 +16,7 @@ export default {
props: { props: {
value: { value: {
type: String, type: String,
default: '' default: '',
}, },
border: { border: {
type: Boolean, type: Boolean,
......
import {Modal, Message, Spin} from "view-design"; import {Message, Modal, Spin} from "view-design";
import Vue from "vue"; import Cookies from "js-cookie";
export function publicConfirm(publicFunction) { export function publicConfirm(publicFunction) {
// 公共弹窗删除 // 公共弹窗删除
...@@ -47,7 +47,6 @@ export function storageAddEventListener(fun) { ...@@ -47,7 +47,6 @@ export function storageAddEventListener(fun) {
} }
export async function myEncapsulationFunction(fun) { export async function myEncapsulationFunction(fun) {
// Spin.show() // Spin.show()
let res = await fun() let res = await fun()
try { try {
...@@ -77,3 +76,28 @@ export async function myEncapsulationFunction(fun) { ...@@ -77,3 +76,28 @@ export async function myEncapsulationFunction(fun) {
}); });
} }
} }
export function getInitListRequest(fun) {
try {
fun()
return false
} catch (e) {
Message['error']({
background: true,
content: e
})
return false
}
}
export function getUserRole() {
if (Cookies.get('admin-competition-userinfo')) {
let info = JSON.parse(decodeURIComponent(Cookies.get('admin-competition-userinfo')))
return info ? info.role[0].split('').includes('员') : false
} else {
return false
}
}
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<!-- <img src="@/assets/images/logo-small.png" v-if="menuCollapse"> <!-- <img src="@/assets/images/logo-small.png" v-if="menuCollapse">
<img src="@/assets/images/logo.png" v-else-if="siderTheme === 'light'"> <img src="@/assets/images/logo.png" v-else-if="siderTheme === 'light'">
<img src="@/assets/images/logo-dark.png" v-else> --> <img src="@/assets/images/logo-dark.png" v-else> -->
<h1>竞赛管理系统</h1> <h1>竞赛管理</h1>
</i-link> </i-link>
</transition> </transition>
</div> </div>
...@@ -20,36 +20,37 @@ ...@@ -20,36 +20,37 @@
:open-names="openNames" :open-names="openNames"
width="auto"> width="auto">
<template v-if="!menuCollapse" v-for="(item, index) in filterSider"> <template v-if="!menuCollapse" v-for="(item, index) in filterSider">
<i-menu-side-item v-if="item.children === undefined || !item.children.length" :menu="item" :key="index" /> <i-menu-side-item v-if="item.children === undefined || !item.children.length" :menu="item" :key="index"/>
<i-menu-side-submenu v-else :menu="item" :key="index" /> <i-menu-side-submenu v-else :menu="item" :key="index"/>
</template> </template>
<template v-else> <template v-else>
<Tooltip :content="tTitle(item.title)" placement="right" v-if="item.children === undefined || !item.children.length" :key="index"> <Tooltip :content="tTitle(item.title)" placement="right"
<i-menu-side-item :menu="item" hide-title /> v-if="item.children === undefined || !item.children.length" :key="index">
<i-menu-side-item :menu="item" hide-title/>
</Tooltip> </Tooltip>
<i-menu-side-collapse v-else :menu="item" :key="index" top-level /> <i-menu-side-collapse v-else :menu="item" :key="index" top-level/>
</template> </template>
</Menu> </Menu>
</div> </div>
</template> </template>
<script> <script>
import iMenuSideItem from './menu-item'; import iMenuSideItem from './menu-item';
import iMenuSideSubmenu from './submenu'; import iMenuSideSubmenu from './submenu';
import iMenuSideCollapse from './menu-collapse'; import iMenuSideCollapse from './menu-collapse';
import tTitle from '../mixins/translate-title'; import tTitle from '../mixins/translate-title';
import { mapState, mapGetters } from 'vuex'; import {mapState, mapGetters} from 'vuex';
// 元素是否在可视区域 // 元素是否在可视区域
function isElementInViewport (el) { function isElementInViewport(el) {
let rect = el.getBoundingClientRect(); let rect = el.getBoundingClientRect();
return (rect.top >= 0 && rect.left >= 0 && rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && rect.right <= (window.innerWidth || document.documentElement.clientWidth)); return (rect.top >= 0 && rect.left >= 0 && rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && rect.right <= (window.innerWidth || document.documentElement.clientWidth));
} }
export default { export default {
name: 'iMenuSide', name: 'iMenuSide',
mixins: [ tTitle ], mixins: [tTitle],
components: { iMenuSideItem, iMenuSideSubmenu, iMenuSideCollapse }, components: {iMenuSideItem, iMenuSideSubmenu, iMenuSideCollapse},
props: { props: {
hideLogo: { hideLogo: {
type: Boolean, type: Boolean,
...@@ -72,18 +73,18 @@ ...@@ -72,18 +73,18 @@
}, },
watch: { watch: {
'$route': { '$route': {
handler () { handler() {
this.handleUpdateMenuState(); this.handleUpdateMenuState();
}, },
immediate: true immediate: true
}, },
// 在展开/收起侧边菜单栏时,更新一次 menu 的状态 // 在展开/收起侧边菜单栏时,更新一次 menu 的状态
menuCollapse () { menuCollapse() {
this.handleUpdateMenuState(); this.handleUpdateMenuState();
} }
}, },
methods: { methods: {
handleUpdateMenuState () { handleUpdateMenuState() {
this.$nextTick(() => { this.$nextTick(() => {
if (this.$refs.menu) { if (this.$refs.menu) {
this.$refs.menu.updateActiveName(); this.$refs.menu.updateActiveName();
...@@ -106,5 +107,5 @@ ...@@ -106,5 +107,5 @@
}); });
} }
} }
} }
</script> </script>
...@@ -41,14 +41,19 @@ import iFrame from '@/components/frame'; ...@@ -41,14 +41,19 @@ import iFrame from '@/components/frame';
// 参考 https://www.iviewui.com/docs/guide/theme // 参考 https://www.iviewui.com/docs/guide/theme
import './styles/index.less'; import './styles/index.less';
import './libs/iview-pro/iview-pro.css'; import './libs/iview-pro/iview-pro.css';
import 'animate.css';
import VuePDF from 'vue-pdf'; import VuePDF from 'vue-pdf';
import VueDocPreview from 'vue-doc-preview'; import VueDocPreview from 'vue-doc-preview';
import VueImagePreview from 'vue-image-preview'; import VueImagePreview from 'vue-image-preview';
import pdf from 'vue-pdf' import pdf from 'vue-pdf'
import Cookies from "js-cookie";
if (window) window.$t = (key, value) => i18n.t(key, value); if (window) window.$t = (key, value) => i18n.t(key, value);
Vue.prototype.protocolHost = 'https://asc.hnasct.cn' Vue.prototype.protocolHost = 'https://asc.hnasct.cn'
Vue.prototype.getUserRole = () => {
let info = JSON.parse(decodeURIComponent(Cookies.get('admin-competition-userinfo')))
return info ? info.role[0].split('').includes('员') : false
}
Vue.use(plugins); Vue.use(plugins);
Vue.use(ViewUI, { Vue.use(ViewUI, {
......
import * as hooks from "@/hook";
const pre = '/eventCatalogue';
let value = () => {
return Number(hooks.getUserRole())
}
export default {
path: '3/',
title: '赛事审批',
header: 'home',
icon: 'md-checkmark-circle',
children: [
{
path: '/CompetitionSignForm?id=102&remark=CompetitionSign&entrance=flow',
title: '参赛报名',
},
{
path: `/flow-awaitDoneList`,
title: '待办流程',
auth: ['admin'],
},
{
path: `/flow-processedList`,
title: '已办流程',
auth: ['admin'],
},
{
path: `/flow-myFlowList`,
title: '我的流程'
}
]
}
import * as hooks from '@/hook/index'
const pre = '/eventCatalogue';
export default {
path: '7/',
title: '赛事目录',
header: 'home',
icon: 'md-list-box',
// custom: 'i-icon-demo i-icon-demo-i18n',
children: [
{
path: `${pre}-directoryQuery`,
title: '目录查询',
},
{
path: `${pre}-eventApplication`,
title: '赛事申请'
},
]
}
const pre = '/eventStatistics';
export default {
path: '4/',
title: '赛事统计',
header: 'home',
icon: 'md-barcode',
auth: ['admin'],
// custom: 'i-icon-demo i-icon-demo-i18n',
children: [
{
path: `/CompetitionSign`,
title: '报名列表',
},
]
}
...@@ -18,10 +18,10 @@ export default { ...@@ -18,10 +18,10 @@ export default {
path: `${pre}-processedList`, path: `${pre}-processedList`,
title: '已办流程' title: '已办流程'
}, },
{ // {
path: `${pre}-myFlowList`, // path: `${pre}-myFlowList`,
title: '我的流程' // title: '我的流程'
} // }
] ]
} }
......
import * as hooks from "@/hook";
const pre = '/gradeDeclaration';
export default {
path: '5/',
title: '成绩申报',
header: 'home',
icon: 'ios-open',
// custom: 'i-icon-demo i-icon-demo-i18n',
children: [
{
path: `/CertificateForm?id=103&remark=Certificate&entrance=flow`,
title: '获奖材料上传',
},
{
path: `/BursaryForm?id=104&remark=Bursary&entrance=flow`,
title: '补助金申请',
},
]
}
const pre = '/systemConfiguration' const pre = '/systemConfiguration'
export default { const pre1 = '/flow';
import * as hooks from '@/hook/index'
let value = () => {
return Number(hooks.getUserRole())
}
export let config = {
path: '/', path: '/',
title: '系统配置', title: '系统配置',
header: 'home', header: 'home',
icon: 'md-flower', icon: 'md-flower',
// auth: ['ordinaryUser', 'admin'][Number(hooks.getUserRole() ? hooks.getUserRole() : false)],
// auth: ['ordinaryUser', 'admin'][1],
auth: ['admin'],
children: [ children: [
{
path: '/Bursary',
title: '补助金列表',
header: 'home',
icon: 'logo-usd'
},
{
path: '/Certificate',
title: '证书列表',
header: 'home',
icon: 'ios-paper'
},
{
path: '/competitionScore',
title: '竞赛成绩',
header: 'home',
icon: 'md-text'
},
{
path: '/9',
title: '流程集合',
header: 'home',
// icon: 'md-clock',
// custom: 'i-icon-demo i-icon-demo-i18n',
children: [
{ {
path: `${pre}-flowDesign`, path: `${pre1}-List`,
title: '流程设计管理', title: '流程列表'
},
// {
// path: `${pre1}-awaitDoneList`,
// title: '待办流程'
// },
// {
// path: `${pre1}-processedList`,
// title: '已办流程'
// },
// {
// path: `${pre1}-myFlowList`,
// title: '我的流程'
// }
]
}, },
{ {
path: `${pre}-noticeManagement`, path: `${pre}-flowDesign`,
title: '竞赛公告管理', title: '流程设计管理',
}, },
// {
// path: `${pre}-noticeManagement`,
// title: '竞赛公告管理',
// },
{ {
path: `${pre}-approvalUserGroupManagement`, path: `${pre}-approvalUserGroupManagement`,
title: '审批用户组管理', title: '审批用户组管理',
...@@ -37,6 +90,7 @@ export default { ...@@ -37,6 +90,7 @@ export default {
path: `${pre}-log`, path: `${pre}-log`,
title: '日志', title: '日志',
// header:'home', // header:'home',
}
},
] ]
} }
import Vue from 'vue';
// 菜单,侧边栏 // 菜单,侧边栏
// import dashboard from './modules/dashboard' // import dashboard from './modules/dashboard'
import power from "./modules/power"; //权限 import power from "./modules/power"; //权限
...@@ -13,13 +14,20 @@ import coachingAppointment from "./modules/coachingAppointment"; //辅导预约 ...@@ -13,13 +14,20 @@ import coachingAppointment from "./modules/coachingAppointment"; //辅导预约
import faculty from "./modules/faculty"; //思政教职工 import faculty from "./modules/faculty"; //思政教职工
import politicalActivities from "./modules/politicalActivities"; //思政活动 import politicalActivities from "./modules/politicalActivities"; //思政活动
import teamManagement from "@/menu/modules/teamManagement"; import teamManagement from "@/menu/modules/teamManagement";
import systemConmfiguration from "@/menu/modules/systemConmfiguration"; import * as systemConmfiguration from "@/menu/modules/systemConmfiguration";
import Bursary from "@/menu/modules/Bursary"; import Bursary from "@/menu/modules/Bursary";
import Certificate from "@/menu/modules/Certificate"; import Certificate from "@/menu/modules/Certificate";
import CompetitionSign from "@/menu/modules/CompetitionSign"; import CompetitionSign from "@/menu/modules/CompetitionSign";
import flowassemble from "@/menu/modules/flowassemble"; import flowassemble from "@/menu/modules/flowassemble";
import competitionNotice from "@/menu/modules/competitionNotice"; import competitionNotice from "@/menu/modules/competitionNotice";
import competitionScore from "@/menu/modules/competitionScore"; import competitionScore from "@/menu/modules/competitionScore";
import eventCatalogue from "@/menu/modules/eventCatalogue";
import gradeDeclaration from "@/menu/modules/gradeDeclaration";
import eventStatistics from "@/menu/modules/eventStatistics";
import eventApproval from "@/menu/modules/eventApproval";
import * as hooks from "@/hook/index";
import {config} from "@/menu/modules/systemConmfiguration";
// 系统 // 系统
// import log from './modules/log'; // import log from './modules/log';
...@@ -27,13 +35,15 @@ import competitionScore from "@/menu/modules/competitionScore"; ...@@ -27,13 +35,15 @@ import competitionScore from "@/menu/modules/competitionScore";
export default [ export default [
// dashboard, // dashboard,
// log, // log,
{ eventCatalogue,
path: '/welcome',
title: '竞赛列表', // {
header: 'home', // path: '/welcome',
icon: 'ios-ribbon', // title: '竞赛列表',
custom: 'i-icon-demo i-icon-demo-i18n', // header: 'home',
}, // icon: 'ios-ribbon',
// custom: 'i-icon-demo i-icon-demo-i18n',
// },暂时不显示(或者不显示)
// power, // power,
// commonResources, // commonResources,
// privateResources, // privateResources,
...@@ -46,14 +56,20 @@ export default [ ...@@ -46,14 +56,20 @@ export default [
// coachingAppointment, // coachingAppointment,
// faculty, // faculty,
// politicalActivities // politicalActivities
CompetitionSign, eventApproval,
Bursary, gradeDeclaration,
Certificate, eventStatistics,
competitionNotice,
teamManagement, // CompetitionSign, 放到赛事统计
competitionScore, // Bursary,放到系统配置中
flowassemble, // Certificate,放到系统配置中
systemConmfiguration, // competitionNotice,删除
// teamManagement,删除
// competitionScore,放到系统配置中
// flowassemble, 流程集合放到系统配置中
systemConmfiguration.config,
]
];
...@@ -49,18 +49,12 @@ ...@@ -49,18 +49,12 @@
:data="tableData" :data="tableData"
:loading="loading" :loading="loading"
> >
<template #race_level="{row}"> <!-- <template #race_level="{row}">-->
<!-- {{ ['', '国家级', '省一级', '省二级'][row.race_level] }}-->
<!-- <Tag :color="['','success','primary'][row.way]">{{['国家级', '省一级', '省二级'][row.way] <!-- </template>-->
}}</Tag>--> <!-- <template #level="{row}">-->
{{ ['', '国家级', '省一级', '省二级'][row.race_level] }} <!-- {{ ['', '国家级', '省一级', '省二级'][row.level] }}-->
<!-- </template>-->
</template>
<template #level="{row}">
<!-- <Tag :color="['','success','primary'][row.way]">{{['国家级', '省一级', '省二级'][row.way]
}}</Tag>-->
{{ ['', '国家级', '省一级', '省二级'][row.level] }}
</template>
<template #way="{row}"> <template #way="{row}">
<Tag :color="['success','primary'][row.way]">{{ ['团队', '个人'][row.way] }}</Tag> <Tag :color="['success','primary'][row.way]">{{ ['团队', '个人'][row.way] }}</Tag>
</template> </template>
...@@ -70,7 +64,7 @@ ...@@ -70,7 +64,7 @@
</template> </template>
<template v-slot:action="{row}"> <template v-slot:action="{row}">
<a @click="importFile(row)">导出</a> <!-- <a @click="importFile(row)">导出</a>-->
<a @click="edit(row)" style="margin-left: 15px;">详细</a> <a @click="edit(row)" style="margin-left: 15px;">详细</a>
<Poptip confirm transfer title="你确定删除吗?" @on-ok="delCompetition(row)" @on-cancel="cancel"> <Poptip confirm transfer title="你确定删除吗?" @on-ok="delCompetition(row)" @on-cancel="cancel">
<a style="margin-left: 15px;color: red">删除</a> <a style="margin-left: 15px;color: red">删除</a>
...@@ -101,7 +95,8 @@ ...@@ -101,7 +95,8 @@
<Drawer :width="800" title="详细" :closable="true" v-model="drawer"> <Drawer :width="800" title="详细" :closable="true" v-model="drawer">
<div class="tableList"> <div class="tableList">
<h1 style="display: flex;justify-content: center">竞赛报名内容详细</h1> <h1 style="display: flex;justify-content: center">竞赛报名内容详细</h1>
<table border="1" class="container">
<table :border="1" class="container1">
<tr class="row" v-for="(item,index) in drawerKeyValueArray" :key="index"> <tr class="row" v-for="(item,index) in drawerKeyValueArray" :key="index">
<th v-if="item[0]==='level'" class="colTitle">{{ item[2] }}</th> <th v-if="item[0]==='level'" class="colTitle">{{ item[2] }}</th>
<td v-if="item[0]==='level'" class="colContent">{{ ['', '国家级', '省一级', '省二级'][item[1]] }}</td> <td v-if="item[0]==='level'" class="colContent">{{ ['', '国家级', '省一级', '省二级'][item[1]] }}</td>
...@@ -110,7 +105,10 @@ ...@@ -110,7 +105,10 @@
<td v-if="item[0]==='way'" class="colContent">{{ ['团队', '个人'][item[1]] }}</td> <td v-if="item[0]==='way'" class="colContent">{{ ['团队', '个人'][item[1]] }}</td>
<th v-if="item[0]==='race_level'" class="colTitle">{{ item[2] }}</th> <th v-if="item[0]==='race_level'" class="colTitle">{{ item[2] }}</th>
<td v-if="item[0]==='race_level'" class="colContent">{{ ['', '国家级', '省一级', '省二级'][item[1]] }}</td> <td v-if="item[0]==='race_level'" class="colContent">{{
['', '国家级', '省一级', '省二级'][item[1]]
}}
</td>
<th v-if="item[0]==='approval_state'" class="colTitle">{{ item[2] }}</th> <th v-if="item[0]==='approval_state'" class="colTitle">{{ item[2] }}</th>
<td v-if="item[0]==='approval_state'" class="colContent"> <td v-if="item[0]==='approval_state'" class="colContent">
...@@ -148,6 +146,22 @@ ...@@ -148,6 +146,22 @@
</tr> </tr>
</table> </table>
<div style="width: 100%;height: 50vh;overflow-y: auto;">
<Card style="margin-top: 1vw;width: 100%" v-for="(item,index) in competitionsignTeam" :key="index">
<template #title>
<h3>{{
item.teanname
}}(指导教师{{ item.teacher_list.length }}位;参赛学生{{ item.student_list.length }}位;)</h3>
</template>
<Table :columns="columnsTeacher" :data="item.teacher_list">
</Table>
<Table :columns="columnsStudent" :data="item.student_list">
</Table>
</Card>
</div>
</div> </div>
</Drawer> </Drawer>
...@@ -181,6 +195,74 @@ export default { ...@@ -181,6 +195,74 @@ export default {
data() { data() {
return { return {
keys1: 1,
columnsStudent: [
{
title: '参赛学生',
minWidth: 100,
key: 'name'
},
{
title: '学号',
minWidth: 120,
key: 'card_name'
},
{
title: '身份证号',
minWidth: 180,
key: 'sfzh'
},
{
title: '班级',
minWidth: 150,
key: 'classname'
},
{
title: '性别',
minWidth: 80,
key: 'gender'
},
{
title: '联系电话',
minWidth: 150,
key: 'phone'
},
],
columnsTeacher: [
{
title: '指导教师',
minWidth: 100,
key: 'name'
},
{
title: '工号',
minWidth: 120,
key: 'card_name'
},
{
title: '身份证号',
minWidth: 180,
key: 'sfzh'
},
{
title: '教学院系',
minWidth: 150,
key: 'dept'
},
{
title: '性别',
minWidth: 80,
key: 'gender'
},
{
title: '联系电话',
minWidth: 150,
key: 'phone'
},
],
competitionsignTeam: [],
drawerKeyValueArray: [], drawerKeyValueArray: [],
drawer: false, drawer: false,
grid: { grid: {
...@@ -188,7 +270,7 @@ export default { ...@@ -188,7 +270,7 @@ export default {
lg: 12, lg: 12,
md: 24, md: 24,
sm: 24, sm: 24,
xs: 24 xs: 24,
}, },
columns: [ columns: [
{ {
...@@ -199,62 +281,83 @@ export default { ...@@ -199,62 +281,83 @@ export default {
width: 80 width: 80
}, },
{ {
title: '竞赛项目名称(大赛名称)', title: '赛事名称',
key: 'competitionname', key: 'competitionname',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 200, minWidth: 200,
}, },
{ {
title: '主办单位', title: '赛项',
key: 'sponsor', key: 'competitionsubitem_name',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '报名者名称',
key: 'sign_name',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 150, minWidth: 200,
}, },
{ {
title: '赛事级别', title: '赛事编号',
slot: 'level', key: 'report_code',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 100, minWidth: 200,
}, },
{ {
title: '比赛时间', title: '主办单位',
key: 'competition_time', key: 'sponsor',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 120, minWidth: 150,
}, },
{ {
title: '竞赛地点',
key: 'competition_time', title: '经费预算',
key: 'money',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 150, minWidth: 150,
}, },
{ {
title: '竞赛文件名(文号)', title: '赛事级别',
key: 'file_name', key: 'competition_level_name',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 200, minWidth: 100,
}, },
{ {
title: '竞赛分级', title: '赛事类别',
slot: 'race_level', key: 'competition_type_name',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 150, minWidth: 100,
}, },
// {
// title: '比赛时间',
// key: 'competition_time',
// align: 'center',
// show: true,
// minWidth: 120,
// },
// {
// title: '竞赛地点',
// key: 'competition_time',
// align: 'center',
// show: true,
// minWidth: 150,
// },
// {
// title: '竞赛文件名(文号)',
// key: 'file_name',
// align: 'center',
// show: true,
// minWidth: 200,
// },
// {
// title: '竞赛分级',
// slot: 'race_level',
// align: 'center',
// show: true,
// minWidth: 150,
// },
{ {
title: '竞赛形式(团/个)', title: '竞赛形式(团/个)',
slot: 'way', slot: 'way',
...@@ -269,41 +372,41 @@ export default { ...@@ -269,41 +372,41 @@ export default {
show: true, show: true,
minWidth: 200, minWidth: 200,
}, },
// {
// title: '参赛队数量(队/人)',
// key: 'arity',
// align: 'center',
// show: true,
// minWidth: 200,
// },
// {
// title: '竞赛对应课程',
// key: 'curriculum',
// align: 'center',
// show: true,
// minWidth: 200,
// },
{ {
title: '参赛队数量(队/人)', title: '竞赛开始时间',
key: 'arity', key: 'begin_time',
align: 'center',
show: true,
minWidth: 200,
},
{
title: '竞赛对应课程',
key: 'curriculum',
align: 'center',
show: true,
minWidth: 200,
},
{
title: '培训开始时间',
key: 'start_time',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 200, minWidth: 200,
}, },
{ {
title: '培训结束时间', title: '竞赛结束时间',
key: 'end_time', key: 'end_time',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 200, minWidth: 200,
}, },
{ // {
title: '竞赛的其他要求', // title: '竞赛的其他要求',
key: 'request', // key: 'request',
align: 'center', // align: 'center',
show: true, // show: true,
minWidth: 200, // minWidth: 200,
}, // },
{ {
title: '审批状态', title: '审批状态',
slot: 'approval_state', slot: 'approval_state',
...@@ -463,47 +566,50 @@ export default { ...@@ -463,47 +566,50 @@ export default {
}, },
// 修改 // 修改
async edit(row) { async edit(row) {
this.keys1++
let res = await api.GetSignInfo({id: row.competitionsignid}) let res = await api.GetSignInfo({id: row.competitionsignid})
this.drawer = true this.drawer = true
let array = _.cloneDeep(row) let array = _.cloneDeep(row)
delete array.competitionsignid
delete array.competitionreportid
delete array.createtime
delete array.approach_file
delete array.train_file
delete array.createtime
delete array._rowKey
delete array._index
delete array.sign_up
delete array.approval_remark
array.trainPlanInfo = res.response.trainPlanInfo array.trainPlanInfo = res.response.trainPlanInfo
array.projectInfo = res.response.projectInfo array.projectInfo = res.response.projectInfo
api.TeamAndMemberSel({signid: array.competitionsignid}).then(res => {
this.competitionsignTeam = res.response
})
let keys = [
// 'competitionsignid',
'competitionname',
'sponsor',
'way',
'class_hour',
'end_time',
'competitionsubitem_name',
'report_code',
'competition_type_name',
'competition_level_name',
'begin_time',
'money',
]
Object.keys(array).map(cur => {
if (keys.indexOf(cur) === -1) delete array[cur]
})
this.drawerKeyValueArray = Object.entries(array) this.drawerKeyValueArray = Object.entries(array)
this.drawerKeyValueArray.map((cur, index) => { this.drawerKeyValueArray.map((cur, index) => {
let data = [ let data = [
'竞赛项目名称(大赛名称)', '赛事编号',
'赛事名称',
'赛项名称',
'主办单位', '主办单位',
'竞赛级别', '赛事级别',
'比赛时间', '赛事类别',
'竞赛地点', '参赛形式',
'报名者名称', '比赛开始时间',
'竞赛文件名(文号)', '比赛结束时间',
'竞赛分级', '经费预算',
'竞赛形式(团/个)', '计划培训课时',
'计划培训量', ]
'参赛队数量(队/人)',
'竞赛对应课程',
'培训开始时间',
'培训结束时间',
'竞赛的其他要求',
'审批状态',
// '审批意见'
'培训计划附件',
'竞赛方案附件',
];
cur.push(data[index]) cur.push(data[index])
}) })
console.log("🚀🚀🚀,", this.drawerKeyValueArray)
}, },
// 删除 // 删除
...@@ -523,30 +629,33 @@ export default { ...@@ -523,30 +629,33 @@ export default {
} }
</script> </script>
<style> <style scoped>
.tableList { .tableList {
display: flex; display: flex;
justify-content: center; justify-content: center;
flex-wrap: wrap; flex-wrap: wrap;
.container { .container1 {
border-collapse: collapse; border-collapse: collapse;
.row { .row {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.colTitle { .colTitle {
text-align: center; text-align: center;
width: 200px; width: 200px;
height: 50px; height: 50px;
} }
.colContent { .colContent {
width: 500px; width: 500px;
height: 50px; height: 50px;
text-align: center; text-align: center;
} }
.aText:hover { .aText:hover {
......
<template>
<div>
<Card>
<template v-slot:extra>
<ButtonGroup shape="circle">
<Button class="buttonFocus" @click="batchModal = true ;formValidate ={} ">添加赛事批次</Button>
</ButtonGroup>
</template>
<br>
<br>
<Table :columns="columns" :data="data" :loading="loading">
<template #bed_time={row}>
<span v-if="row.bed_time">
{{ row.bed_time.split(' 00:00')[0] + ' ~ ' + row.end_time.split(' 00:00')[0] }}
</span>
</template>
<template v-slot:action="{row}">
<a @click="edit(row)">编辑</a>
<!-- <a @click="edit1(row)" style="margin-left: 15px;">详细</a>-->
<Poptip confirm transfer title="你确定删除吗?" @on-ok="delCompetition(row)" @on-cancel="cancel">
<a style="margin-left: 15px;color: red">删除</a>
</Poptip>
</template>
</Table>
<div style="height: 60px;display: flex;align-items: center;">
<Page
:total="init.total"
v-model="init.page_index"
show-total
show-sizer
:page-size="init.page_size"
@on-change="handleChangePage"
@on-page-size-change="handleChangePageSize"
/>
</div>
</Card>
<Modal
:width="50"
v-model="batchModal"
title="添加赛事学年"
>
<Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="110">
<FormItem label="学年名称" prop="competitionbatch_name">
<Input v-model="formValidate.competitionbatch_name" placeholder="请输入学年名称"></Input>
</FormItem>
<FormItem label="竞赛起止时间" prop="dateRange">
<DatePicker v-model="formValidate.dateRange" type="daterange" placement="bottom-end"
@on-change="obtainingAcademicYearTime" placeholder="请选择竞赛起止时间" style="width: 100%"/>
</FormItem>
<FormItem label="备注" prop="remark">
<Input v-model="formValidate.remark" type="textarea" :autosize="{minRows: 5,maxRows: 5}"
placeholder="请输入备注"></Input>
</FormItem>
</Form>
<template #footer>
<Button type="text" @click="batchModal =false">关闭</Button>
<Button type="primary" @click="handleSubmit('formValidate')">确定</Button>
</template>
</Modal>
</div>
</template>
<script>
import * as api from '../../../api/requestUtils'
import * as hooks from '../../../hook/index'
import {getInitListRequest, myEncapsulationFunction} from "../../../hook/index";
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》';
export default {
//import引入的组件需要注入到对象中才能使用",
components: {},
data() {
//这里存放数据",
return {
loading: false,
batchModal: false,
formValidate: {
competitionbatch_name: '',
dateRange: '',
remark: '',
"bed_time": "",
"end_time": "",
},
ruleValidate: {
competitionbatch_name: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'blur'}
],
dateRange: [
{required: true, type: 'array', message: '此项不能为空', trigger: 'change'}
],
remark1: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'blur'}
],
},
init: {
columns: [],
tableData: [],
page_index: 1,
page_size: 10,
total: 0,
"title": "",
"start_time": "",
"end_time": "",
"public_type": "",
"approval_state": "",
"is_public": "",
},
columns: [
{
title: '学年',
key: 'competitionbatch_name',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '竞赛起止时间',
slot: 'bed_time',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '备注',
key: 'remark',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '操作',
align: 'center',
minWidth: 120,
// fixed: 'right',
show: true,
slot: 'action'
}
],
data: [],
theme: 'light'
};
},
//监听属性 类似于data概念",
computed: {},
//监控data中的数据变化",
watch: {},
//方法集合",
methods: {
BatchDel() {
},
importFile() {
},
edit(row) {
this.batchModal = true
let dateRange = row.bed_time && row.end_time ? [row.bed_time.split(' 00:00')[0], row.end_time.split(' 00:00')[0]] : []
this.formValidate = {
...row,
dateRange,
}
},
cancel() {
},
delCompetition(row) {
myEncapsulationFunction(async () => {
const res = await api.BatchDel({id: row.competitionbatchid})
this.GetBatchList()
return res
})
},
obtainingAcademicYearTime(e) {
this.formValidate.bed_time = e[0]
this.formValidate.end_time = e[1]
console.log("🚀🚀🚀,", e)
},
importOk() {
},
saveBatch() {
hooks.myEncapsulationFunction(async () => {
// let data = {
// "competitionbatchid": "",
// "competitionbatch_name": this.formValidate.competitionbatch_name,
// "bed_time": this.formValidate.bed_time,
// "end_time": this.formValidate.end_time,
// "remark": this.formValidate.remark,
// }
console.log("🚀🚀formValidate🚀,", this.formValidate)
let data = this.formValidate
const res = await api.BatchSave(data)
this.GetBatchList()
return res
})
},
handleSubmit(name) {
this.$refs[name].validate((valid) => {
if (valid && this.formValidate.dateRange[0] !== '') {
this.saveBatch()
this.batchModal = false
} else {
this.$Message.error('请完善必选项');
}
})
},
handleReset(name) {
this.$refs[name].resetFields();
},
handleChangePage(pageNumber) {
this.init.page_index = pageNumber
this.GetBatchList()
},
// 切换每页条数
handleChangePageSize(size) {
this.init.page_size = size
this.GetBatchList()
},
GetBatchList() {
hooks.getInitListRequest(async () => {
this.loading = true
let data = {
page_index: this.init.page_index,
page_size: this.init.page_size
}
const res = await api.GetBatchList(data)
this.data = res.response.data
this.init.total = res.response.data_count
this.loading = false
})
}
},
//生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载
beforeCreate() {
},
//生命周期 - 创建完成(可以访问当前this实例)",数据模型已加载,方法已加载,html模板已加载,html模板未渲染
created() {
},
//生命周期 - 挂载之前",html模板未渲染
beforeMount() {
},
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() {
this.GetBatchList()
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新
beforeUpdate() {
},
//生命周期 - 更新之后",数据模型已更新,html模板已更新
updated() {
},
//生命周期 - 销毁之前",
beforeDestroy() {
},
destroyed() {
},
//生命周期 - 销毁完成",
//如果页面有keep-alive缓存功能,这个函数会触发",
activated() {
},
}
</script>
<style scoped>
.buttonFocus:focus {
background-color: #2D8CF0;
color: white;
}
</style>
<template>
<div>
<Card>
<template v-slot:title>
<ButtonGroup shape="circle">
<Button class="buttonFocus" @click="addEvent" v-if="getUserRole()">
添加赛事
</Button>
<Button class="buttonFocus" @click="modal.addeventLevel = true" v-if="getUserRole()">添加赛事级别
</Button>
<Button class="buttonFocus" @click="modal.addEventCategory = true" v-if="getUserRole()">添加赛事类别</Button>
<Button class="buttonFocus" @click="modal.ImportModal = true" v-if="getUserRole()">导入数据</Button>
<Button class="buttonFocus" @click="ReportExportToExcel">导出数据</Button>
<Button class="buttonFocus" @click="GetReportImportTemplate" :loading="Bloading" v-if="getUserRole()">下载模板
</Button>
</ButtonGroup>
</template>
<template v-slot:extra>
<div style="display: flex;align-items: center">
<Input style="margin-right: 1vw;width: 15vw;" v-model="formValidate.name"
placeholder="请输入赛事名称"></Input>
<Button type="primary" @click="search">查找</Button>
</div>
</template>
<Table :columns="columns" :data="data" :loading="loading">
<template #dept="{row}">
<Tooltip :content="row.dept" placement="right-end" :transfer="false">
<Ellipsis v-if="row.dept" :text="row.dept" :length="18"/>
</Tooltip>
</template>
<template #way="{row}">
<Tag :color="['success','primary'][row.way] "> <span style="color: white">
{{ ['团队', '个人'] [row.way] }}
</span></Tag>
</template>
<template v-slot:action="{row}">
<a @click="eventTitle='编辑赛事';importFile(row)" v-if="getUserRole()">编辑</a>
<!-- <a @click="edit(row)" style="margin-left: 15px;">详细</a>-->
<Poptip confirm transfer title="你确定删除吗?" @on-ok="delCompetition(row)" @on-cancel="cancel">
<a style="margin-left: 15px;color: red" v-if="getUserRole()">删除</a>
</Poptip>
</template>
</Table>
<div style="height: 60px;display: flex;align-items: center;">
<Page
:total="init.total"
v-model="init.page_index"
show-total
show-sizer
:page-size="init.page_size"
@on-change="handleChangePage"
@on-page-size-change="handleChangePageSize"
/>
</div>
</Card>
<Modal
:width="60"
v-model="modal.addEventsModal"
:title="eventTitle"
>
<Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="110">
<Row :span="24" style="display: flex;justify-content: space-between">
<Col :span="11">
<FormItem label="学年名称" prop="competitionbatch_id">
<Select v-model="formValidate.competitionbatch_id" style="width:100%">
<Option v-for="item in batchList" :value="item.id" :key="item.id">{{ item.name }}</Option>
</Select>
</FormItem>
</Col>
<Col :span="11">
<FormItem label="赛事编码" prop="report_code">
<Input v-model="formValidate.report_code" placeholder="请输入赛事编码"></Input>
</FormItem>
</Col>
</Row>
<Row :span="24" style="display: flex;justify-content: space-between">
<Col :span="11">
<FormItem label="赛事名称" prop="competitionname">
<Input v-model="formValidate.competitionname" placeholder="请输入赛事名称"></Input>
</FormItem>
</Col>
<Col :span="11">
<FormItem label="赛项名称" prop="competitionsubitem_name1">
<Input v-model="formValidate.competitionsubitem_name" placeholder="请输入学年名称"></Input>
</FormItem>
</Col>
</Row>
<Row :span="24" style="display: flex;justify-content: space-between">
<Col :span="11">
<FormItem label="教学单位" prop="dept_id1">
<Select v-model="formValidate.dept_id" style="width:100%" multiple>
<Option v-for="(item,index) in deptList" :value="item.id" :key="index">{{ item.name }}</Option>
</Select>
</FormItem>
</Col>
<Col :span="11">
<FormItem label="主办单位" prop="sponsor">
<Input v-model="formValidate.sponsor" placeholder="请输入主办单位"></Input>
</FormItem>
</Col>
</Row>
<Row :span="24" style="display: flex;justify-content: space-between">
<Col :span="11">
<FormItem label="赛事级别" prop="competition_level_id1">
<Select v-model="formValidate.competition_level_id" style="width:100%">
<Option v-for="item in levelList" :value="item.id" :key="item.id">{{
item.name
}}
</Option>
</Select>
</FormItem>
</Col>
<Col :span="11">
<FormItem label="赛事类型" prop="competition_type_id">
<Select v-model="formValidate.competition_type_id" style="width:100%">
<Option v-for="item in classList" :value="item.id"
:key="item.id">{{
item.name
}}
</Option>
</Select>
</FormItem>
</Col>
</Row>
<Row :span="24" style="display: flex;justify-content: space-between">
<!-- <Col :span="11">-->
<!-- <FormItem label="比赛形式" prop="way1">-->
<!-- <Select v-model="formValidate.way" style="width:100%">-->
<!-- <Option v-for="item in wayList" :value="item.value" :key="item.value">{{ item.label }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- </Col>-->
<Col :span="11">
<FormItem label="相关专业" prop="specialty">
<Input v-model="formValidate.specialty" placeholder="请输入相关专业"></Input>
</FormItem>
</Col>
</Row>
</Form>
<template #footer>
<div style="width: 100%;height: 100%;display: flex;justify-content: center;align-items: center;">
<Button style="width: 30%;" type="text" @click="modal.addEventsModal =false">关闭</Button>
<Button style="width: 30%;" type="primary" @click="handleSubmit('formValidate')">确定
</Button>
</div>
</template>
</Modal>
<Modal
:width="40"
v-model="modal.addeventLevel"
title="赛事级别管理"
>
<div
style="width: 100%;height: 30%;display: flex;align-items: center;
justify-content: space-between;flex-wrap: wrap;padding: 0 0 2vw 0;
border-bottom: 0.2vw #E6E6E6 solid;margin-bottom: 1vw;">
<div
v-for="(item,index) in competitionLevel" :key="index" @click="formValidate1Edit(item)"
style="width: 33%;display: flex;justify-content: center;flex-wrap: wrap; margin-bottom: 1vw;">
<Button class="buttonFocus">{{ item.competitionlevel_name }}</Button>
<div class="competitionClassIcon" @click="delLevel(item)">
<Icon type="ios-close-circle"/>
</div>
</div>
</div>
<Form ref="formValidate1" :model="formValidate1" :rules="ruleValidate1" :label-width="110"
>
<FormItem label="级别名称" prop="competitionlevel_name">
<Input v-model="formValidate1.competitionlevel_name" placeholder="请输入学年名称"></Input>
</FormItem>
<FormItem label="描述" prop="remark1">
<Input v-model="formValidate1.remark" placeholder="请输入学年名称"></Input>
</FormItem>
<FormItem label="是否禁用" prop="status">
<RadioGroup v-model="formValidate1.status">
<Radio v-for="(item,index) in isItDisabled" :label="item.value" :key="index">{{ item.label }}</Radio>
</RadioGroup>
</FormItem>
</Form>
<template #footer>
<div style="width: 100%;height: 100%;display: flex;justify-content: center;align-items: center;">
<Button style="width: 30%;" type="text" @click="modal.addeventLevel =false">关闭</Button>
<Button style="width: 30%;" type="primary" @click="handleSubmit('formValidate1')">修改
</Button>
<Button style="width: 30%;" type="primary" @click="f1EditState = true;handleSubmit('formValidate1'); ">新增
</Button>
</div>
</template>
</Modal>
<Modal
:width="40"
v-model="modal.addEventCategory"
title="赛事类别管理"
>
<div
style="width: 100%;height: 30%;display: flex;align-items: center;
justify-content: space-between;flex-wrap: wrap;padding: 0 0 2vw 0;
border-bottom: 0.2vw #E6E6E6 solid;margin-bottom: 1vw;">
<div
v-for="(item,index) in competitionClass" :key="index" @click="formValidate2Edit(item)"
style="width: 33%;display: flex;justify-content: center;margin-bottom: 1vw;">
<Button class="buttonFocus">{{ item.competitiontype_name }}
</Button>
<div class="competitionClassIcon" @click="delClass(item)">
<Icon type="ios-close-circle"/>
</div>
</div>
</div>
<Form ref="formValidate2" :model="formValidate2" :rules="ruleValidate2" :label-width="110"
>
<FormItem label="类别名称" prop="competitiontype_name">
<Input v-model="formValidate2.competitiontype_name" placeholder="请输入类别名称"></Input>
</FormItem>
<FormItem label="描述" prop="remark">
<Input v-model="formValidate2.remark" placeholder="请输入描述"></Input>
</FormItem>
<FormItem label="是否禁用" prop="status">
<RadioGroup v-model="formValidate2.status">
<Radio v-for="(item,index) in isItDisabled" :label="item.value" :key="index">{{ item.label }}</Radio>
</RadioGroup>
</FormItem>
</Form>
<template #footer>
<div style="width: 100%;height: 100%;display: flex;justify-content: center;align-items: center;">
<Button style="width: 30%;" type="text" @click="modal.addEventCategory =false">关闭</Button>
<Button style="width: 30%;" type="primary" @click="handleSubmit('formValidate2')">修改
</Button>
<Button style="width: 30%;" type="primary" @click="f1EditState = true;handleSubmit('formValidate2')">新增
</Button>
</div>
</template>
</Modal>
<Modal
v-model="modal.ImportModal"
title="模板导入"
width="40%"
>
<Upload
:before-upload="dutyModelUpload"
:on-error="dutyModelError"
:on-success="dutyModelSuccess"
:on-format-error="dutyModelFormatError"
:format="['xlsx']"
:multiple="false"
type="drag"
action="">
<div style="padding: 120px 0;">
<Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
<p>竞赛模板文件上传</p>
</div>
</Upload>
<template #footer>
<Button type="text" @click="modal.ImportModal = false">取消</Button>
<!-- <Button type="primary" @click="dutyModelImportOK" :loading="loadingStatus">确定</Button>-->
</template>
</Modal>
</div>
</template>
<script>
import Cookies from 'js-cookie';
import * as api from '../../../api/requestUtils'
import * as hooks from '../../../hook/index'
import {getUserRole, myEncapsulationFunction} from "../../../hook/index";
import {defaultEmphasis} from "echarts/lib/util/model";
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》';
export default {
//import引入的组件需要注入到对象中才能使用",
components: {},
data() {
//这里存放数据",
return {
Bloading: false,
eventTitle: '',
loading: false,
f1EditState: false,
batchList: [],
classList: [],
levelList: [],
competitionLevel: [],
competitionClass: [],
isItDisabled: [
{value: 1, label: '是'},
{value: 0, label: '否'},
],
wayList: [
{value: 0, label: '团队'},
{value: 1, label: '个人'},
// {value: 2, label: '团队/个人'},
],
formValidate2: {
competitiontype_name: '',
remark: '',
status: '',
},
formValidate1: {
competitionlevel_name: '',
remark: '',
status: '',
},
formValidate: {
name1: '',
name: '',
competitionreportid: '',
competitionbatch_id: '',
report_code: '',
competitionname: '',
competitionsubitem_name: '',
dept_id: '',
sponsor: '',
competition_level_id: '',
competition_type_id: '',
way: '',
specialty: '',
},
ruleValidate2: {
competitiontype_name: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'blur'}
],
remark: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'blur'}
],
status: [
{required: true, type: 'number', message: '此项不能为空', trigger: 'change'}
],
},
ruleValidate1: {
competitionlevel_name: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'blur'}
],
remark: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'blur'}
],
status: [
{required: true, type: 'number', message: '此项不能为空', trigger: 'change'}
],
},
ruleValidate: {
competitionbatch_id: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
report_code: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
competitionname: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
competitionsubitem_name: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
dept_id: [
{required: true, type: 'array', message: '此项不能为空', trigger: 'change'}
],
sponsor: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
competition_level_id: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
competition_type_id: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
way: [
{required: true, type: 'number', message: '此项不能为空', trigger: 'change'}
],
specialty1: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
},
modal: {
addEventsModal: false,
addeventLevel: false,
addEventCategory: false,
ImportModal: false,
},
init: {
columns: [],
tableData: [],
page_index: 1,
page_size: 10,
total: 0,
"title": "",
"start_time": "",
"end_time": "",
"public_type": "",
"approval_state": "",
"is_public": "",
},
columns: [
{
title: '赛项编码',
key: 'report_code',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '教学单位',
slot: 'dept',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '赛事名称',
key: 'competitionname',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '赛项名称',
key: 'competitionsubitem_name',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '主办单位',
key: 'sponsor',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '赛事级别',
key: 'competition_level_name',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '赛事类型',
key: 'competition_type_name',
align: 'center',
show: true,
minWidth: 150,
},
// {
// title: '比赛形式',
// slot: 'way',
// align: 'center',
// show: true,
// minWidth: 150,
// },
{
title: '相关专业',
key: 'specialty',
align: 'center',
show: true,
minWidth: 150,
},
{
title: '操作',
align: 'center',
minWidth: 130,
fixed: 'right',
show: true,
slot: 'action'
}
],
data: [],
theme: 'light',
deptList: [],
};
},
//监听属性 类似于data概念",
computed: {},
//监控data中的数据变化",
watch: {},
//方法集合",
methods: {
ReportExportToExcel() {
hooks.myEncapsulationFunction(async () => {
let data = {
"name": this.formValidate.name1,
"level": '',
"way": '',
"approval_state": '',
"page_index": this.init.page_index,
"page_size": this.init.page_size,
}
const res = await api.ReportExportToExcel(data)
window.location.href = res.response
})
},
GetReportImportTemplate() {
this.Bloading = hooks.getInitListRequest(async () => {
this.Bloading = true
const res = await api.GetReportImportTemplate()
window.location.href = res.response
})
},
addEvent() {
this.eventTitle = '添加赛事';
this.modal.addEventsModal = true
this.formValidate.competitionreportid = ''
},
importFile(row) {
console.log("🚀🚀🚀,", row)
let dept_id = []
if (row.dept_id) row.dept_id.split(';').map((cur, index) => {
cur !== '' ? dept_id.push(cur) : ''
})
this.formValidate = {...row, dept_id}
this.modal.addEventsModal = true
},
edit() {
},
delCompetition(row) {
hooks.myEncapsulationFunction(async () => {
const res = await api.ReportDel({id: row.competitionreportid})
this.getCompetitionList()
return res
})
},
cancel() {
},
search() {
this.formValidate.name1 = this.formValidate.name
this.getCompetitionList()
},
async getCompetitionList() {
hooks.getInitListRequest(async () => {
this.loading = true
let data = {
// "name": this.search.wayCurrentValuethis,
// "level": this.search.levelCurrentValue,
// "way": this.search.wayCurrentValue,
// "approval_state": this.search.approval_stateCurrentValue,
"name": this.formValidate.name1,
"level": '',
"way": '',
"approval_state": '',
"page_index": this.init.page_index,
"page_size": this.init.page_size,
}
const res = await api.GetReportList(data)
this.data = res.response.data
this.init.total = res.response.data_count
this.loading = false
})
},
GetLevelBySelect() {
hooks.getInitListRequest(async () => {
const res = await api.GetLevelBySelect()
this.levelList = res.response
})
},
GetTypeBySelect() {
hooks.getInitListRequest(async () => {
const res = await api.GetTypeBySelect()
this.classList = res.response
})
},
GetBatchBySelect() {
hooks.getInitListRequest(async () => {
const res = await api.GetBatchBySelect()
this.batchList = res.response
})
},
GetDeptSeletct() {
hooks.getInitListRequest(async () => {
const res = await api.GetDeptSeletct()
this.deptList = res.response
})
},
formValidate1Edit(row) {
this.formValidate1 = row
},
delLevel(row) {
myEncapsulationFunction(() => hooks.publicConfirm(async () => {
const res = await api.LevelDel({id: row.competitionlevelid})
this.GetLevelList()
return res
}))
},
GetLevelList() {
hooks.getInitListRequest(async () => {
const res = await api.GetLevelList()
this.competitionLevel = res.response
})
},
delClass(row) {
myEncapsulationFunction(() => hooks.publicConfirm(async () => {
const res = await api.TypeDel({id: row.competitiontypeid})
this.GetTypeList()
return res
}))
},
formValidate2Edit(row) {
this.formValidate2 = row
},
LevelSave() {
hooks.myEncapsulationFunction(async () => {
if (this.f1EditState) this.formValidate1.competitionlevelid = ''
const res = await api.LevelSave(this.formValidate1)
this.GetLevelList()
this.f1EditState = false
return res
})
},
TypeSave() {
hooks.myEncapsulationFunction(async () => {
if (this.f1EditState) this.formValidate2.competitiontypeid = ''
const res = await api.TypeSave(this.formValidate2)
this.GetTypeList()
this.f1EditState = false
return res
})
},
ReportSave() {
hooks.myEncapsulationFunction(async () => {
const res = await api.ReportSave(this.formValidate)
await this.getCompetitionList()
this.modal.addEventsModal = false
this.formValidate = {}
return res
})
},
validateSwitch(e) {
switch (e) {
case 'formValidate2':
this.TypeSave()
break;
case 'formValidate1':
this.LevelSave()
break;
case 'formValidate':
this.ReportSave()
break;
}
},
handleSubmit(name) {
this.$refs[name].validate((valid) => {
if (valid) {
this.validateSwitch(name)
} else {
this.$Message.destroy()
this.$Message.error('请检查必填选项!');
}
})
},
handleReset(name) {
this.$refs[name].resetFields();
},
GetTypeList() {
hooks.getInitListRequest(async () => {
const res = await api.GetTypeList()
this.competitionClass = res.response
})
},
async dutyModelUpload(file) {
// this.file = file
let formData = new FormData()
formData.append('file', file)
const res = await api.ReportImport(formData)
if (res.code !== 1) {
window.location.href = res.response
this.$Message.error(res.msg_detail)
} else {
await this.getCompetitionList()
this.modal.ImportModal = false
}
return false
},
dutyModelFormatError(file, fileList) {
this.$Message.error('文件格式错误!')
},
dutyModelSuccess(response, file, fileList) {
// this.publicMessage(response)
this.$Message.info(response.msg)
// this.$Message.info(response.msg_detail)
},
dutyModelError(error, file, fileList) {
// this.publicConfirm(error)
},
handleChangePage(pageNumber) {
this.init.page_index = pageNumber
this.getCompetitionList()
},
// 切换每页条数
handleChangePageSize(size) {
this.init.page_size = size
this.getCompetitionList()
},
},
//生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载
beforeCreate() {
},
//生命周期 - 创建完成(可以访问当前this实例)",数据模型已加载,方法已加载,html模板已加载,html模板未渲染
created() {
},
//生命周期 - 挂载之前",html模板未渲染
beforeMount() {
},
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() {
this.getCompetitionList()
this.GetLevelBySelect()
this.GetTypeBySelect()
this.GetBatchBySelect()
this.GetDeptSeletct()
this.GetLevelList()
this.GetTypeList()
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新
beforeUpdate() {
},
//生命周期 - 更新之后",数据模型已更新,html模板已更新
updated() {
},
//生命周期 - 销毁之前",
beforeDestroy() {
},
destroyed() {
},
//生命周期 - 销毁完成",
//如果页面有keep-alive缓存功能,这个函数会触发",
activated() {
},
}
</script>
<style scoped>
.buttonFocus:focus {
background-color: #2D8CF0;
color: white;
}
.competitionClassIcon {
display: flex;
align-items: center;
cursor: pointer;
}
.competitionClassIcon:hover {
transform: scale(1.5);
color: red;
}
</style>
<template>
<Card>
<h1>测试中...</h1>
</Card>
</template>
<script>
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》';
export default {
//import引入的组件需要注入到对象中才能使用",
components: {},
data() {
//这里存放数据",
return {
init: {
columns: [],
tableData: [],
page_index: 1,
page_size: 10,
total: 0,
"title": "",
"start_time": "",
"end_time": "",
"public_type": "",
"approval_state": "",
"is_public": "",
},
columns: [
{
title: 'Name',
key: 'name'
},
{
title: 'Age',
key: 'age'
},
{
title: 'Address',
key: 'address'
}
],
data: [
{
name: 'John Brown',
age: 18,
address: 'New York No. 1 Lake Park',
date: '2016-10-03'
},
{
name: 'Jim Green',
age: 24,
address: 'London No. 1 Lake Park',
date: '2016-10-01'
},
{
name: 'Joe Black',
age: 30,
address: 'Sydney No. 1 Lake Park',
date: '2016-10-02'
},
{
name: 'Jon Snow',
age: 26,
address: 'Ottawa No. 2 Lake Park',
date: '2016-10-04'
}
],
theme: 'light'
};
},
//监听属性 类似于data概念",
computed: {},
//监控data中的数据变化",
watch: {},
//方法集合",
methods: {
handleChangePage(pageNumber) {
this.init.page_index = pageNumber
this.getCompetitionSignList()
},
// 切换每页条数
handleChangePageSize(size) {
this.init.page_size = size
this.getCompetitionSignList()
},
aaa(e) {
console.log("🚀🚀11111111111111111🚀,", e)
}
},
//生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载
beforeCreate() {
},
//生命周期 - 创建完成(可以访问当前this实例)",数据模型已加载,方法已加载,html模板已加载,html模板未渲染
created() {
},
//生命周期 - 挂载之前",html模板未渲染
beforeMount() {
},
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() {
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新
beforeUpdate() {
},
//生命周期 - 更新之后",数据模型已更新,html模板已更新
updated() {
},
//生命周期 - 销毁之前",
beforeDestroy() {
},
destroyed() {
},
//生命周期 - 销毁完成",
//如果页面有keep-alive缓存功能,这个函数会触发",
activated() {
},
}
</script>
<style scoped>
</style>
<template>
<Card>
<Menu mode="horizontal" theme="light" @on-select="aaa" active-name="1">
<MenuItem name="1">
<Icon type="ios-people"/>
赛事目录维护
</MenuItem>
<MenuItem name="2" v-if="getUserRole()">
<Icon type="ios-paper"/>
批次管理
</MenuItem>
</Menu>
<br>
<component v-if="componentState === 1"
is="eventMatalogMaintenance"></component>
<component v-if="componentState === 2 "
is="batchManagement"></component>
<keep-alive>
</keep-alive>
</Card>
</template>
<script>
import eventMatalogMaintenance from './components/eventMatalogMaintenance.vue'
import batchManagement from './components/batchManagement.vue'
import {getUserRole} from "@/hook";
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》';
export default {
//import引入的组件需要注入到对象中才能使用",
components: {eventMatalogMaintenance, batchManagement},
data() {
//这里存放数据",
return {
componentState: 1,
init: {
columns: [],
tableData: [],
page_index: 1,
page_size: 10,
total: 0,
"title": "",
"start_time": "",
"end_time": "",
"public_type": "",
"approval_state": "",
"is_public": "",
},
columns: [
{
title: 'Name',
key: 'name'
},
{
title: 'Age',
key: 'age'
},
{
title: 'Address',
key: 'address'
}
],
data: [
{
name: 'John Brown',
age: 18,
address: 'New York No. 1 Lake Park',
date: '2016-10-03'
},
{
name: 'Jim Green',
age: 24,
address: 'London No. 1 Lake Park',
date: '2016-10-01'
},
{
name: 'Joe Black',
age: 30,
address: 'Sydney No. 1 Lake Park',
date: '2016-10-02'
},
{
name: 'Jon Snow',
age: 26,
address: 'Ottawa No. 2 Lake Park',
date: '2016-10-04'
}
],
theme: 'light'
};
},
//监听属性 类似于data概念",
computed: {},
//监控data中的数据变化",
watch: {},
//方法集合",
methods: {
handleChangePage(pageNumber) {
this.init.page_index = pageNumber
this.getCompetitionSignList()
},
// 切换每页条数
handleChangePageSize(size) {
this.init.page_size = size
this.getCompetitionSignList()
},
aaa(e) {
this.componentState = Number(e)
}
},
//生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载
beforeCreate() {
},
//生命周期 - 创建完成(可以访问当前this实例)",数据模型已加载,方法已加载,html模板已加载,html模板未渲染
created() {
},
//生命周期 - 挂载之前",html模板未渲染
beforeMount() {
},
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() {
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新
beforeUpdate() {
},
//生命周期 - 更新之后",数据模型已更新,html模板已更新
updated() {
},
//生命周期 - 销毁之前",
beforeDestroy() {
},
destroyed() {
},
//生命周期 - 销毁完成",
//如果页面有keep-alive缓存功能,这个函数会触发",
activated() {
},
}
</script>
<style scoped>
</style>
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<Card style="width: 50%;margin-top: 20px;border-radius: 20px" v-if="form_name === 'CompetitionReport'">
<Card style="width: 50%;margin-top: 20px;border-radius: 20px;" v-if="form_name === 'CompetitionReport'">
<div class="tableList"> <div class="tableList">
<h1 style="display: flex;justify-content: center"> {{ data.Object.module }}</h1> <h1 style="display: flex;justify-content: center"> {{ data.Object.module }}</h1>
<table border="1" class="container1"> <table border="1" class="container1">
...@@ -55,16 +56,16 @@ ...@@ -55,16 +56,16 @@
}} }}
</td> </td>
</tr> </tr>
<tr> <!-- <tr>-->
<th>附件:</th> <!-- <th>附件:</th>-->
<td class="colContent"> <!-- <td class="colContent">-->
<a :href="ite.path" class="aText" style="display: flex;flex-wrap: wrap;justify-content: center" <!-- <a :href="ite.path" class="aText" style="display: flex;flex-wrap: wrap;justify-content: center"-->
v-for="(ite,inde) in data.Object.file_list" <!-- v-for="(ite,inde) in data.Object.file_list"-->
:key="inde"> <!-- :key="inde">-->
{{ ite.file_name }} <!-- {{ ite.file_name }}-->
</a> <!-- </a>-->
</td> <!-- </td>-->
</tr> <!-- </tr>-->
<!-- <tr>--> <!-- <tr>-->
<!-- <th>赛项名称:</th>--> <!-- <th>赛项名称:</th>-->
<!-- <td class="colContent">--> <!-- <td class="colContent">-->
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
</Card> </Card>
<Card style="width: 50%;margin-top: 20px;border-radius: 20px" v-if="form_name === 'CompetitionSign'"> <Card style="width: 50%;margin-top: 20px;border-radius: 20px;" v-if="form_name === 'CompetitionSign'">
<div class="tableList"> <div class="tableList">
<h1 style="display: flex;justify-content: center"> {{ data.Object.module }}</h1> <h1 style="display: flex;justify-content: center"> {{ data.Object.module }}</h1>
<table border="1" class="container1"> <table border="1" class="container1">
...@@ -127,10 +128,26 @@ ...@@ -127,10 +128,26 @@
</td> </td>
</tr> </tr>
</table> </table>
<div style="width: 100%;height: 50vh;overflow-y: auto;">
<Card style="margin-top: 1vw;width: 100%" v-for="(item,index) in competitionsignTeam" :key="index">
<template #title>
<h3>{{
item.teanname
}}(指导教师{{ item.teacher_list.length }}位;参赛学生{{ item.student_list.length }}位;)</h3>
</template>
<Table :columns="columnsTeacher" :data="item.teacher_list">
</Table>
<Table :columns="columnsStudent" :data="item.student_list">
</Table>
</Card>
</div>
</div> </div>
</Card> </Card>
<Card style="width: 50%;margin-top: 20px;border-radius: 20px" v-if="form_name === 'Certificate'"> <Card style="width: 50%;margin-top: 20px;border-radius: 20px;" v-if="form_name === 'Certificate'">
<div class="tableList"> <div class="tableList">
<h1 style="display: flex;justify-content: center"> {{ data.Object.module }}</h1> <h1 style="display: flex;justify-content: center"> {{ data.Object.module }}</h1>
<table border="1" class="container1"> <table border="1" class="container1">
...@@ -191,7 +208,7 @@ ...@@ -191,7 +208,7 @@
</div> </div>
</Card> </Card>
<Card style="width: 50%;margin-top: 20px;border-radius: 20px" v-if="form_name === 'Bursary'"> <Card style="width: 50%;margin-top: 20px;border-radius: 20px;" v-if="form_name === 'Bursary'">
<div class="tableList"> <div class="tableList">
<h1 style="display: flex;justify-content: center"> {{ data.Object.module }}</h1> <h1 style="display: flex;justify-content: center"> {{ data.Object.module }}</h1>
<table border="1" class="container1"> <table border="1" class="container1">
...@@ -238,8 +255,7 @@ ...@@ -238,8 +255,7 @@
</div> </div>
</Card> </Card>
<Card style="width: 50%;margin-top: 20px;border-radius: 20px;" v-if="form_name === 'Notice'">
<Card style="width: 50%;margin-top: 20px;border-radius: 20px" v-if="form_name === 'Notice'">
<div class="tableList"> <div class="tableList">
<h1 style="display: flex;justify-content: center"> {{ data.Object.module }}</h1> <h1 style="display: flex;justify-content: center"> {{ data.Object.module }}</h1>
<table border="1" class="container1"> <table border="1" class="container1">
...@@ -289,7 +305,39 @@ ...@@ -289,7 +305,39 @@
</div> </div>
</Card> </Card>
<div
style="box-sizing: border-box; border-top: #1e93ff 0.3vw solid; width: 15%;height: 127vh;margin-top:20px;
padding:3vw 1vw 3vw 1vw;background-color: white;display: flex;justify-content: center">
<Timeline>
<TimelineItem :color="['blue','green'][Number(!item.action_name)]"
v-for="(item,index) in timeLineArray"
:key="index">
<template #dot v-if="Number(!!item.action_name)">
<Icon type="ios-checkmark-circle" color="#1e93ff"/>
</template>
<div v-if="Number(!!item.action_name)">
<h3 style="font-family: '宋体'">{{ item.node_name }}</h3>
</div>
<div v-else>
<div style="display: flex;align-items: center">
<h3 style="font-family: '宋体'">{{ item.node_name }}</h3>(当前节点)
</div>
</div>
<div>
<div v-if="item.name">
用户名:<span style="color: #1e93ff">{{ item.name }}</span>
</div>
<div v-if="item.action_name">
审批动作:<span style="color: #1e93ff">{{ item.action_name }}</span>
</div>
</div>
<div v-if="item.comment">审批意见:{{ item.comment }}</div>
<div v-if="item.approver_time">处理时间:{{ item.approver_time }}</div>
<div v-if="item.elapsed_time">处理耗时:{{ item.elapsed_time }}</div>
</TimelineItem>
</Timeline>
</div>
</div>
<Modal <Modal
v-model="publicModal" v-model="publicModal"
title="审批意见" title="审批意见"
...@@ -335,8 +383,6 @@ ...@@ -335,8 +383,6 @@
</Drawer> </Drawer>
</div> </div>
</div>
</template> </template>
<script> <script>
...@@ -350,6 +396,73 @@ export default { ...@@ -350,6 +396,73 @@ export default {
data() { data() {
//这里存放数据", //这里存放数据",
return { return {
columnsStudent: [
{
title: '参赛学生',
minWidth: 100,
key: 'name'
},
{
title: '学号',
minWidth: 120,
key: 'card_name'
},
{
title: '身份证号',
minWidth: 180,
key: 'sfzh'
},
{
title: '班级',
minWidth: 150,
key: 'classname'
},
{
title: '性别',
minWidth: 80,
key: 'gender'
},
{
title: '联系电话',
minWidth: 150,
key: 'phone'
},
],
columnsTeacher: [
{
title: '指导教师',
minWidth: 100,
key: 'name'
},
{
title: '工号',
minWidth: 120,
key: 'card_name'
},
{
title: '身份证号',
minWidth: 180,
key: 'sfzh'
},
{
title: '教学院系',
minWidth: 150,
key: 'dept'
},
{
title: '性别',
minWidth: 80,
key: 'gender'
},
{
title: '联系电话',
minWidth: 150,
key: 'phone'
},
],
competitionsignTeam: [],
flowInfo: '', flowInfo: '',
publicIdentificatio: '', publicIdentificatio: '',
publicTextarea: '', publicTextarea: '',
...@@ -415,7 +528,7 @@ export default { ...@@ -415,7 +528,7 @@ export default {
// } // }
], ],
drawerData: [], drawerData: [],
timeLineArray: [],
} }
}, },
//监听属性 类似于data概念", //监听属性 类似于data概念",
...@@ -424,6 +537,14 @@ export default { ...@@ -424,6 +537,14 @@ export default {
watch: {}, watch: {},
//方法集合", //方法集合",
methods: { methods: {
GetFlowLogList(form_id) {
hook.getInitListRequest(() => {
api.GetFlowLogList({form_id: form_id}).then((res) => {
console.log("🚀🚀resres🚀,", res)
this.timeLineArray = res.response
})
})
},
async teamInfo() { async teamInfo() {
this.$Spin.show() this.$Spin.show()
const res = await api.GetTeamInfo({teamid: this.data.Object.certificate.team_id}) const res = await api.GetTeamInfo({teamid: this.data.Object.certificate.team_id})
...@@ -504,47 +625,52 @@ export default { ...@@ -504,47 +625,52 @@ export default {
} }
let res = await api.GetFlowInfo(data) let res = await api.GetFlowInfo(data)
console.log("🚀🚀🚀,", res) console.log("🚀🚀🚀,", res)
this.GetFlowLogList(res.response.competition_report.competitionreportid)
downSpin(res) downSpin(res)
this.data.Object = res.response this.data.Object = res.response
delete res.response.competition_report.competitionreportid let Key = [
delete res.response.competition_report.competition_file "competitionname",
delete res.response.competition_report.approval_remark "sponsor",
delete res.response.competition_report.dept_id "way",
"dept",
delete res.response.competition_report.game_size "competitionsubitem_name",
delete res.response.competition_report.average "report_code",
delete res.response.competition_report.ratio_info "competitionbatch_name",
delete res.response.competition_report.intro "competition_type_name",
delete res.response.competition_report.undertaker "competition_level_name",
delete res.response.competition_report.participant ];
delete res.response.competition_report.reason Object.keys(res.response.competition_report).map(cur => Key.includes(cur) ? '' : delete res.response.competition_report[cur])
delete res.response.competition_report.competition_time
delete res.response.competition_report.subitem_list
this.data.keyValueArray = Object.entries(res.response.competition_report) this.data.keyValueArray = Object.entries(res.response.competition_report)
this.data.keyValueArray.map((cur, index) => { this.data.keyValueArray.map((cur, index) => {
let array = [ let array = [
'赛事名称', '赛事名称',
'主办单位', '主办单位',
'比赛形式',
'教学单位',
'赛项名称',
'赛事编码',
'学年名称',
'赛事类型',
// '承办单位/秘书处', // '承办单位/秘书处',
'赛事级别', '赛事级别',
'相关专业',
// '正常比赛时间与天数', // '正常比赛时间与天数',
// '参赛对象', // '参赛对象',
'组队方式', // '组队方式',
// '比赛规模', // '比赛规模',
// '近三年参赛平均数量', // '近三年参赛平均数量',
// '获奖比例', // '获奖比例',
// '赛事及竞赛方案简介', // '赛事及竞赛方案简介',
'拟参赛专业和相关课程', // '拟参赛专业和相关课程',
// '参赛理由', // '参赛理由',
'创建时间', // '创建时间',
'审批状态', // '审批状态',
'竞赛类型', // '竞赛类型',
'院系', // '院系',
'赛事奖金', // '赛事奖金',
'竞赛开始时间', // '竞赛开始时间',
'竞赛结束时间', // '竞赛结束时间',
'参赛对象', // '参赛对象',
// '审批意见', // '审批意见',
] ]
cur.push(array[index]) cur.push(array[index])
...@@ -557,37 +683,46 @@ export default { ...@@ -557,37 +683,46 @@ export default {
runid: this.runid runid: this.runid
} }
let res1 = await api.GetFlowInfo(data1) let res1 = await api.GetFlowInfo(data1)
this.GetFlowLogList(res1.response.competition_sign.competitionsignid)
downSpin(res1) downSpin(res1)
this.data.Object = res1.response this.data.Object = res1.response
delete res1.response.competition_sign.competitionsignid this.data.competitionsignid = res1.response.competition_sign.competitionsignid
delete res1.response.competition_sign.competition_file api.TeamAndMemberSel({signid: res1.response.competition_sign.competitionsignid}).then(res => {
delete res1.response.competition_sign.approval_remark console.log("🚀🚀🚀,", res)
delete res1.response.competition_sign.competitionreportid this.competitionsignTeam = res.response
delete res1.response.competition_sign.sign_up })
delete res1.response.competition_sign.approach_file let keys = [
delete res1.response.competition_sign.train_file // 'competitionsignid',
'competitionname',
'sponsor',
'way',
'class_hour',
'end_time',
'competitionsubitem_name',
'report_code',
'competition_type_name',
'competition_level_name',
'begin_time',
'money',
]
Object.keys(res1.response.competition_sign).map(cur => {
if (keys.indexOf(cur) === -1) delete res1.response.competition_sign[cur]
})
this.data.keyValueArray = Object.entries(res1.response.competition_sign) this.data.keyValueArray = Object.entries(res1.response.competition_sign)
this.data.keyValueArray.map((cur, index) => { this.data.keyValueArray.map((cur, index) => {
let array1 = ['竞赛项目名称(大赛名称)', let array1 = [
'赛事编号',
'赛事名称',
'赛项名称',
'主办单位', '主办单位',
'竞赛级别', '赛事级别',
'比赛时间', '赛事类别',
'竞赛地点', '参赛形式',
'报名者', '比赛开始时间',
'竞赛文件名(文号)', '比赛结束时间',
'竞赛分级', '经费预算',
'竞赛形式(团/个)', '计划培训课时',
'计划培训量',
'参赛队数量(队/人)',
'竞赛对应课程',
'培训开始时间',
'培训结束时间',
'竞赛的其他要求',
// '竞赛方案附件',
// '培训计划附件',
'创建时间',
'审批状态',
// '审批意见',
] ]
cur.push(array1[index]) cur.push(array1[index])
}) })
...@@ -599,6 +734,7 @@ export default { ...@@ -599,6 +734,7 @@ export default {
runid: this.runid runid: this.runid
} }
let res2 = await api.GetFlowInfo(data2) let res2 = await api.GetFlowInfo(data2)
this.GetFlowLogList(res2.response.certificate.certificateid)
downSpin(res2) downSpin(res2)
this.data.Object = res2.response this.data.Object = res2.response
delete res2.response.certificate.certificateid delete res2.response.certificate.certificateid
...@@ -643,6 +779,7 @@ export default { ...@@ -643,6 +779,7 @@ export default {
runid: this.runid runid: this.runid
} }
let res3 = await api.GetFlowInfo(data3) let res3 = await api.GetFlowInfo(data3)
this.GetFlowLogList(res3.response.bursary.competitionreportid)
downSpin(res3) downSpin(res3)
this.data.Object = res3.response this.data.Object = res3.response
delete res3.response.bursary.bursaryid delete res3.response.bursary.bursaryid
......
...@@ -6,6 +6,11 @@ ...@@ -6,6 +6,11 @@
<h3>流程待办列表</h3> <h3>流程待办列表</h3>
</div> </div>
</template> </template>
<template #extra>
<Select style="width: 15vw" @on-change="flowSelectOnChnage" placeholder="请选择流程名称">
<Option v-for="(item,index) in flowSelect" :key="index" :value="item.id">{{ item.name }}</Option>
</Select>
</template>
<!-- <Button type="primary" class="ivu-ml-8" @click="add">--> <!-- <Button type="primary" class="ivu-ml-8" @click="add">-->
<!-- <Icon type="md-add"/>--> <!-- <Icon type="md-add"/>-->
<!-- 新增--> <!-- 新增-->
...@@ -69,6 +74,7 @@ export default { ...@@ -69,6 +74,7 @@ export default {
data() { data() {
return { return {
flowSelect: [],
formData: { formData: {
name: '', name: '',
url: '', url: '',
...@@ -149,21 +155,21 @@ export default { ...@@ -149,21 +155,21 @@ export default {
minWidth: 200, minWidth: 200,
}, },
{ {
title: '当前节点待办人员', title: '人员名单',
slot: 'todo', slot: 'todo',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 200, minWidth: 200,
}, },
{ {
title: '参与人', title: '人员名单',
slot: 'partcipant', slot: 'partcipant',
align: 'center', align: 'center',
show: true, show: true,
minWidth: 200, minWidth: 200,
}, },
{ {
title: '发起人', title: '发起人工号',
key: 'starter', key: 'starter',
align: 'center', align: 'center',
show: true, show: true,
...@@ -237,6 +243,7 @@ export default { ...@@ -237,6 +243,7 @@ export default {
page_index: 1, page_index: 1,
page_size: 10, page_size: 10,
total: 0, total: 0,
flow_id: '',
}, },
pageKey: 1 pageKey: 1
} }
...@@ -263,14 +270,33 @@ export default { ...@@ -263,14 +270,33 @@ export default {
// this.GetFlowTaskList() // this.GetFlowTaskList()
// } // }
// }); // });
this.GetFlowIdSelect()
}, },
methods: { methods: {
flowSelectOnChnage(e) {
this.init.flow_id = e
this.GetFlowTaskList()
},
GetFlowIdSelect() {
hook.getInitListRequest(() => {
api.GetFlowIdSelect().then((res) => {
res.response.map((cur, index) => {
if (cur.id === '102') {
res.response.unshift(cur)
res.response.splice(index + 1, 1)
}
})
this.flowSelect = res.response
})
})
},
// 查询 // 查询
async GetFlowTaskList() { async GetFlowTaskList() {
this.loading = true this.loading = true
let data = { let data = {
page_index: this.init.page_index, page_index: this.init.page_index,
page_size: this.init.page_size page_size: this.init.page_size,
flow_id: this.init.flow_id,
} }
const res = await api.GetFlowTaskList(data) const res = await api.GetFlowTaskList(data)
this.init.total = res.response.data_count this.init.total = res.response.data_count
......
<template> <template>
<div class="container"> <div class="container">
<Card style="width: 50%"> <Card style="width: 60%">
<template #title><h2 style="text-align: center"> <template #title><h2 style="text-align: center">
赛事录入</h2></template> 赛事录入</h2></template>
<Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="180" :key="Key"> <!-- 旧流程 231112-->
<FormItem label="赛事名称" prop="competitionname"> <!-- <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" :key="Key">-->
<div style="display: flex;flex-wrap: nowrap">
<Input v-model="formValidate.competitionname" placeholder="请输入赛事名称"></Input> <!-- <FormItem label="赛事名称" prop="competitionname">-->
<!-- <Button v-if="false" type="primary" style="margin-left: 10px;" @click="competitionItemModal = true">添加赛项名称 <!-- <div style="display: flex;flex-wrap: nowrap">-->
</Button>--> <!-- <Input v-model="formValidate.competitionname" placeholder="请输入赛事名称"></Input>-->
</div> <!-- &lt;!&ndash; <Button v-if="false" type="primary" style="margin-left: 10px;" @click="competitionItemModal = true">添加赛项名称-->
</FormItem> <!-- </Button>&ndash;&gt;-->
<FormItem label="主办单位" prop="sponsor1"> <!-- </div>-->
<Input v-model="formValidate.sponsor" placeholder="请输入主办单位"></Input> <!-- </FormItem>-->
</FormItem> <!-- <FormItem label="主办单位" prop="sponsor1">-->
<!-- <Input v-model="formValidate.sponsor" placeholder="请输入主办单位"></Input>-->
<!-- </FormItem>-->
<!-- <FormItem label="承办单位/秘书处" prop="undertaker">--> <!-- &lt;!&ndash; <FormItem label="承办单位/秘书处" prop="undertaker">&ndash;&gt;-->
<!-- <Input v-model="formValidate.undertaker" placeholder="请输入承办单位/秘书处"></Input>--> <!-- &lt;!&ndash; <Input v-model="formValidate.undertaker" placeholder="请输入承办单位/秘书处"></Input>&ndash;&gt;-->
<!-- &lt;!&ndash; </FormItem>&ndash;&gt;-->
<!-- <FormItem label="赛事级别" prop="level1">-->
<!-- <Select v-model="formValidate.level" placeholder="请选择赛事级别">-->
<!-- <Option v-for="(item,index) in levelArray" :key="index" :value="item.value">{{ item.label }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>--> <!-- </FormItem>-->
<FormItem label="赛事级别" prop="level1">
<Select v-model="formValidate.level" placeholder="请选择赛事级别">
<Option v-for="(item,index) in levelArray" :key="index" :value="item.value">{{ item.label }}</Option>
</Select>
</FormItem>
<!-- <FormItem label="竞赛类型" prop="competition_type1">-->
<!-- <Select v-model="formValidate.competition_type" placeholder="请选择竞赛类型">-->
<!-- <Option v-for="(item,index) in competitionClass" :key="index" :value="item.value">{{ item.label }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem label="比赛奖金" prop="money1">-->
<!-- <InputNumber :min="0" style="width: 100%" v-model="formValidate.money"-->
<!-- placeholder="请输入比赛奖金"></InputNumber>-->
<!-- </FormItem>-->
<!-- <FormItem label="院系" prop="dept_id">-->
<!-- <Select :disabled="formValidate.competition_type === 1" v-model="formValidate.dept_id"-->
<!-- placeholder="请选择院系">-->
<!-- <Option v-for="(item,index) in faculty" :key="index" :value="item.id">{{ item.name }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- &lt;!&ndash; <FormItem label="比赛时间" prop="competition_time">&ndash;&gt;-->
<!-- &lt;!&ndash; <Input style="width: 100%" v-model="formValidate.competition_time"&ndash;&gt;-->
<!-- &lt;!&ndash; placeholder="请输入正常比赛时间与天数"></Input>&ndash;&gt;-->
<!-- &lt;!&ndash; </FormItem>&ndash;&gt;-->
<!-- <FormItem label="比赛时间" prop="competition_time1">-->
<!-- <DatePicker style="width: 100%" type="daterange"-->
<!-- v-model="formValidate.competition_time"-->
<!-- @on-change="getCompetitionTime"-->
<!-- placement="bottom-end"-->
<!-- placeholder="请选择比赛时间"/>-->
<!-- </FormItem>-->
<!-- <FormItem label="参赛对象" prop="competitor1">-->
<!-- <Select v-model="formValidate.competitor"-->
<!-- placeholder="请选择参赛对象">-->
<!-- <Option v-for="(item,index) in competitionObjectArray" :key="index" :value="item.value">{{-->
<!-- item.name-->
<!-- }}-->
<!-- </Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem label="比赛形式" prop="way1">-->
<!-- <Select v-model="formValidate.way" placeholder="请选择组队方式">-->
<!-- <Option v-for="(item,index) in wayArray" :key="index" :value="item.value">-->
<!-- {{ item.label }}-->
<!-- </Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- &lt;!&ndash; <FormItem label="比赛规模" prop="game_size">&ndash;&gt;-->
<!-- &lt;!&ndash; <Input v-model="formValidate.game_size" placeholder="请输入比赛规模"></Input>&ndash;&gt;-->
<!-- &lt;!&ndash; </FormItem>&ndash;&gt;-->
<!-- &lt;!&ndash; <FormItem label="近三年参赛平均数量" prop="average">&ndash;&gt;-->
<!-- &lt;!&ndash; <Input v-model="formValidate.average" placeholder="请输入近三年参赛平均数量"></Input>&ndash;&gt;-->
<!-- &lt;!&ndash; </FormItem>&ndash;&gt;-->
<!-- &lt;!&ndash; <FormItem label="获奖比例" prop="ratio_info">&ndash;&gt;-->
<!-- &lt;!&ndash; <Input v-model="formValidate.ratio_info" placeholder="请输入获奖比例"></Input>&ndash;&gt;-->
<!-- &lt;!&ndash; </FormItem>&ndash;&gt;-->
<!-- &lt;!&ndash; <FormItem label="赛事及竞赛方案简介" prop="intro">&ndash;&gt;-->
<!-- &lt;!&ndash; <Input v-model="formValidate.intro" type="textarea" :autosize="{minRows: 7,maxRows: 10}"&ndash;&gt;-->
<!-- &lt;!&ndash; placeholder="请输入赛事及竞赛方案简介"></Input>&ndash;&gt;-->
<!-- &lt;!&ndash; </FormItem>&ndash;&gt;-->
<!-- <FormItem label="拟参赛专业和相关课程" prop="correlation1">-->
<!-- <Input v-model="formValidate.correlation" type="textarea" :autosize="{minRows: 7,maxRows: 10}"-->
<!-- placeholder="请输入拟参赛专业和相关课程"></Input>-->
<!-- </FormItem>-->
<!-- &lt;!&ndash; <FormItem label="参赛理由" prop="reason">&ndash;&gt;-->
<!-- &lt;!&ndash; <Input v-model="formValidate.reason" type="textarea" :autosize="{minRows: 7,maxRows: 10}"&ndash;&gt;-->
<!-- &lt;!&ndash; placeholder="请输入参赛理由"></Input>&ndash;&gt;-->
<!-- &lt;!&ndash; </FormItem>&ndash;&gt;-->
<!-- <FormItem :key="fileKey" label="附件上传">-->
<!-- <Upload-->
<!-- :multiple="true"-->
<!-- :before-upload="beforeUpload"-->
<!-- :on-error="onError"-->
<!-- :on-success="onsuccess"-->
<!-- :on-format-error="onFormatError"-->
<!-- :show-upload-list="true"-->
<!-- type="drag"-->
<!-- action=""-->
<!-- >-->
<!-- &lt;!&ndash; <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>&ndash;&gt;-->
<!-- &lt;!&ndash; <p>附件上传</p>&ndash;&gt;-->
<!-- <div style="padding: 20px 0;width: 100%;">-->
<!-- <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>-->
<!-- <p>需上传比赛通知文件、竞赛规程、技术文件等文件</p>-->
<!-- </div>-->
<!-- </Upload>-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- <div v-if="!!formValidate.files_list.length">-->
<!-- <span>附件:</span>-->
<!-- <div class="filelist" v-for="(item,index) in formValidate.files_list" :key="index">-->
<!-- {{ item.file_name }}-->
<!-- <Icon v-if="item.file_name" class="fileddelete" @click="fileDelete(item)"-->
<!-- type="ios-trash"/>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div :key="competitoionItemKey" v-if="!!formValidate.subitem_list.length">-->
<!-- <span>赛项名称:</span>-->
<!-- <div class="competitionItemText" v-for="(item,index) in formValidate.subitem_list" :key="index"-->
<!-- style="margin-top: 5px">-->
<!-- <span style="height: 160px">-->
<!-- <span> {{ item.competitionsubitem_name }}</span>-->
<!-- <Icon @click="deleteCompetitionItem(item)" class="competitionItemIcon" type="ios-trash"-->
<!-- color="#A2A6AD"-->
<!-- style="font-size: 16px;margin-left: 5px;"/>-->
<!-- </span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </FormItem>-->
<FormItem label="竞赛类型" prop="competition_type1"> <!-- <FormItem>-->
<Select v-model="formValidate.competition_type" placeholder="请选择竞赛类型"> <!-- <Button type="primary" style="margin-right: 10px"-->
<Option v-for="(item,index) in competitionClass" :key="index" :value="item.value">{{ item.label }}</Option> <!-- @click="handleSubmit">提交-->
<!-- </Button>-->
<!-- <Button type="primary"-->
<!-- @click="save">保存-->
<!-- </Button>-->
<!-- &lt;!&ndash; <Button type="primary" @click="saveFile">保存附件</Button>&ndash;&gt;-->
<!-- <Button @click="handleReset" style="margin-left: 8px">重置</Button>-->
<!-- </FormItem>-->
<!-- <FormItem>-->
<!-- <Button type="primary" style="margin-right: 10px"-->
<!-- @click="handleSubmit">提交-->
<!-- </Button>-->
<!-- <Button type="primary"-->
<!-- @click="save">保存-->
<!-- </Button>-->
<!-- &lt;!&ndash; <Button type="primary" @click="saveFile">保存附件</Button>&ndash;&gt;-->
<!-- <Button @click="handleReset" style="margin-left: 8px">重置</Button>-->
<!-- </FormItem>-->
<!-- </Form>-->
<!-- 旧流程 231112-->
<Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" :key="Key">
<Row :span="24" style="display: flex;justify-content: space-between">
<Col :span="11">
<FormItem label="学年名称" prop="competitionbatch_id">
<Select v-model="formValidate.competitionbatch_id" style="width:100%">
<Option v-for="item in batchList" :value="item.id" :key="item.id">{{ item.name }}</Option>
</Select> </Select>
</FormItem> </FormItem>
<FormItem label="比赛奖金" prop="money1"> </Col>
<InputNumber :min="0" style="width: 100%" v-model="formValidate.money" <Col :span="11">
placeholder="请输入比赛奖金"></InputNumber> <FormItem label="赛事编码" prop="report_code">
<Input v-model="formValidate.report_code" placeholder="请输入学年名称"></Input>
</FormItem>
</Col>
</Row>
<Row :span="24" style="display: flex;justify-content: space-between">
<Col :span="11">
<FormItem label="赛事名称" prop="competitionname">
<Input v-model="formValidate.competitionname" placeholder="请输入学年名称"></Input>
</FormItem> </FormItem>
<FormItem label="院系" prop="dept_id"> </Col>
<Select :disabled="formValidate.competition_type === 1" v-model="formValidate.dept_id" <Col :span="11">
placeholder="请选择院系"> <FormItem label="赛项名称" prop="competitionsubitem_name">
<Option v-for="(item,index) in faculty" :key="index" :value="item.id">{{ item.name }}</Option> <Input v-model="formValidate.competitionsubitem_name" placeholder="请输入学年名称"></Input>
</FormItem>
</Col>
</Row>
<Row :span="24" style="display: flex;justify-content: space-between">
<Col :span="11">
<FormItem label="教学单位" prop="dept_id">
<Select v-model="formValidate.dept_id" style="width:100%" multiple>
<Option v-for="(item,index) in deptList" :value="item.id" :key="index">{{ item.name }}</Option>
</Select> </Select>
</FormItem> </FormItem>
<!-- <FormItem label="比赛时间" prop="competition_time">--> </Col>
<!-- <Input style="width: 100%" v-model="formValidate.competition_time"--> <Col :span="11">
<!-- placeholder="请输入正常比赛时间与天数"></Input>--> <FormItem label="主办单位" prop="sponsor">
<!-- </FormItem>--> <Input v-model="formValidate.sponsor" placeholder="请输入学年名称"></Input>
<FormItem label="比赛时间" prop="competition_time1">
<DatePicker style="width: 100%" type="daterange"
v-model="formValidate.competition_time"
@on-change="getCompetitionTime"
placement="bottom-end"
placeholder="请选择比赛时间"/>
</FormItem> </FormItem>
</Col>
<FormItem label="参赛对象" prop="competitor1"> </Row>
<Select v-model="formValidate.competitor" <Row :span="24" style="display: flex;justify-content: space-between">
placeholder="请选择参赛对象"> <Col :span="11">
<Option v-for="(item,index) in competitionObjectArray" :key="index" :value="item.value">{{ <FormItem label="赛事级别" prop="competition_level_id">
<Select v-model="formValidate.competition_level_id" style="width:100%">
<Option v-for="item in levelList" :value="item.id" :key="item.id">{{
item.name item.name
}} }}
</Option> </Option>
</Select> </Select>
</FormItem> </FormItem>
<FormItem label="比赛形式" prop="way1"> </Col>
<Select v-model="formValidate.way" placeholder="请选择组队方式"> <Col :span="11">
<Option v-for="(item,index) in wayArray" :key="index" :value="item.value"> <FormItem label="赛事类型" prop="competition_type_id">
{{ item.label }} <Select v-model="formValidate.competition_type_id" style="width:100%">
<Option v-for="item in classList" :value="item.id"
:key="item.id">{{
item.name
}}
</Option> </Option>
</Select> </Select>
</FormItem> </FormItem>
<!-- <FormItem label="比赛规模" prop="game_size">--> </Col>
<!-- <Input v-model="formValidate.game_size" placeholder="请输入比赛规模"></Input>--> </Row>
<!-- </FormItem>--> <Row :span="24" style="display: flex;justify-content: space-between">
<!-- <FormItem label="近三年参赛平均数量" prop="average">--> <Col :span="11">
<!-- <Input v-model="formValidate.average" placeholder="请输入近三年参赛平均数量"></Input>--> <FormItem label="比赛形式" prop="way">
<!-- </FormItem>--> <Select v-model="formValidate.way" style="width:100%">
<!-- <FormItem label="获奖比例" prop="ratio_info">--> <Option v-for="item in wayList" :value="item.value" :key="item.value">{{ item.label }}</Option>
<!-- <Input v-model="formValidate.ratio_info" placeholder="请输入获奖比例"></Input>--> </Select>
<!-- </FormItem>-->
<!-- <FormItem label="赛事及竞赛方案简介" prop="intro">-->
<!-- <Input v-model="formValidate.intro" type="textarea" :autosize="{minRows: 7,maxRows: 10}"-->
<!-- placeholder="请输入赛事及竞赛方案简介"></Input>-->
<!-- </FormItem>-->
<FormItem label="拟参赛专业和相关课程" prop="correlation1">
<Input v-model="formValidate.correlation" type="textarea" :autosize="{minRows: 7,maxRows: 10}"
placeholder="请输入拟参赛专业和相关课程"></Input>
</FormItem> </FormItem>
<!-- <FormItem label="参赛理由" prop="reason">--> </Col>
<!-- <Input v-model="formValidate.reason" type="textarea" :autosize="{minRows: 7,maxRows: 10}"--> <Col :span="11">
<!-- placeholder="请输入参赛理由"></Input>--> <FormItem label="相关专业" prop="specialty">
<!-- </FormItem>--> <Input v-model="formValidate.specialty" placeholder="请输入学年名称"></Input>
<FormItem :key="fileKey" label="附件上传">
<Upload
:multiple="true"
:before-upload="beforeUpload"
:on-error="onError"
:on-success="onsuccess"
:on-format-error="onFormatError"
:show-upload-list="true"
type="drag"
action=""
>
<!-- <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>-->
<!-- <p>附件上传</p>-->
<div style="padding: 20px 0;width: 100%;">
<Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
<p>需上传比赛通知文件、竞赛规程、技术文件等文件</p>
</div>
</Upload>
<!-- </div>-->
<div v-if="!!formValidate.files_list.length">
<span>附件:</span>
<div class="filelist" v-for="(item,index) in formValidate.files_list" :key="index">
{{ item.file_name }}
<Icon v-if="item.file_name" class="fileddelete" @click="fileDelete(item)"
type="ios-trash"/>
</div>
</div>
<div :key="competitoionItemKey" v-if="!!formValidate.subitem_list.length">
<span>赛项名称:</span>
<div class="competitionItemText" v-for="(item,index) in formValidate.subitem_list" :key="index"
style="margin-top: 5px">
<span style="height: 160px">
<span> {{ item.competitionsubitem_name }}</span>
<Icon @click="deleteCompetitionItem(item)" class="competitionItemIcon" type="ios-trash"
color="#A2A6AD"
style="font-size: 16px;margin-left: 5px;"/>
</span>
</div>
</div>
</FormItem> </FormItem>
</Col>
</Row>
<FormItem> </Form>
<Button type="primary" style="margin-right: 10px" <div style="display: flex;justify-content: space-between">
<Button type="primary" style="width: 30%;"
@click="handleSubmit">提交 @click="handleSubmit">提交
</Button> </Button>
<Button type="primary" <Button style="width: 30%;" type="primary"
@click="save">保存 @click="save">保存
</Button> </Button>
<!-- <Button type="primary" @click="saveFile">保存附件</Button>--> <!-- <Button type="primary" @click="saveFile">保存附件</Button>-->
<Button @click="handleReset" style="margin-left: 8px">重置</Button> <Button @click="handleReset" style="width: 30%;">重置</Button>
</FormItem> </div>
</Form>
</Card> </Card>
<Modal <Modal
...@@ -188,6 +291,7 @@ import * as hook from '../../../hook' ...@@ -188,6 +291,7 @@ import * as hook from '../../../hook'
import * as api from '../../../api/requestUtils' import * as api from '../../../api/requestUtils'
import _ from "lodash"; import _ from "lodash";
import dayjs from "dayjs"; import dayjs from "dayjs";
import * as hooks from "@/hook";
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等) //这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》'; //例如:import 《组件名称》 from '《组件路径》';
export default { export default {
...@@ -196,6 +300,16 @@ export default { ...@@ -196,6 +300,16 @@ export default {
data() { data() {
//这里存放数据", //这里存放数据",
return { return {
competitionId: '',
wayList: [
{value: 0, label: '团队'},
{value: 1, label: '个人'},
// {value: 2, label: '团队/个人'},
],
deptList: [],
batchList: [],
classList: [],
levelList: [],
Key: 1, Key: 1,
competitionItemModal: false, competitionItemModal: false,
entrance: '', entrance: '',
...@@ -259,6 +373,36 @@ export default { ...@@ -259,6 +373,36 @@ export default {
"files_list": [] "files_list": []
}, },
ruleValidate: { ruleValidate: {
competitionbatch_id: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
report_code: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
// competitionname: [
// {required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
// ],
competitionsubitem_name: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
dept_id: [
{required: true, type: 'array', message: '此项不能为空', trigger: 'change'}
],
// sponsor: [
// {required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
// ],
competition_level_id: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
competition_type_id: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
// way: [
// {required: true, type: 'number', message: '此项不能为空', trigger: 'change'}
// ],
specialty1: [
{required: true, type: 'string', message: '此项不能为空', trigger: 'change'}
],
// dept_id: [ // dept_id: [
// {type: 'string', required: true, message: '该项不能为空', trigger: 'change'} // {type: 'string', required: true, message: '该项不能为空', trigger: 'change'}
// ], // ],
...@@ -326,6 +470,30 @@ export default { ...@@ -326,6 +470,30 @@ export default {
}, },
//方法集合", //方法集合",
methods: { methods: {
GetLevelBySelect() {
hooks.getInitListRequest(async () => {
const res = await api.GetLevelBySelect()
this.levelList = res.response
})
},
GetTypeBySelect() {
hooks.getInitListRequest(async () => {
const res = await api.GetTypeBySelect()
this.classList = res.response
})
},
GetBatchBySelect() {
hooks.getInitListRequest(async () => {
const res = await api.GetBatchBySelect()
this.batchList = res.response
})
},
GetDeptSeletct() {
hooks.getInitListRequest(async () => {
const res = await api.GetDeptSeletct()
this.deptList = res.response
})
},
getCompetitionTime(e) { getCompetitionTime(e) {
console.log("🚀🚀🚀,", e) console.log("🚀🚀🚀,", e)
this.formValidate.begin_time = e[0] this.formValidate.begin_time = e[0]
...@@ -351,13 +519,25 @@ export default { ...@@ -351,13 +519,25 @@ export default {
}, },
save() { save() {
const fun = async (changecommitid) => { const fun = async (changecommitid) => {
console.log("🚀this.formValidate🚀🚀,", this.formValidate) this.$refs['formValidate'].validate(async (cur) => {
if (cur) {
// console.log("🚀this.formValidate🚀🚀,", this.formValidate)
let dept_id = ''
this.competitionId ? this.formValidate.competitionreportid = this.competitionId : null
let formValidate = _.cloneDeep(this.formValidate) let formValidate = _.cloneDeep(this.formValidate)
let subitem_list = formValidate.subitem_list let subitem_list = formValidate.subitem_list
let files_list = formValidate.files_list let files_list = formValidate.files_list
delete formValidate.files_list delete formValidate.files_list
delete formValidate.competition_time delete formValidate.competition_time
delete formValidate.subitem_list delete formValidate.subitem_list
formValidate.dept_id ? formValidate.dept_id.map((cur, index) => {
dept_id = dept_id + cur + ';'
}) : null
formValidate.dept_id = dept_id
console.log("🚀this.formValidate🚀🚀,", this.formValidate)
let data = { let data = {
"changecommitid": changecommitid, "changecommitid": changecommitid,
"flowid": this.flowid, "flowid": this.flowid,
...@@ -371,8 +551,10 @@ export default { ...@@ -371,8 +551,10 @@ export default {
await hook.myEncapsulationFunction(async () => { await hook.myEncapsulationFunction(async () => {
return await api.FlowChangeCommit(data) return await api.FlowChangeCommit(data)
}) })
} }
})
}
switch (this.changecommitid) { switch (this.changecommitid) {
case undefined : case undefined :
fun(this.changecommitid) fun(this.changecommitid)
...@@ -394,12 +576,14 @@ export default { ...@@ -394,12 +576,14 @@ export default {
this.formValidate.subitem_list = res.response.subitem_list this.formValidate.subitem_list = res.response.subitem_list
this.formValidate.competition_time = [res.response.competition_report.begin_time, res.response.competition_report.end_time] this.formValidate.competition_time = [res.response.competition_report.begin_time, res.response.competition_report.end_time]
this.formValidate.dept_id = res.response.competition_report.dept_id.split(';')
console.log("🚀🚀 this.formValidate.competition_time🚀,", this.formValidate.competition_time) console.log("🚀🚀 this.formValidate.competition_time🚀,", this.formValidate.competition_time)
//------------------------------ //------------------------------
this.changecommitid = res.response.changecommitid this.changecommitid = res.response.changecommitid
this.flowid = res.response.flowid this.flowid = res.response.flowid
this.module_id = res.response.module_id this.module_id = res.response.module_id
this.module = res.response.module this.module = res.response.module
break; break;
} }
}, },
...@@ -472,18 +656,18 @@ export default { ...@@ -472,18 +656,18 @@ export default {
fun(res1) fun(res1)
break; break;
} }
} }
}) })
}, },
handleReset() { handleReset() {
this.competitionId = this.formValidate.competitionreportid
this.formValidate = {} this.formValidate = {}
console.log("🚀🚀🚀,") console.log("🚀🚀🚀,")
}, },
async GetDeptSeletct() { // async GetDeptSeletct() {
const res = await api.GetDeptSeletct() // const res = await api.GetDeptSeletct()
this.faculty = res.response // this.faculty = res.response
} // }
}, },
//生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载 //生命周期 - 创建之前",数据模型未加载,方法未加载,html模板未加载
beforeCreate() { beforeCreate() {
...@@ -506,6 +690,9 @@ export default { ...@@ -506,6 +690,9 @@ export default {
this.entrance = this.$route.query.entrance; this.entrance = this.$route.query.entrance;
this.FlowInit() this.FlowInit()
this.GetDeptSeletct() this.GetDeptSeletct()
this.GetLevelBySelect()
this.GetTypeBySelect()
this.GetBatchBySelect()
}, },
//生命周期 - 更新之前",数据模型已更新,html模板未更新 //生命周期 - 更新之前",数据模型已更新,html模板未更新
......
<template> <template>
<div class="container"> <div class="container">
<Card style="width: 50%"> <div style="width: 50%;height: 90vh;overflow-y: auto;">
<Card style="width: 100%;height: auto;">
<template #title><h2 style="text-align: center"> <template #title><h2 style="text-align: center">
竞赛报名审批流程</h2></template> 参赛报名</h2></template>
<Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="180"> <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="180">
<FormItem label="竞赛项目名称(大赛名称)" prop="competitionname"> <FormItem label="赛事编号" prop="report_code">
<Select v-model="formValidate.competitionname" @on-change="competitionSelectName" <div style="display: flex">
placeholder="请选择竞赛项目名称(大赛名称)"> <Input v-model="formValidate.report_code" :disabled="true" placeholder="请输入赛事编号"></Input>
<Option v-for="(item,index) in competitionNameArray" :key="index" <Button @click="addAddressManually" style="margin-left: 1vw" type="primary">手动添加</Button>
:value="item.id"> </div>
{{ item.name }}
</Option>
</Select>
</FormItem>
<FormItem label="主办单位" prop="sponsor">
<Input v-model="formValidate.sponsor" :disabled="true" placeholder="请输入主办单位"></Input>
</FormItem>
<FormItem label="赛事级别" prop="level">
<Select v-model="formValidate.level" :disabled="true" placeholder="请选择赛事级别">
<Option v-for="(item,index) in levelArray" :key="index" :value="item.value">{{ item.label }}</Option>
</Select>
</FormItem> </FormItem>
<FormItem label="比赛时间(天数)" prop="competition_time"> <FormItem label="赛事名称" prop="competitionname">
<Input style="width: 100%" v-model="formValidate.competition_time" <Input v-model="formValidate.competitionname" :disabled="true" placeholder="请输入赛事名称"></Input>
placeholder="请输入比赛时间(天数)"></Input> <!-- <Select v-model="formValidate.competitionname" :disabled="true" @on-change="competitionSelectName"-->
<!-- placeholder="赛事名称">-->
<!-- <Option v-for="(item,index) in competitionNameArray" :key="index"-->
<!-- :value="item.id">-->
<!-- {{ item.name }}-->
<!-- </Option>-->
<!-- </Select>-->
</FormItem> </FormItem>
<FormItem label="竞赛地点" prop="place">
<Input v-model="formValidate.place" placeholder="请输入竞赛地点"></Input> <FormItem label="赛项名称" prop="competitionsubitem_name">
<Input v-model="formValidate.competitionsubitem_name" placeholder="请输入赛事编号"></Input>
</FormItem> </FormItem>
<FormItem label="报名者" prop="sign_up"> <FormItem label="主办单位" prop="sponsor">
<Select v-model="formValidate.sign_up" placeholder="请选择报名者"> <Input v-model="formValidate.sponsor" :disabled="true" placeholder="请输入主办单位"></Input>
<Option v-for="(item,index) in signPeople" :key="index" :value="item.id">
{{ item.name }}
</Option>
</Select>
</FormItem> </FormItem>
<FormItem label="竞赛文件名(文号)" prop="file_name"> <FormItem label="赛事级别" prop="competition_level_name1">
<Input v-model="formValidate.file_name" :disabled="true" placeholder="请输入竞赛文件名(文号)"></Input> <Input v-model="formValidate.competition_level_name" :disabled="true" placeholder="请输入赛事级别"></Input>
<!-- <Select v-model="formValidate.level" :disabled="true" placeholder="请选择赛事级别">-->
<!-- <Option v-for="(item,index) in levelArray" :key="index" :value="item.value">{{ item.label }}</Option>-->
<!-- </Select>-->
</FormItem> </FormItem>
<FormItem label="竞赛分级" prop="race_level">
<Select v-model="formValidate.race_level" placeholder="请选择赛事级别"> <FormItem label="赛事类型" prop="competition_type_name1">
<Option v-for="(item,index) in levelArray" :key="index" :value="item.value">{{ item.label }}</Option> <Input v-model="formValidate.competition_type_name" :disabled="true" placeholder="请输入赛事类型"></Input>
</Select> <!-- <Select v-model="formValidate.level" :disabled="true" placeholder="请选择赛事类型">-->
<!-- <Option v-for="(item,index) in levelArray" :key="index" :value="item.value">{{ item.label }}</Option>-->
<!-- </Select>-->
</FormItem> </FormItem>
<FormItem label="竞赛形式(团/个)" prop="way"> <FormItem label="竞赛形式(团/个)" prop="way1">
<Select v-model="formValidate.way" placeholder="请选择竞赛形式(团/个)"> <RadioGroup v-model="formValidate.way">
<Option v-for="(item,index) in wayArray" :disabled="item.value===1" :key="index" :value="item.value"> <Radio v-for="(item,index) in wayArray" :key="index" :label="item.value">
{{ item.label }} {{ item.label }}
</Option> </Radio>
</Select> </RadioGroup>
</FormItem> <!-- <Select v-model="formValidate.way" placeholder="请选择竞赛形式(团/个)">-->
<FormItem label="参赛队数量(队/人)" prop="arity"> <!-- <Option v-for="(item,index) in wayArray" :disabled="item.value===1" :key="index" :value="item.value">-->
<Input v-model="formValidate.arity" placeholder="请输入参赛队数量(队/人)"></Input> <!-- {{ item.label }}-->
</FormItem> <!-- </Option>-->
<FormItem label="计划培训量" prop="class_hour"> <!-- </Select>-->
<Input v-model="formValidate.class_hour" placeholder="请输入计划培训量"></Input>
</FormItem>
<FormItem label="竞赛对应课程" prop="curriculum">
<Input v-model="formValidate.curriculum" placeholder="请输入竞赛对应课程"></Input>
</FormItem> </FormItem>
<FormItem label="比赛时间" prop="competitionTimeRange1">
<FormItem label="培训时间范围" prop="competitionTimeRange"> <DatePicker v-model="formValidate.competitionTimeRange" @clearable="clearableTime"
<DatePicker v-model="formValidate.competitionTimeRange" @clearable="clearableTime" @on-change="trainingTime" @on-change="trainingTime"
type="daterange" type="daterange"
:clearable="false" :clearable="false"
placeholder="请选择培训时间范围" placeholder="请选择比赛时间"
style="width: 100%"/> style="width: 100%"/>
</FormItem> </FormItem>
<div style="width: 100%;display: flex;">
<FormItem style="width: 50%;" label="经费预算" prop="money">
<Input v-model="formValidate.money" placeholder="请输入经费预算"></Input>
</FormItem>
<FormItem label="计划培训量(课时):" prop="class_hour1" style="width: 50%">
<div style="display: flex">
<Input :disabled="formValidate.competition_type_name !== 'A类'" v-model="formValidate.class_hour"
placeholder="请输入计划培训量"></Input>
</div>
</FormItem>
</div>
<!-- <FormItem label="近三年参赛平均数量" prop="average">--> <!-- <FormItem label="比赛时间(天数)" prop="competition_time">-->
<!-- <Input v-model="formValidate.average" placeholder="请输入近三年参赛平均数量"></Input>--> <!-- <Input style="width: 100%" v-model="formValidate.competition_time"-->
<!-- placeholder="请输入比赛时间(天数)"></Input>-->
<!-- </FormItem>--> <!-- </FormItem>-->
<!-- <FormItem label="获奖比例" prop="ratio_info">--> <!-- <FormItem label="竞赛地点" prop="place">-->
<!-- <Input v-model="formValidate.ratio_info" placeholder="请输入获奖比例"></Input>--> <!-- <Input v-model="formValidate.place" placeholder="请输入竞赛地点"></Input>-->
<!-- </FormItem>-->
<!-- <FormItem label="报名者" prop="sign_up">-->
<!-- <Select v-model="formValidate.sign_up" placeholder="请选择报名者">-->
<!-- <Option v-for="(item,index) in signPeople" :key="index" :value="item.id">-->
<!-- {{ item.name }}-->
<!-- </Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem label="竞赛文件名(文号)" prop="file_name">-->
<!-- <Input v-model="formValidate.file_name" :disabled="true" placeholder="请输入竞赛文件名(文号)"></Input>-->
<!-- </FormItem>-->
<!-- <FormItem label="竞赛分级" prop="race_level">-->
<!-- <Select v-model="formValidate.race_level" placeholder="请选择赛事级别">-->
<!-- <Option v-for="(item,index) in levelArray" :key="index" :value="item.value">{{ item.label }}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem label="参赛队数量(队/人)" prop="arity">-->
<!-- <Input v-model="formValidate.arity" placeholder="请输入参赛队数量(队/人)"></Input>-->
<!-- </FormItem>-->
<!-- <FormItem label="计划培训量" prop="class_hour">-->
<!-- <Input v-model="formValidate.class_hour" placeholder="请输入计划培训量"></Input>-->
<!-- </FormItem>-->
<!-- <FormItem label="竞赛对应课程" prop="curriculum">-->
<!-- <Input v-model="formValidate.curriculum" placeholder="请输入竞赛对应课程"></Input>-->
<!-- </FormItem>-->
<!-- <FormItem label="竞赛的其他要求" prop="request">-->
<!-- <Input v-model="formValidate.request" type="textarea" :autosize="{minRows: 7,maxRows: 10}"-->
<!-- placeholder="请输入竞赛的其他要求"></Input>-->
<!-- </FormItem>--> <!-- </FormItem>-->
<FormItem label="竞赛的其他要求" prop="request">
<Input v-model="formValidate.request" type="textarea" :autosize="{minRows: 7,maxRows: 10}"
placeholder="请输入竞赛的其他要求"></Input>
</FormItem>
<FormItem :key="fileKey"> <FormItem :key="fileKey">
<div style="display: flex;justify-content: flex-start;box-sizing: border-box"> <div style="display: flex;justify-content: flex-start;box-sizing: border-box">
...@@ -112,28 +142,439 @@ ...@@ -112,28 +142,439 @@
<p>竞赛方案</p> <p>竞赛方案</p>
</div> </div>
</Upload> </Upload>
</div> </div>
<div class="filelist" v-for="(item,index) in formValidate.files_list" :key="index"> <div class="filelist" v-for="(item,index) in formValidate.files_list" :key="index">
{{ item.file_name }} {{ item.file_name }}
<Icon v-if="item.file_name" class="fileddelete" @click="fileDelete(item)" type="ios-trash"/> <Icon v-if="item.file_name" class="fileddelete" @click="fileDelete(item)" type="ios-trash"/>
</div> </div>
</FormItem> </FormItem>
<FormItem>
<Button type="primary" style="margin-right: 10px" </Form>
<Affix style="display: flex;align-items: center; width: 100%;height: 5vh;background-color: #FF9900;">
<span style="font-family: '宋体';margin-left: 1vw;color: white">
请优先完善参赛报名基础信息保存后,再添加参赛报名团队及成员。
</span>
</Affix>
<div style=" width: 100%;height: 5vh;display: flex;align-items: center;">
<h3>参赛人员</h3>
<Button type="primary" style="width: 15%; margin-left: 3vw"
@click="addTeam = true">添加团队
</Button>
</div>
<Card style="margin-top: 1vw;" v-for="(item,index) in teamObjectData" :key="index">
<template #title>
<h3>{{
item.teanname
}}(指导教师{{ item.teacher_list.length }}位;参赛学生{{ item.student_list.length }}位;)</h3>
</template>
<template #extra>
<!-- <a @click="addTeamPeople(item)">增加队员</a>-->
<a @click="aTeamValue = item;addTeamMembers3.Drawer = true;">增加队员</a>
<a @click="deleteTeam(item)" style="color: red;margin-left: 1vw">删除本团队</a>
</template>
<Table :columns="columnsTeacher" :data="item.teacher_list">
<template #action="{row}">
<a style="color: red" @click="TeamMembersDel(row)">删除</a>
</template>
</Table>
<Table :columns="columnsStudent" :data="item.student_list">
<template #action="{row}">
<a style="color: red" @click="TeamMembersDel(row)">删除</a>
</template>
</Table>
</Card>
</Card>
</div>
<div style="width: 100%;height: 10vh;"></div>
<div
style=" border-top: #2D8CF0 5px solid; background-color: #FFFFFF; display: flex;justify-content: center;align-items: center; width: 100%;height: 8vh;position: absolute;bottom: 1px;">
<Button type="primary" style="width: 12%; margin-right: 2vw"
@click="$router.back()">返回
</Button>
<Button :loading="saveFlowLoading" type="primary" style="width: 12%; margin-right: 2vw"
@click="handleSubmit">提交流程 @click="handleSubmit">提交流程
</Button> </Button>
<Button type="primary" <Button type="primary" style="width: 12%; margin-right: 2vw"
@click="save">保存 @click="save">保存
</Button> </Button>
<!-- <Button type="primary" @click="saveFile">保存附件</Button>--> <Button @click="handleReset" style="width: 12%;">重置</Button>
<Button @click="handleReset" style="margin-left: 8px">重置</Button> </div>
<!--手动添加赛项列表-->
<Modal
v-model="selectionOfEvents"
title="选择编号"
width="60"
:styles="{top:'10px'}"
:closable="false"
>
<template #header>
<div style="display: flex;justify-content: space-between;align-items: center;">
<h3>选择编号</h3>
<Input style="width: 20vw" v-model="contestItem.condition"
placeholder="请输入编号或赛项名称、赛事名称搜索..."></Input>
</div>
</template>
<Table :columns="columnsCompetitionItem" :data="dataCompetitionItem" :loading="contestItem.loading">
<template #radio="{row}">
<input style="width: 30px;height: 30px;cursor: pointer;accent-color: #1e93ff" type="radio"
:value="row.name"
@click="tableRadio(row)"
name="name"></input>
</template>
</Table>
<div class="ivu-text-center ivu-mt">
<Page
:total="contestItem.total"
:current.sync="contestItem.pageIndex"
show-total
show-sizer
:page-size="contestItem.pageSize"
@on-change="contestItemhandleChangePage"
@on-page-size-change="contestItemhandleChangePageSize"
/>
</div>
<template #footer>
<Button type="primary" @click="saveTheEventSingleOption" style="width: 15%;">确定</Button>
<Button type="text" @click="selectionOfEvents = false" style="width: 15%;">关闭</Button>
</template>
</Modal>
<!-- 创建 团队添加队员抽屉-->
<Drawer title="添加团队队员" width="100%" :transfer="false" :z-index="99999"
v-model="addTeamMembers.Drawer">
<Split v-model="split">
<template #left>
<div style="width: 100%;height: 94%;box-sizing: border-box;padding: 1vw">
<Card
style="margin-top: 1vw;max-height:47%;box-sizing: border-box;overflow-y: auto; ">
<h3>指导教师:</h3>
<div
style="width: 100%;height: 30%;display: flex;align-items: center;
justify-content: space-between;flex-wrap: wrap;padding: 0 0 2vw 0;
margin-bottom: 1vw;">
<div
v-for="(item,index) in formValidate1.teacherid_list" :key="index"
style="width: 33%;display: flex;justify-content: center;margin-bottom: 1vw;">
<Button>{{ item.name }}</Button>
<div class="competitionClassIcon" @click="delClass(item)">
<Icon type="ios-close-circle"/>
</div>
</div>
</div>
</Card>
<Card
style="margin-top: 1vw;max-height:47%;box-sizing: border-box;overflow-y: auto; ">
<h3>参赛学生:</h3>
<div
style="width: 100%;height: 30%;display: flex;align-items: center;
justify-content: space-between;flex-wrap: wrap;padding: 0 0 2vw 0;
margin-bottom: 1vw;">
<div
v-for="(item,index) in formValidate1.studentid_list" :key="index"
style="width: 33%;display: flex;justify-content: center;margin-bottom: 1vw;">
<Button>{{ item.name }}</Button>
<div class="competitionClassIcon" @click="delClass(item)">
<Icon type="ios-close-circle"/>
</div>
</div>
</div>
</Card>
<Button @click="addInitTeamPeople" style="margin-top:1vw;" type="primary" long>确认添加
</Button>
</div>
</template>
<template #right>
<div style="padding: 1vw;" :key="kkk">
<Tabs>
<TabPane label="添加学生">
<div style="display: flex;"></div>
<div
style="justify-content: flex-end; height: 40px; margin-left: auto ;display: flex;flex-wrap: nowrap">
<Input style="width: 15vw;" v-model="modalSelect.searchValue"
placeholder="请输入姓名或卡号搜索..."></Input>
<Button type="primary" @click="searchButton" :disabled="modalSelect.searchValue===''"
style="margin-left: 10px;">
搜索
</Button>
<Button type="text" @click="searchReset" style="margin-left: 10px;">重置</Button>
</div>
<Table :loading="loading1" :columns="modalSelect.column" :data="modalSelect.sList"
@on-select-all="modalTableSelectAll"
@on-select-all-cancel="modalTableSelectAllCancel" @on-select="modalTableSelect"
@on-select-cancel="modalTableSelectCancel">
</Table>
<div style="height: 40px;margin-top: 20px;display: flex">
<Page
show-total
show-sizer
show-elevator
:page-size-opts="pageSizeOpts"
:total="modalSelect.total"
:page-size="modalSelect.page_size"
model-value="modalSelect.page_index"
@on-change="currentPage1"
@on-page-size-change="currentPageCount1"
:transfer="true"
/>
<div style="margin-left: auto">
<!-- <Button type="primary" @click="addTeamMembers.Drawer =false" style="width: 10vw; margin-right: 20px;">-->
<!-- 确定-->
<!-- </Button>-->
<Button @click="addTeamMembers.Drawer =false" style="width: 10vw;">关闭</Button>
<!-- <Button type="primary" @click="handleSubmit('s')">提交</Button>-->
</div>
</div>
</TabPane>
<TabPane label="添加教师">
<div style="display: flex;">
<!-- <CheckboxGroup style="margin-bottom: 5px" v-model="modalSelect1.checkboxValue">-->
<!-- <Checkbox :disabled="item.name ==='学生'" v-for="(item,index) in promiseAllArray[0]" :label="item.id"-->
<!-- :key="index"-->
<!-- border><span>{{ item.name }}</span></Checkbox>-->
<!-- </CheckboxGroup>-->
<div
style=" justify-content: flex-end;height: 40px; margin-left: auto ;display: flex;flex-wrap: nowrap">
<Input style="width: 15vw;" v-model="modalSelect1.searchValue"
placeholder="请输入姓名或卡号搜索..."></Input>
<Button type="primary" @click="searchButton" :disabled="modalSelect1.searchValue===''"
style="margin-left: 10px;">
搜索
</Button>
<Button type="text" @click="searchReset1" style="margin-left: 10px;">重置</Button>
</div>
</div>
<Table :key="keys1" :loading="loading2" :columns="modalSelect1.column" :data="modalSelect1.sList"
@on-select-all="modalTableSelectAll1"
@on-select-all-cancel="modalTableSelectAllCancel1" @on-select="modalTableSelect1"
@on-select-cancel="modalTableSelectCancel1">
</Table>
<div style="height: 40px;margin-top: 20px;display: flex">
<Page
:transfer="true"
show-total
:key="modalSelect1.pageKey"
:page-size-opts="pageSizeOpts"
show-sizer
show-elevator
:total="modalSelect1.total"
:page-size="modalSelect1.page_size"
model-value="modalSelect1.page_index"
@on-change="currentPage2"
@on-page-size-change="currentPageCount2"
/>
<div style="margin-left: auto">
<!-- <Button type="primary" @click="addTeamMembers.Drawer =false" style="width: 10vw; margin-right: 20px;">-->
<!-- 确定-->
<!-- </Button>-->
<Button @click="addTeamMembers.Drawer =false" style="width: 10vw;">关闭</Button>
<!-- <Button type="primary" @click="handleSubmit('s')">提交</Button>-->
</div>
</div>
</TabPane>
</Tabs>
</div>
</template>
</Split>
</Drawer>
<!--添加团队-->
<Modal
v-model="addTeam"
title="添加团队"
:transfer="true"
:z-index="1"
width="50%"
:styles="{top:'10px'}"
>
<Form ref="formValidate1" :model="formValidate1" :rules="ruleValidate1" :label-width="100">
<FormItem label="是否备选:" prop="is_choose">
<Select v-model="formValidate1.is_choose"
placeholder="是否备选">
<Option v-for="(item,index) in formValidate1.alternative" :key="index"
:value="item.value">
{{ item.label }}
</Option>
</Select>
</FormItem>
<FormItem label="团队名称:" prop="teamname">
<Input v-model="formValidate1.teamname" type="text" :autosize="{minRows: 7,maxRows: 10}"
placeholder="请输入团队名称"></Input>
</FormItem> </FormItem>
</Form> </Form>
<Button type="dashed" icon="md-add" @click="addAPlayer" style="width: 100%;border-color: #7bbcf8;">添加队员
</Button>
<Card v-if="!!formValidate1.teacherid_list.length && teamPeople" style="margin-top: 1vw;">
<h3>指导教师:</h3>
<div
style="width: 100%;height: 30%;display: flex;align-items: center;
justify-content: space-between;flex-wrap: wrap;padding: 0 0 2vw 0;
margin-bottom: 1vw;">
<div
v-for="(item,index) in formValidate1.teacherid_list" :key="index"
style="width: 33%;display: flex;justify-content: center;margin-bottom: 1vw;">
<Button>{{ item.name }}</Button>
<div class="competitionClassIcon" @click="delClass(item)">
<Icon type="ios-close-circle"/>
</div>
</div>
</div>
</Card>
<Card v-if="!!formValidate1.studentid_list.length && teamPeople" style="margin-top: 1vw;">
<h3>参赛学生:</h3>
<div
style="width: 100%;height: 30%;display: flex;align-items: center;
justify-content: space-between;flex-wrap: wrap;padding: 0 0 2vw 0;
margin-bottom: 1vw;">
<div
v-for="(item,index) in formValidate1.studentid_list" :key="index"
style="width: 33%;display: flex;justify-content: center;margin-bottom: 1vw;">
<Button>{{ item.name }}</Button>
<div class="competitionClassIcon" @click="delClass(item)">
<Icon type="ios-close-circle"/>
</div>
</div>
</div>
</Card> </Card>
<template #footer>
<Button type="primary" @click="createATeam" style="width: 15%;">创建参赛团队</Button>
<!-- <Button @click="handleReset" style="width: 15%;">重置</Button>-->
</template>
</Modal>
<!-- 追加 增加团队队员 抽屉-->
<Drawer title="增加团队队员 " width="100%"
v-model="addTeamMembers3.Drawer">
<div style="width: 100%;height: 100%;">
<Split v-model="split">
<template #left>
<div style="width: 100%;height: 100%;overflow-y: auto">
<div style="width: 100%;height: 47%;overflow-y: auto;">
<h3>参赛学生:</h3>
<div
style="width: 100%;height: 30%;display: flex;align-items: center;
justify-content: space-between;flex-wrap: wrap;padding: 0 0 2vw 0;
margin-bottom: 1vw;">
<div
v-for="(item,index) in formValidate3.studentid_list" :key="index"
style="width: 33%;display: flex;justify-content: center;margin-bottom: 1vw;">
<Button>{{ item.name }}</Button>
<div class="competitionClassIcon" @click="delClass2(item)">
<Icon type="ios-close-circle"/>
</div>
</div>
</div>
</div>
<div style="width: 100%;height: 47%;overflow-y: auto;">
<h3>指导教师:</h3>
<div
style="width: 100%;height: 30%;display: flex;align-items: center;
justify-content: space-between;flex-wrap: wrap;padding: 0 0 2vw 0;
margin-bottom: 1vw;">
<div
v-for="(item,index) in formValidate3.teacherid_list" :key="index"
style="width: 33%;display: flex;justify-content: center;margin-bottom: 1vw;">
<Button>{{ item.name }}</Button>
<div class="competitionClassIcon" @click="delClass2(item)">
<Icon type="ios-close-circle"/>
</div>
</div>
</div>
</div>
<Button @click="MembersIns" type="primary" style="width: 100%">确认添加</Button>
</div>
</template>
<template #right>
<div style="padding: 1vw" :key="kkk">
<Tabs>
<TabPane label="添加学生">
<div style="display: flex;"></div>
<div
style="justify-content: flex-end; height: 40px; margin-left: auto ;display: flex;flex-wrap: nowrap">
<Input style="width: 15vw;" v-model="modalSelect3.searchValue"
placeholder="请输入姓名或卡号搜索..."></Input>
<Button type="primary" @click="searchButton" :disabled="modalSelect3.searchValue===''"
style="margin-left: 10px;">
搜索
</Button>
<Button type="text" @click="searchReset3" style="margin-left: 10px;">重置</Button>
</div>
<Table :loading="loading1" :columns="modalSelect3.column" :data="modalSelect3.sList"
@on-select-all="modalTableSelectAll3"
@on-select-all-cancel="modalTableSelectAllCancel3" @on-select="modalTableSelect3"
@on-select-cancel="modalTableSelectCancel3">
</Table>
<div style="height: 40px;margin-top: 20px">
<Page
show-total
show-sizer
show-elevator
:page-size-opts="pageSizeOpts"
:total="modalSelect3.total"
:page-size="modalSelect3.page_size"
model-value="modalSelect3.page_index"
@on-change="currentPage3"
@on-page-size-change="currentPageCount3"
:transfer="true"
/>
</div>
<div style="float: right">
<Button @click="addTeamMembers3.Drawer =false" style="margin-right: 20px;">取消</Button>
<!-- <Button type="primary" @click="handleSubmit('s')">提交</Button>-->
</div>
</TabPane>
<TabPane label="添加教师">
<div style="display: flex;">
<div
style=" justify-content: flex-end;height: 40px; margin-left: auto ;display: flex;flex-wrap: nowrap">
<Input style="width: 15vw;" v-model="modalSelect4.searchValue"
placeholder="请输入姓名或卡号搜索..."></Input>
<Button type="primary" @click="searchButton" :disabled="modalSelect4.searchValue===''"
style="margin-left: 10px;">
搜索
</Button>
<Button type="text" @click="searchReset4" style="margin-left: 10px;">重置</Button>
</div>
</div>
<Table :key="keys1" :loading="loading2" :columns="modalSelect4.column" :data="modalSelect4.sList"
@on-select-all="modalTableSelectAll4"
@on-select-all-cancel="modalTableSelectAllCancel4" @on-select="modalTableSelect4"
@on-select-cancel="modalTableSelectCancel4">
</Table>
<div style="height: 40px;margin-top: 20px">
<Page
:transfer="true"
show-total
:key="modalSelect4.pageKey"
:page-size-opts="pageSizeOpts"
show-sizer
show-elevator
:total="modalSelect4.total"
:page-size="modalSelect4.page_size"
model-value="modalSelect4.page_index"
@on-change="currentPage4"
@on-page-size-change="currentPageCount4"
/>
</div> </div>
<div style="float: right">
<Button @click="addTeamMembers3.Drawer = false" style="margin-right: 20px;">取消</Button>
<!-- <Button type="primary" @click="handleSubmit('t')">提交</Button>-->
</div>
</TabPane>
</Tabs>
</div>
</template>
</Split>
</div>
</Drawer>
</div>
</template> </template>
...@@ -142,6 +583,8 @@ import * as hook from '../../../hook' ...@@ -142,6 +583,8 @@ import * as hook from '../../../hook'
import * as api from '../../../api/requestUtils' import * as api from '../../../api/requestUtils'
import _ from "lodash"; import _ from "lodash";
import dayjs from "dayjs"; import dayjs from "dayjs";
import {ReportChangeById, TeamMembersDel} from "../../../api/requestUtils";
import {getInitListRequest} from "../../../hook";
export default { export default {
//import引入的组件需要注入到对象中才能使用", //import引入的组件需要注入到对象中才能使用",
...@@ -149,6 +592,336 @@ export default { ...@@ -149,6 +592,336 @@ export default {
data() { data() {
//这里存放数据", //这里存放数据",
return { return {
teamPeople: false,
kkk: 1,
saveFlowLoading: false,
timer: '',
selectTheNumberMedian: {},
aTeamValue: {},
split: 0.5,
addTeamMembers3: {
Drawer: false,
},
loading3: false,
rrr: 1,
keys1: 1,
loading2: false,
signid: '',
loading1: false,
modal: false,
pageSizeOpts: [10, 20, 30, 40, 100, 200],
modalSelect1: {
deptValue: [],
deptSelectArray: [],
tArray: [],
checkboxValue: [],
rList: [{value: 0, label: '非指导教师'}, {value: 1, label: '指导教师'}],
sArray: [],
searchValue: '',
condition: '',
column: [
{
type: 'selection',
minWidth: 150,
},
{
title: '指导教师',
minWidth: 150,
key: 'name'
},
{
title: '工号',
minWidth: 150,
key: 'number'
},
{
title: '身份证号',
minWidth: 150,
key: 'sfzh'
},
{
title: '教学院系',
minWidth: 150,
key: 'dept_name'
},
{
title: '性别',
minWidth: 150,
key: 'gender'
},
{
title: '联系电话',
minWidth: 150,
key: 'phone'
},
],
sList: [],
pageKey: 1,
total: 0,
page_size: 10,
page_index: 1,
},
modalSelect: {
checkboxValue: '',
rList: [{value: 0, label: '否'}, {value: 1, label: '是'}],
sArray: [],
searchValue: '',
condition: '',
column: [
{
type: 'selection',
minWidth: 150,
},
{
title: '参赛学生',
minWidth: 150,
key: 'name'
},
{
title: '学号',
minWidth: 150,
key: 'number'
},
{
title: '身份证号',
minWidth: 150,
key: 'sfzh'
},
{
title: '班级',
minWidth: 150,
key: 'classname'
},
{
title: '性别',
minWidth: 150,
key: 'gender'
},
{
title: '联系电话',
minWidth: 150,
key: 'phone'
},
],
sList: [],
pageKey: 1,
total: 0,
page_size: 10,
page_index: 1,
},
modalSelect4: {
deptValue: [],
deptSelectArray: [],
tArray: [],
checkboxValue: [],
rList: [{value: 0, label: '非指导教师'}, {value: 1, label: '指导教师'}],
sArray: [],
searchValue: '',
condition: '',
column: [
{
type: 'selection',
minWidth: 150,
},
{
title: '指导教师',
minWidth: 150,
key: 'name'
},
{
title: '工号',
minWidth: 150,
key: 'number'
},
{
title: '身份证号',
minWidth: 200,
key: 'sfzh'
},
{
title: '教学院系',
minWidth: 150,
key: 'dept_name'
},
{
title: '性别',
minWidth: 150,
key: 'gender'
},
{
title: '联系电话',
minWidth: 150,
key: 'phone'
},
],
sList: [],
pageKey: 1,
total: 0,
page_size: 10,
page_index: 1,
},
modalSelect3: {
checkboxValue: '',
rList: [{value: 0, label: '否'}, {value: 1, label: '是'}],
sArray: [],
searchValue: '',
condition: '',
column: [
{
type: 'selection',
minWidth: 150,
},
{
title: '参赛学生',
minWidth: 150,
key: 'name'
},
{
title: '学号',
minWidth: 150,
key: 'number'
},
{
title: '身份证号',
minWidth: 200,
key: 'sfzh'
},
{
title: '班级',
minWidth: 150,
key: 'classname'
},
{
title: '性别',
minWidth: 150,
key: 'gender'
},
{
title: '联系电话',
minWidth: 150,
key: 'phone'
},
],
sList: [],
pageKey: 1,
total: 0,
page_size: 10,
page_index: 1,
},
addTeamMembers: {
Drawer: false,
},
contestItem: {
loading: false,
condition: '',
total: 0,
pageIndex: 1,
pageSize: 10,
},
selectionOfEvents: false,
columnsCompetitionItem: [
{
slot: 'radio',
},
{
title: '赛事编号',
key: 'report_code'
},
{
title: '赛事名称',
key: 'competitionname'
},
{
title: '赛项名称',
key: 'competitionsubitem_name'
},
],
dataCompetitionItem: [],
addTeam: false,
columnsStudent: [
{
title: '参赛学生',
minWidth: 100,
key: 'name'
},
{
title: '学号',
minWidth: 120,
key: 'card_name'
},
{
title: '身份证号',
minWidth: 180,
key: 'sfzh'
},
{
title: '班级',
minWidth: 150,
key: 'classname'
},
{
title: '性别',
minWidth: 80,
key: 'gender'
},
{
title: '联系电话',
minWidth: 150,
key: 'phone'
},
{
title: '操作',
minWidth: 80,
slot: 'action',
fixed: 'right'
},
],
columnsTeacher: [
{
title: '指导教师',
minWidth: 100,
key: 'name'
},
{
title: '工号',
minWidth: 120,
key: 'card_name'
},
{
title: '身份证号',
minWidth: 180,
key: 'sfzh'
},
{
title: '教学院系',
minWidth: 150,
key: 'dept'
},
{
title: '性别',
minWidth: 80,
key: 'gender'
},
{
title: '联系电话',
minWidth: 150,
key: 'phone'
},
{
title: '操作',
minWidth: 80,
slot: 'action',
fixed: 'right'
},
],
data1: [],
data2: [],
teamObjectData: {},
'signPeople': [], 'signPeople': [],
competitionNameArray: [], competitionNameArray: [],
approval_stateArray: [ approval_stateArray: [
...@@ -172,6 +945,61 @@ export default { ...@@ -172,6 +945,61 @@ export default {
module_id: '', module_id: '',
module: '', module: '',
fileKey: 1, fileKey: 1,
formValidate4: {
"competitionsign_id": "",
"teamname": "",
"is_choose": 0,
'alternative': [
{
value: 0,
label: '否',
},
{
value: 1,
label: '是',
},
],
"studentid_list": [],
"teacherid_list": []
},
formValidate3: {
"competitionsign_id": "",
"teamname": "",
"is_choose": 0,
'alternative': [
{
value: 0,
label: '否',
},
{
value: 1,
label: '是',
},
],
"studentid_list": [],
"teacherid_list": [],
},
formValidate1: {
"competitionsign_id": "",
"teamname": "",
"is_choose": 0,
'alternative': [
{
value: 0,
label: '否',
},
{
value: 1,
label: '是',
},
],
"studentid_list": [],
"teacherid_list": []
},
ruleValidate1: {
is_choose: [{type: 'number', required: true, message: '该项不能为空', trigger: 'change'}],
teamname: [{type: 'string', required: true, message: '该项不能为空', trigger: 'blur'}],
},
formValidate: { formValidate: {
"flowid": "", "flowid": "",
"competitionname": "", "competitionname": "",
...@@ -187,16 +1015,28 @@ export default { ...@@ -187,16 +1015,28 @@ export default {
"class_hour": "", "class_hour": "",
"arity": "", "arity": "",
"curriculum": "", "curriculum": "",
"start_time": "", "begin_time": "",
"end_time": "", "end_time": "",
"request": "", "request": "",
// "approach_file": "", // "approach_file": "",
// "train_file": "", // "train_file": "",
'competitionTimeRange': '', 'competitionTimeRange': [],
"files_list": [] "files_list": []
}, },
ruleValidate: { ruleValidate: {
report_code: [
{type: 'string', required: true, message: '该项不能为空', trigger: 'blur'}
],
competitionsubitem_name: [
{type: 'string', required: true, message: '该项不能为空', trigger: 'blur'}
],
competition_level_name: [
{type: 'string', required: true, message: '该项不能为空', trigger: 'blur'}
],
competition_type_name: [
{type: 'string', required: true, message: '该项不能为空', trigger: 'blur'}
],
place: [ place: [
{type: 'string', required: true, message: '该项不能为空', trigger: 'blur'} {type: 'string', required: true, message: '该项不能为空', trigger: 'blur'}
], ],
...@@ -246,16 +1086,600 @@ export default { ...@@ -246,16 +1086,600 @@ export default {
{type: 'string', required: true, message: '该项不能为空', trigger: 'blur'} {type: 'string', required: true, message: '该项不能为空', trigger: 'blur'}
], ],
} },
} }
}, },
//监听属性 类似于data概念", //监听属性 类似于data概念",
computed: {}, computed: {},
//监控data中的数据变化", //监控data中的数据变化",
watch: {}, watch: {
'contestItem.condition'(newValue, oldvalue) {
this.addAddressManually()
},
'formValidate.competitionTimeRange'(newValue, oldvalue) {
console.log("🚀🚀12312🚀,", newValue)
},
},
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
async mounted() {
this.getCompetiotionName()
this.formValidate.flowid = this.$route.query.id;
// this.formValidate.files_list.module = this.$route.query.remark;
this.flowid = this.$route.query.id;
this.module = this.$route.query.remark;
await this.FlowInit()
this.GetStudentListToMembers()
this.GetTeacherListToMembers()
this.GetStudentListToMembers3()
this.GetTeacherListToMembers4()
this.TeamAndMemberSel()
},
//方法集合", //方法集合",
methods: { methods: {
addInitTeamPeople() {
if (!!this.formValidate1.studentid_list.length || !!this.formValidate1.teacherid_list.length) {
this.teamPeople = true
this.addTeamMembers.Drawer = false
} else {
this.$Message.error('请选择团队人员')
}
},
deleteTeam(e) {
hook.publicConfirm(() => {
hook.myEncapsulationFunction(async () => {
const res = await api.TeamDel({teamid: e.teamid})
this.TeamAndMemberSel()
return res
})
})
},
MembersIns(e) {
let studentid_list = []
let teacherid_list = []
this.formValidate3.studentid_list.map((cur, index) => {
studentid_list.push(cur.sid)
})
this.formValidate3.teacherid_list.map((cur, index) => {
teacherid_list.push(cur.tid)
})
let data = {
studentid_list: studentid_list,
teacherid_list: teacherid_list,
teamid: this.aTeamValue.teamid
}
hook.myEncapsulationFunction(async () => {
const res = await api.MembersIns(data)
if (res.code === 1) (() => {
this.formValidate3.studentid_list = []
this.formValidate3.teacherid_list = []
this.kkk++
})()
this.TeamAndMemberSel()
return res
})
},
delClass2(e) {
console.log("🚀🚀🚀,", e)
if (Object.keys(e).includes('sid')) {
this.formValidate3.studentid_list.map((cur, index) => {
if (cur.sid === e.sid) this.formValidate3.studentid_list.splice(index, 1)
})
this.modalSelect3.sArray.map((cur1, index1) => {
if (cur1.sid === e.sid) this.modalSelect3.sArray.splice(index1, 1)
})
} else {
this.formValidate3.teacherid_list.map((cur, index) => {
if (cur.tid === e.tid) this.formValidate3.teacherid_list.splice(index, 1)
})
this.modalSelect4.tArray.map((cur, index) => {
if (cur.tid === e.tid) this.modalSelect4.tArray.splice(index, 1)
})
}
},
modalTableSelectCancel3(selection, row) {
this.modalSelect3.sArray = []
selection.map((cur, index) => {
this.modalSelect3.sArray.push(cur.tid)
})
let keys = []
this.formValidate3.studentid_list.map((cur, index) => {
keys.push(cur.sid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.sid)) this.formValidate3.studentid_list.push(cur)
})
},
modalTableSelectAll3(selection, row) {
this.modalSelect3.sArray = []
selection.map((cur, index) => {
this.modalSelect3.sArray.push(cur.tid)
})
let keys = []
this.formValidate3.studentid_list.map((cur, index) => {
keys.push(cur.sid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.sid)) this.formValidate3.studentid_list.push(cur)
})
},
modalTableSelectAllCancel3(selection, row) {
this.modalSelect3.sArray = []
selection.map((cur, index) => {
this.modalSelect3.sArray.push(cur.tid)
})
let keys = []
this.formValidate3.studentid_list.map((cur, index) => {
keys.push(cur.sid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.sid)) this.formValidate3.studentid_list.push(cur)
})
},
modalTableSelect3(selection, row) {
this.modalSelect3.sArray = []
selection.map((cur, index) => {
this.modalSelect3.sArray.push(cur.tid)
})
let keys = []
this.formValidate3.studentid_list.map((cur, index) => {
keys.push(cur.sid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.sid)) this.formValidate3.studentid_list.push(cur)
})
},
addTeamPeople(e) {
this.addTeamMembers3.Drawe = true
console.log("🚀🚀🚀,", e)
console.log("🚀🚀🚀,", this.addTeamMembers3.Drawe)
},
TeamMembersDel(e) {
console.log("🚀🚀🚀,", e)
hook.publicConfirm(() => {
hook.myEncapsulationFunction(async () => {
const res = await api.TeamMembersDel({teammembersid: e.teammembersid})
this.TeamAndMemberSel()
return res
})
})
},
async TeamAndMemberSel() {
this.loading3 = true
await new Promise((resolve) => {
hook.getInitListRequest(() => {
let data = {
signid: this.signid,
}
api.TeamAndMemberSel(data).then(res => {
this.teamObjectData = res.response
resolve()
})
})
})
this.loading3 = false
},
createATeam() {
this.$refs['formValidate1'].validate((value) => {
if (value) {
if (this.teamPeople) hook.myEncapsulationFunction(async () => {
let teacherid_list = []
let studentid_list = []
this.formValidate1.teacherid_list.map((cur) => {
teacherid_list.push(cur.tid)
})
this.formValidate1.studentid_list.map((cur) => {
studentid_list.push(cur.sid)
})
let data = {
...this.formValidate1,
competitionsign_id: this.formValidate.competitionsignid,
teacherid_list: teacherid_list,
studentid_list: studentid_list,
}
const res = await api.TeamAndMemberIns(data)
if (res.code === 1) (() => {
this.formValidate1.teacherid_list = []
this.formValidate1.studentid_list = []
this.teamPeople = false
this.kkk++
})()
this.TeamAndMemberSel()
return res
})
else {
this.$Message.error('请完善团队人员')
}
}
})
},
delClass(e) {
if (Object.keys(e).includes('sid')) {
this.formValidate1.studentid_list.map((cur, index) => {
if (cur.sid === e.sid) this.formValidate1.studentid_list.splice(index, 1)
})
this.modalSelect.sArray.map((cur1, index1) => {
if (cur1.sid === e.sid) this.modalSelect.sArray.splice(index1, 1)
})
} else {
this.formValidate1.teacherid_list.map((cur, index) => {
if (cur.tid === e.tid) this.formValidate1.teacherid_list.splice(index, 1)
})
this.modalSelect1.tArray.map((cur, index) => {
if (cur.tid === e.tid) this.modalSelect1.tArray.splice(index, 1)
})
}
this.keys1++
},
currentPage1(e) {
this.modalSelect.page_index = e
this.GetStudentListToMembers()
},
currentPage2(e) {
this.modalSelect1.page_index = e
this.GetTeacherListToMembers()
},
currentPage3(e) {
this.modalSelect3.page_index = e
this.GetStudentListToMembers3()
},
currentPage4(e) {
this.modalSelect4.page_index = e
this.GetTeacherListToMembers4()
},
currentPageCount1(e) {
this.modalSelect.page_size = e
this.GetStudentListToMembers()
},
currentPageCount2(e) {
this.modalSelect1.page_size = e
this.GetTeacherListToMembers()
},
currentPageCount3(e) {
this.modalSelect3.page_size = e
this.GetStudentListToMembers3()
},
currentPageCount4(e) {
this.modalSelect4.page_size = e
this.GetTeacherListToMembers4()
},
searchButton() {
this.modalSelect.condition = this.modalSelect.searchValue
this.modalSelect.page_index = 1
this.modalSelect1.condition = this.modalSelect1.searchValue
this.modalSelect1.page_index = 1
this.modalSelect3.condition = this.modalSelect3.searchValue
this.modalSelect3.page_index = 1
this.modalSelect4.condition = this.modalSelect4.searchValue
this.modalSelect4.page_index = 1
this.GetStudentListToMembers()
this.GetTeacherListToMembers()
this.GetStudentListToMembers3()
this.GetTeacherListToMembers4()
},
searchReset() {
this.modalSelect.condition = ''
this.modalSelect.searchValue = ''
this.modalSelect.page_index = 1
this.modalSelect.page_size = 10
this.modalSelect.sArray = []
this.modalSelect.pageKey++
this.GetStudentListToMembers()
},
searchReset1() {
this.modalSelect1.deptValue = []
this.modalSelect1.searchValue = ''
this.modalSelect1.checkboxValue = []
this.modalSelect1.condition = ''
this.modalSelect1.page_index = 1
this.modalSelect1.page_size = 10
this.modalSelect1.tArray = []
this.modalSelect1.pageKey++
this.GetTeacherListToMembers()
},
searchReset3() {
this.modalSelect3.deptValue = []
this.modalSelect3.searchValue = ''
this.modalSelect3.checkboxValue = []
this.modalSelect3.condition = ''
this.modalSelect3.page_index = 1
this.modalSelect3.page_size = 10
this.modalSelect3.tArray = []
this.modalSelect3.pageKey++
this.GetStudentListToMembers3()
},
searchReset4() {
this.modalSelect4.deptValue = []
this.modalSelect4.searchValue = ''
this.modalSelect4.checkboxValue = []
this.modalSelect4.condition = ''
this.modalSelect4.page_index = 1
this.modalSelect4.page_size = 10
this.modalSelect4.tArray = []
this.modalSelect4.pageKey++
this.GetTeacherListToMembers4()
},
modalTableSelectCancel(selection, row) {
console.log("🚀🚀🚀,", selection, row)
selection.map((cur, index) => {
this.modalSelect.sArray.push(cur.sid)
})
let keys = []
this.formValidate1.studentid_list.map((cur, index) => {
keys.push(cur.sid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.sid)) this.formValidate1.studentid_list.push(cur)
})
},
modalTableSelectAll(selection, row) {
this.modalSelect.sArray = []
selection.map((cur, index) => {
this.modalSelect.sArray.push(cur.sid)
})
let keys = []
this.formValidate1.studentid_list.map((cur, index) => {
keys.push(cur.sid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.sid)) this.formValidate1.studentid_list.push(cur)
})
},
modalTableSelectAllCancel(selection, row) {
selection.map((cur, index) => {
this.modalSelect.sArray.push(cur.sid)
})
let keys = []
this.formValidate1.studentid_list.map((cur, index) => {
keys.push(cur.sid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.sid)) this.formValidate1.studentid_list.push(cur)
})
},
modalTableSelect(selection, row) {
selection.map((cur, index) => {
this.modalSelect.sArray.push(cur.sid)
})
let keys = []
this.formValidate1.studentid_list.map((cur, index) => {
keys.push(cur.sid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.sid)) this.formValidate1.studentid_list.push(cur)
})
},
modalTableSelectCancel1(selection, row) {
this.modalSelect1.tArray = []
selection.map((cur, index) => {
this.modalSelect1.tArray.push(cur.tid)
})
let keys = []
this.formValidate1.teacherid_list.map((cur, index) => {
keys.push(cur.tid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.tid)) this.formValidate1.teacherid_list.push(cur)
})
},
modalTableSelectAll1(selection, row) {
this.modalSelect1.tArray = []
selection.map((cur, index) => {
this.modalSelect1.tArray.push(cur.tid)
})
let keys = []
this.formValidate1.teacherid_list.map((cur, index) => {
keys.push(cur.tid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.tid)) this.formValidate1.teacherid_list.push(cur)
})
},
modalTableSelectAllCancel1(selection, row) {
this.modalSelect1.tArray = []
selection.map((cur, index) => {
this.modalSelect1.tArray.push(cur.tid)
})
let keys = []
this.formValidate1.teacherid_list.map((cur, index) => {
keys.push(cur.tid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.tid)) this.formValidate1.teacherid_list.push(cur)
})
},
modalTableSelect1(selection, row) {
this.modalSelect1.tArray = []
selection.map((cur, index) => {
this.modalSelect1.tArray.push(cur.tid)
})
let keys = []
this.formValidate1.teacherid_list.map((cur, index) => {
keys.push(cur.tid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.tid)) this.formValidate1.teacherid_list.push(cur)
})
},
modalTableSelect4(selection, row) {
this.modalSelect4.tArray = []
selection.map((cur, index) => {
this.modalSelect4.tArray.push(cur.tid)
})
let keys = []
this.formValidate3.teacherid_list.map((cur, index) => {
keys.push(cur.tid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.tid)) this.formValidate3.teacherid_list.push(cur)
})
},
modalTableSelectCancel4(selection, row) {
this.modalSelect4.tArray = []
selection.map((cur, index) => {
this.modalSelect4.tArray.push(cur.tid)
})
let keys = []
this.formValidate3.teacherid_list.map((cur, index) => {
keys.push(cur.tid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.tid)) this.formValidate3.teacherid_list.push(cur)
})
},
modalTableSelectAll4(selection, row) {
this.modalSelect4.tArray = []
selection.map((cur, index) => {
this.modalSelect4.tArray.push(cur.tid)
})
let keys = []
this.formValidate3.teacherid_list.map((cur, index) => {
keys.push(cur.tid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.tid)) this.formValidate3.teacherid_list.push(cur)
})
},
modalTableSelectAllCancel4(selection, row) {
this.modalSelect4.tArray = []
selection.map((cur, index) => {
this.modalSelect4.tArray.push(cur.tid)
})
let keys = []
this.formValidate3.teacherid_list.map((cur, index) => {
keys.push(cur.tid)
})
selection.map((cur, index) => {
if (!keys.includes(cur.tid)) this.formValidate3.teacherid_list.push(cur)
})
},
async GetStudentListToMembers3() {
this.loading1 = true
await new Promise((resolve) => {
hook.getInitListRequest(() => {
let data = {
signid: this.signid,
condition: this.modalSelect3.condition,
page_index: this.modalSelect3.page_index,
page_size: this.modalSelect3.page_size,
}
api.GetStudentListToMembers(data).then(res => {
this.modalSelect3.total = res.response.data_count
this.modalSelect3.sList = res.response.data
resolve()
})
})
})
this.loading1 = false
},
async GetTeacherListToMembers4() {
this.loading2 = true
await new Promise((resolve) => {
hook.getInitListRequest(() => {
let data = {
signid: this.signid,
condition: this.modalSelect4.condition,
page_index: this.modalSelect4.page_index,
page_size: this.modalSelect4.page_size,
}
api.GetTeacherListToMembers(data).then(res => {
this.modalSelect4.total = res.response.data_count
this.modalSelect4.sList = res.response.data
resolve()
})
})
})
this.loading2 = false
},
async GetStudentListToMembers() {
this.loading1 = true
await new Promise((resolve) => {
hook.getInitListRequest(() => {
let data = {
signid: this.signid,
condition: this.modalSelect.condition,
page_index: this.modalSelect.page_index,
page_size: this.modalSelect.page_size,
}
api.GetStudentListToMembers(data).then(res => {
this.modalSelect.total = res.response.data_count
this.modalSelect.sList = res.response.data
resolve()
})
})
})
this.loading1 = false
},
async GetTeacherListToMembers() {
this.loading2 = true
await new Promise((resolve) => {
hook.getInitListRequest(() => {
let data = {
signid: this.signid,
condition: this.modalSelect1.condition,
page_index: this.modalSelect1.page_index,
page_size: this.modalSelect1.page_size,
}
api.GetTeacherListToMembers(data).then(res => {
this.modalSelect1.total = res.response.data_count
this.modalSelect1.sList = res.response.data
resolve()
})
})
})
this.loading2 = false
},
addAPlayer() {
this.addTeamMembers.Drawer = true
},
saveTheEventSingleOption() {
this.formValidate = {...this.formValidate, ...this.selectTheNumberMedian}
this.formValidate.competition_type_name !== 'A类' ? this.formValidate.class_hour = '' : null
this.selectionOfEvents = false
},
async addAddressManually() {
this.selectionOfEvents = true
this.contestItem.loading = true
await new Promise((resolve) => {
hook.getInitListRequest(() => {
let data = {
condition: this.contestItem.condition,
page_index: this.contestItem.pageIndex,
page_size: this.contestItem.pageSize,
}
api.GetCodeList(data).then(res => {
this.contestItem.total = res.response.data_count
this.dataCompetitionItem = res.response.data
resolve()
})
})
})
this.contestItem.loading = false
},
tableRadio(e) {
// competitionreportid
this.selectTheNumberMedian = e
},
contestItemhandleChangePage(e) {
this.contestItem.pageIndex = e
this.addAddressManually()
},
contestItemhandleChangePageSize(e) {
this.contestItem.pageSize = e
this.addAddressManually()
},
save() { save() {
const fun = async (changecommitid) => { const fun = async (changecommitid) => {
let formValidate = _.cloneDeep(this.formValidate) let formValidate = _.cloneDeep(this.formValidate)
...@@ -272,7 +1696,7 @@ export default { ...@@ -272,7 +1696,7 @@ export default {
await hook.myEncapsulationFunction(async () => { await hook.myEncapsulationFunction(async () => {
return await api.FlowChangeCommit(data) return await api.FlowChangeCommit(data)
}) })
this.FlowInit()
} }
switch (this.changecommitid) { switch (this.changecommitid) {
case undefined : case undefined :
...@@ -289,10 +1713,15 @@ export default { ...@@ -289,10 +1713,15 @@ export default {
case null: case null:
break; break;
default : default :
this.signid = res.response.competition_sign.competitionsignid
res.response.competition_sign.level = Number(res.response.competition_sign.level) res.response.competition_sign.level = Number(res.response.competition_sign.level)
res.response.competition_sign.race_level = Number(res.response.competition_sign.race_level) res.response.competition_sign.race_level = Number(res.response.competition_sign.race_level)
// this.formValidate.competitionTimeRange = new Date(res.response.competition_sign.start_time) + '-' + new Date(res.response.competition_sign.end_time)
this.formValidate = res.response.competition_sign this.formValidate = res.response.competition_sign
this.formValidate.competitionTimeRange = [
res.response.competition_sign.begin_time ? res.response.competition_sign.begin_time.split(' 00:00')[0] : '',
res.response.competition_sign.end_time ? res.response.competition_sign.end_time.split(' 00:00')[0] : '']
this.formValidate.files_list = res.response.files_list this.formValidate.files_list = res.response.files_list
//------------------------------ //------------------------------
this.changecommitid = res.response.changecommitid this.changecommitid = res.response.changecommitid
...@@ -304,16 +1733,16 @@ export default { ...@@ -304,16 +1733,16 @@ export default {
}, },
clearableTime(e) { clearableTime(e) {
this.formValidate.competitionTimeRange = [] this.formValidate.competitionTimeRange = []
console.log("🚀🚀🚀,", e)
}, },
trainingTime(e) { trainingTime(e) {
this.formValidate.competitionTimeRange = e this.formValidate.competitionTimeRange = e
this.formValidate.start_time = dayjs(e[0]).format('YYYY-MM-DD') this.formValidate.begin_time = dayjs(e[0]).format('YYYY-MM-DD')
this.formValidate.end_time = dayjs(e[1]).format('YYYY-MM-DD') this.formValidate.end_time = dayjs(e[1]).format('YYYY-MM-DD')
console.log("🚀🚀312312🚀,", this.formValidate.competitionTimeRange, this.formValidate.start_time, this.formValidate.end_time)
}, },
async competitionSelectName(e) { async competitionSelectName(e) {
const res = await api.ReportChange({id: e})
// const res = await api.ReportChange({id: e})
const res = await api.ReportChangeById({id: e})
this.formValidate.sponsor = res.response.sponsor this.formValidate.sponsor = res.response.sponsor
this.formValidate.level = Number(res.response.level) this.formValidate.level = Number(res.response.level)
this.formValidate.file_name = res.response.file_name this.formValidate.file_name = res.response.file_name
...@@ -362,15 +1791,19 @@ export default { ...@@ -362,15 +1791,19 @@ export default {
handleSubmit() { handleSubmit() {
this.$refs['formValidate'].validate(async (cur) => { this.$refs['formValidate'].validate(async (cur) => {
if (cur) { if (cur) {
this.$Spin.show() // this.formValidate.competitionname = this.competitionnameValue
this.formValidate.competitionname = this.competitionnameValue // this.$Spin.show()
clearTimeout(this.timer)
this.timer = setTimeout(async () => {
this.formValidate.flowid = this.flowid this.formValidate.flowid = this.flowid
let data = _.cloneDeep(this.formValidate) let data = _.cloneDeep(this.formValidate)
const res = await api.FlowSignSubmit(data) const res = await api.FlowSignSubmit(data)
hook.publicMessage(res) hook.publicMessage(res)
setTimeout(() => { setTimeout(() => {
window.open("about:blank", "_top").close() this.$router.back()
// window.open("about:blank", "_top").close()
}, 1500) }, 1500)
}, 1000)
} }
}) })
}, },
...@@ -397,15 +1830,6 @@ export default { ...@@ -397,15 +1830,6 @@ export default {
}, },
//生命周期 - 挂载完成(可以访问DOM元素)",html模板已渲染
mounted() {
this.getCompetiotionName()
this.formValidate.flowid = this.$route.query.id;
// this.formValidate.files_list.module = this.$route.query.remark;
this.flowid = this.$route.query.id;
this.module = this.$route.query.remark;
this.FlowInit()
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新 //生命周期 - 更新之前",数据模型已更新,html模板未更新
beforeUpdate() { beforeUpdate() {
...@@ -454,14 +1878,20 @@ export default { ...@@ -454,14 +1878,20 @@ export default {
</style> </style>
<style> <style>
.container { .competitionClassIcon {
display: flex;
align-items: center;
cursor: pointer;
}
.competitionClassIcon:hover {
transform: scale(1.5);
color: red;
}
.container {
overflow-y: auto;
width: 100%; width: 100%;
min-height: 987px; //min-height: 987px; display: flex; align-content: center; justify-content: center; flex-wrap: wrap;
height: auto;
display: flex;
align-content: center;
justify-content: center;
flex-wrap: wrap;
} }
</style> </style>
...@@ -21,6 +21,12 @@ ...@@ -21,6 +21,12 @@
{{ item.name }}({{ item.card }}) {{ item.name }}({{ item.card }})
</Tag> </Tag>
</template> </template>
<template #is_match_dept="{row}">
<Tag :color="['warning','success'][row.is_match_dept]">
{{ ['否', '是'][row.is_match_dept] }}
</Tag>
</template>
<template slot-scope="{ row }" slot="action"> <template slot-scope="{ row }" slot="action">
<a @click="edit(row)">编辑</a> <a @click="edit(row)">编辑</a>
...@@ -48,8 +54,16 @@ ...@@ -48,8 +54,16 @@
<FormItem label="审批组名称" prop="name"> <FormItem label="审批组名称" prop="name">
<Input v-model="formValidate.name" placeholder="请输入审批组名称"></Input> <Input v-model="formValidate.name" placeholder="请输入审批组名称"></Input>
</FormItem> </FormItem>
<FormItem label="是否匹配院系关系" prop="is_match_dept">
<Select v-model="formValidate.is_match_dept" placeholder="请选择是否匹配院系关系">
<Option v-for="(item,index) in whetherItMatchesTheFacultyRelationship" :key="index" :value="item.value">{{
item.label
}}
</Option>
</Select>
</FormItem>
<FormItem label="成员" prop="user"> <FormItem label="成员" prop="user">
<Select multiple v-model="formValidate.user" placeholder="成员"> <Select filterable multiple v-model="formValidate.user" placeholder="成员">
<Option v-for="(item,index) in formValidate.userArray" :key="index" :value="item.id">{{ <Option v-for="(item,index) in formValidate.userArray" :key="index" :value="item.id">{{
item.name item.name
}} }}
...@@ -65,15 +79,25 @@ ...@@ -65,15 +79,25 @@
<Modal <Modal
v-model="editModal" v-model="editModal"
title="编辑" title="编辑"
width="50"
> >
<Form ref="formValidate1" :model="formValidate" :rules="ruleValidate" :label-width="80"> <Form ref="formValidate1" :model="formValidate" :rules="ruleValidate" :label-width="80">
<FormItem label="审批组名称" prop="name"> <FormItem label="审批组名称" prop="name">
<Input v-model="formValidate.name" placeholder="审批组名称"></Input> <Input v-model="formValidate.name" placeholder="审批组名称"></Input>
</FormItem> </FormItem>
<FormItem label="是否匹配院系关系" prop="is_match_dept">
<Select v-model="formValidate.is_match_dept" placeholder="请选择是否匹配院系关系">
<Option v-for="(item,index) in whetherItMatchesTheFacultyRelationship" :key="index" :value="item.value">{{
item.label
}}
</Option>
</Select>
</FormItem>
</Form> </Form>
<div style="display: flex;justify-content: center"> <div style="display: flex;justify-content: center">
<Transfer <Transfer
:list-style="{width:'350px',height:'350px'}"
filterable
:key="tramsferKey" :key="tramsferKey"
:data="GroupUserInfo.unmember" :data="GroupUserInfo.unmember"
:target-keys="GroupUserInfo.member" :target-keys="GroupUserInfo.member"
...@@ -98,14 +122,28 @@ export default { ...@@ -98,14 +122,28 @@ export default {
name: 'list', name: 'list',
data() { data() {
return { return {
whetherItMatchesTheFacultyRelationship: [
{
label: '否',
value: 0,
},
{
label: '是',
value: 1,
},
],
tramsferKey: 1, tramsferKey: 1,
GroupUserInfo: {}, GroupUserInfo: [],
formValidate: { formValidate: {
name: '', name: '',
user: [], user: [],
userArray: [], userArray: [],
is_match_dept: 0,
}, },
ruleValidate: { ruleValidate: {
is_match_dept: [
{type: 'number', required: true, message: '此项不能为空', trigger: 'change'},
],
name: [ name: [
{type: 'string', required: true, message: '此项不能为空', trigger: 'blur'}, {type: 'string', required: true, message: '此项不能为空', trigger: 'blur'},
], ],
...@@ -151,11 +189,18 @@ export default { ...@@ -151,11 +189,18 @@ export default {
show: true, show: true,
minWidth: 150, minWidth: 150,
}, },
{
title: '是否匹配院系关系',
slot: 'is_match_dept',
align: 'center',
show: true,
minWidth: 150,
},
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',
minWidth: 100, minWidth: 100,
fixed: 'right',
show: true, show: true,
slot: 'action' slot: 'action'
} }
...@@ -196,6 +241,7 @@ export default { ...@@ -196,6 +241,7 @@ export default {
return item.name; return item.name;
}, },
handleChange(newTargetKeys, direction, moveKeys) { handleChange(newTargetKeys, direction, moveKeys) {
switch (direction) { switch (direction) {
case 'left': case 'left':
moveKeys.map((c, i) => { moveKeys.map((c, i) => {
...@@ -203,6 +249,7 @@ export default { ...@@ -203,6 +249,7 @@ export default {
this.GroupUserInfo.member.splice(this.GroupUserInfo.member.indexOf(c), 1) this.GroupUserInfo.member.splice(this.GroupUserInfo.member.indexOf(c), 1)
} }
}) })
break; break;
case 'right': case 'right':
this.GroupUserInfo.member = newTargetKeys this.GroupUserInfo.member = newTargetKeys
...@@ -238,6 +285,7 @@ export default { ...@@ -238,6 +285,7 @@ export default {
let data = { let data = {
groupname: this.formValidate.name, groupname: this.formValidate.name,
"member": this.formValidate.user, "member": this.formValidate.user,
is_match_dept: this.formValidate.is_match_dept
} }
const res = await api.FlowUserGroupSave(data) const res = await api.FlowUserGroupSave(data)
hook.publicMessage(res) hook.publicMessage(res)
...@@ -253,7 +301,8 @@ export default { ...@@ -253,7 +301,8 @@ export default {
let data = { let data = {
"groupid": this.GroupUserInfo.groupid, "groupid": this.GroupUserInfo.groupid,
"groupname": this.formValidate.name, "groupname": this.formValidate.name,
"member": this.GroupUserInfo.member "member": this.GroupUserInfo.member,
is_match_dept: this.formValidate.is_match_dept,
} }
const res = await api.FlowUserGroupSave(data) const res = await api.FlowUserGroupSave(data)
if (res.code !== 1) { if (res.code !== 1) {
......
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
:width="80" :width="80"
@on-visible-change="closeNodeModal" @on-visible-change="closeNodeModal"
:closable="false" :closable="false"
:styles="{top:'10px'}"
> >
<template #header> <template #header>
<div style=" display: flex;justify-content: space-between;align-items: center"> <div style=" display: flex;justify-content: space-between;align-items: center">
...@@ -172,6 +173,7 @@ ...@@ -172,6 +173,7 @@
v-model="addNodeModal" v-model="addNodeModal"
title="新增节点" title="新增节点"
width="40" width="40"
:styles="{top:'10px'}"
> >
<Form ref="formValidate1" :model="formValidate1" :rules="ruleValidate" :label-width="130"> <Form ref="formValidate1" :model="formValidate1" :rules="ruleValidate" :label-width="130">
<FormItem label="当前节点名称" prop="nodename"> <FormItem label="当前节点名称" prop="nodename">
...@@ -220,6 +222,7 @@ ...@@ -220,6 +222,7 @@
v-model="addNodeModal1" v-model="addNodeModal1"
title="编辑节点" title="编辑节点"
width="40" width="40"
:styles="{top:'10px'}"
> >
<Form ref="formValidate2" :model="formValidate2" :rules="ruleValidate" :label-width="130"> <Form ref="formValidate2" :model="formValidate2" :rules="ruleValidate" :label-width="130">
<FormItem label="当前节点名称" prop="nodename"> <FormItem label="当前节点名称" prop="nodename">
...@@ -645,10 +648,11 @@ export default { ...@@ -645,10 +648,11 @@ export default {
}) })
}, },
addNodeOk() { addNodeOk() {
const empty = () => { const empty = () => {
this.addNodeModal = false this.addNodeModal = false
let flow_id = this.formValidate1.flow_id
this.formValidate1 = {} this.formValidate1 = {}
this.formValidate1.flow_id = flow_id
} }
this.$refs['formValidate1'].validate(async (va) => { this.$refs['formValidate1'].validate(async (va) => {
if (va) { if (va) {
...@@ -702,8 +706,10 @@ export default { ...@@ -702,8 +706,10 @@ export default {
}, },
async addNodeOk1() { async addNodeOk1() {
const empty = () => { const empty = () => {
let flow_id = this.formValidate2.flow_id
this.addNodeModal1 = false this.addNodeModal1 = false
this.formValidate2 = {} this.formValidate2 = {}
this.formValidate2.flow_id = flow_id
} }
const res = await hook.myEncapsulationFunction(async () => { const res = await hook.myEncapsulationFunction(async () => {
let data = _.cloneDeep(this.formValidate2) let data = _.cloneDeep(this.formValidate2)
......
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
@on-ok="modalOk(row)" @on-ok="modalOk(row)"
cancel-text="取消" cancel-text="取消"
ok-text="确认" ok-text="确认"
:mask-closable="false" :mask-closable="true"
> >
<Form :model="formTop" :label-width="80" ref="updateRoleValue"> <Form :model="formTop" :label-width="80" ref="updateRoleValue">
<!-- :rules="ruleValidate"--> <!-- :rules="ruleValidate"-->
...@@ -47,7 +48,6 @@ ...@@ -47,7 +48,6 @@
</Table> </Table>
<div style="width: 100%;height: 70px;display: flex;align-items: center;"> <div style="width: 100%;height: 70px;display: flex;align-items: center;">
<Page show-total <Page show-total
show-sizer show-sizer
show-elevator show-elevator
:total="total" :total="total"
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
</template> </template>
<template v-slot:action="{row}"> <template v-slot:action="{row}">
<!-- <Button type="info" size="small" @click="edit(row)">编辑</Button>--> <!-- <Button type="info" size="small" @click="edit(row)">编辑</Button>-->
<a @click="edit(row) " style="margin-right: 1vw;">编辑</a>
<Poptip confirm transfer title="你确定删除吗?" @on-ok="del(row)" @on-cancel="cancel"> <Poptip confirm transfer title="你确定删除吗?" @on-ok="del(row)" @on-cancel="cancel">
<a style="color: red;">删除</a> <a style="color: red;">删除</a>
</Poptip> </Poptip>
...@@ -54,49 +55,11 @@ ...@@ -54,49 +55,11 @@
<!-- 新增修改 --> <!-- 新增修改 -->
</Card> </Card>
<Modal <Modal
width="50%" :width="50"
:styles="{top: '20px'}" :styles="{top: '20px'}"
v-model="modal" v-model="modal"
title="添加用户" title="添加用户"
> >
<!-- <div>-->
<!-- <Tabs type="card">-->
<!-- <TabPane label="添加学生">-->
<!-- <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">-->
<!-- <FormItem label="学生" prop="student">-->
<!-- <Select transfer filterable v-model="formValidate.student" @on-change="studentSelect" multiple placeholder="请选择">-->
<!-- <Option v-for="(item,index) in promiseAllArray[1]" :value="item.id" :key="index">{{item.name}}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem>-->
<!-- <Button type="primary" @click="handleSubmit('s')">提交</Button>-->
<!-- <Button @click="handleReset('s')" style="margin-left: 8px">重置</Button>-->
<!-- </FormItem>-->
<!-- </Form>-->
<!-- </TabPane>-->
<!-- <TabPane label="添加教师">-->
<!-- <Form ref="formValidate1" :model="formValidate" :rules="ruleValidate" :label-width="80">-->
<!-- <FormItem label="教师" prop="teacher">-->
<!-- <Select clearable transfer filterable v-model="formValidate.teacher" placeholder="请选择">-->
<!-- <Option v-for="(item,index) in promiseAllArray[0]" :value="item.id" :key="index">{{item.name}}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem label="权限" prop="role">-->
<!-- <Select transfer filterable v-model="formValidate.role" @on-change="studentSelect1" multiple placeholder="请选择">-->
<!-- <Option :disabled="item.name ==='学生'" v-for="(item,index) in promiseAllArray[2]" :value="item.id" :key="index">{{item.name}}</Option>-->
<!-- </Select>-->
<!-- </FormItem>-->
<!-- <FormItem>-->
<!-- <Button type="primary" @click="handleSubmit('t')">提交</Button>-->
<!-- <Button @click="handleReset('t')" style="margin-left: 8px">重置</Button>-->
<!-- </FormItem>-->
<!-- </Form>-->
<!-- </TabPane>-->
<!-- </Tabs>-->
<!-- </div>-->
<!-- <template #footer>-->
<!-- {{null}}-->
<!-- </template>-->
<div> <div>
<Tabs type="card"> <Tabs type="card">
<TabPane label="添加学生"> <TabPane label="添加学生">
...@@ -138,16 +101,8 @@ ...@@ -138,16 +101,8 @@
<Button type="primary" @click="handleSubmit('s')">提交</Button> <Button type="primary" @click="handleSubmit('s')">提交</Button>
</div> </div>
</TabPane> </TabPane>
<TabPane label="添加教师"> <TabPane label="添加教师">
<div style="display: flex;"> <div style="display: flex;">
<!-- <Select transfer filterable v-model="formValidate.role" @on-change="studentSelect1" multiple-->
<!-- placeholder="请选择">&ndash;&gt;-->
<!-- <Option :disabled="item.name ==='学生'" v-for="(item,index) in promiseAllArray[2]" :value="item.id"-->
<!-- :key="index">{{ item.name }}-->
<!-- </Option>-->
<!-- </Select>-->
<CheckboxGroup style="margin-bottom: 5px" v-model="modalSelect1.checkboxValue"> <CheckboxGroup style="margin-bottom: 5px" v-model="modalSelect1.checkboxValue">
<Checkbox :disabled="item.name ==='学生'" v-for="(item,index) in promiseAllArray[0]" :label="item.id" <Checkbox :disabled="item.name ==='学生'" v-for="(item,index) in promiseAllArray[0]" :label="item.id"
:key="index" :key="index"
...@@ -205,6 +160,35 @@ ...@@ -205,6 +160,35 @@
{{ null }} {{ null }}
</template> </template>
</Modal> </Modal>
<Modal
v-model="editModal"
title="编辑">
<Form ref="formValidate3" :model="formValidate3" :rules="ruleValidate3" :label-width="80">
<FormItem label="姓名" prop="name">
<Input disabled v-model="formValidate3.name" placeholder="姓名"></Input>
</FormItem>
<FormItem label="工号" prop="card_name">
<Input disabled v-model="formValidate3.card_name" placeholder="姓名"></Input>
</FormItem>
<FormItem label="用户权限" prop="roleid">
<Select multiple v-model="formValidate3.roleid" placeholder="用户权限">
<Option v-for="(item,index) in promiseAllArray[0]" :key="index" :value="item.id">{{ item.name }}</Option>
</Select>
</FormItem>
<FormItem label="院系" prop="dept_id">
<Select multiple v-model="formValidate3.dept_id" placeholder="院系">
<Option v-for="(item,index) in modalSelect1.deptSelectArray" :key="index" :value="item.id">{{
item.name
}}
</Option>
</Select>
</FormItem>
</Form>
<template v-slot:footer>
<Button type="text" @click="editModal = false">取消</Button>
<Button type="primary" @click="editSave">确定</Button>
</template>
</Modal>
</div> </div>
</template> </template>
...@@ -218,6 +202,23 @@ export default { ...@@ -218,6 +202,23 @@ export default {
data() { data() {
return { return {
formValidate3: {
"userid": "",
"name": "",
"card_name": "",
"roleid": [],
"dept_id": [],
},
ruleValidate3: {
roleid: [
{type: 'array', required: true, message: '该项不能为空', trigger: 'change'}
],
dept_id: [
{type: 'array', required: true, message: '该项不能为空', trigger: 'change'}
],
},
editModal: false,
modalKey: 0,
pageSizeOpts: [10, 20, 30, 40, 100, 200], pageSizeOpts: [10, 20, 30, 40, 100, 200],
modalSelect1: { modalSelect1: {
deptValue: [], deptValue: [],
...@@ -402,7 +403,22 @@ export default { ...@@ -402,7 +403,22 @@ export default {
this.GetDeptSeletct() this.GetDeptSeletct()
}, },
methods: { methods: {
editSave() {
this.$refs['formValidate3'].validate((vali) => {
if (vali) {
hook.myEncapsulationFunction(async () => {
const res = await api.UserRoleDeptSave(this.formValidate3)
this.getData()
this.editModal = false
return res
})
}
})
},
TabsAciton() {
console.log("🚀🚀🚀12312312,")
this.modalKey++
},
async modalAction() { async modalAction() {
this.modal = true this.modal = true
this.modalSelect.sArray = [] this.modalSelect.sArray = []
...@@ -577,7 +593,6 @@ export default { ...@@ -577,7 +593,6 @@ export default {
"role": this.modalSelect1.checkboxValue, "role": this.modalSelect1.checkboxValue,
"tid": this.modalSelect1.tArray "tid": this.modalSelect1.tArray
} }
if (!!this.modalSelect1.deptValue.length) {
const res1 = await api.TeacherBatchIns(data1) const res1 = await api.TeacherBatchIns(data1)
if (res1.code !== 1) { if (res1.code !== 1) {
this.$Message.error(res1.msg_detail) this.$Message.error(res1.msg_detail)
...@@ -587,9 +602,19 @@ export default { ...@@ -587,9 +602,19 @@ export default {
this.modal = false this.modal = false
this.modalSelect1.tArray = [] this.modalSelect1.tArray = []
} }
} else { // if (!!this.modalSelect1.deptValue.length) {
this.$Message.error('未选择院系') // const res1 = await api.TeacherBatchIns(data1)
} // if (res1.code !== 1) {
// this.$Message.error(res1.msg_detail)
// } else {
// hook.publicMessage(res1)
// await this.getData()
// this.modal = false
// this.modalSelect1.tArray = []
// }
// } else {
// this.$Message.error('未选择院系')
// }
break; break;
...@@ -674,6 +699,10 @@ export default { ...@@ -674,6 +699,10 @@ export default {
}, },
// 修改 // 修改
edit(row) { edit(row) {
this.editModal = true
hook.getInitListRequest(() => {
api.GetUserRoleDeptInfo({userid: row.userid}).then(res => this.formValidate3 = res.response)
})
console.log("🚀🚀🚀,", row) console.log("🚀🚀🚀,", row)
}, },
// 删除 // 删除
......
...@@ -149,9 +149,9 @@ ...@@ -149,9 +149,9 @@
<th v-if="item[0]==='fileList'" class="colTitle">{{ item[2] }}</th> <th v-if="item[0]==='fileList'" class="colTitle">{{ item[2] }}</th>
<td v-if="item[0]==='fileList'" class="colContent"> <td v-if="item[0]==='fileList'" class="colContent">
<!-- :href="ite.path" target="_blank" --> <!-- @click="aFun(ite) :href="ite.path" target="_blank" -->
<a class="aText" @click="aFun(ite)" <a class="aText" :href="ite.path" target="_blank"
style="display: flex;flex-wrap: wrap;justify-content: center" style="display: flex;flex-wrap: wrap;justify-content: center"
v-for="(ite,inde) in item[1]" v-for="(ite,inde) in item[1]"
:key="inde"> :key="inde">
...@@ -204,7 +204,6 @@ ...@@ -204,7 +204,6 @@
<VueDocPreview <VueDocPreview
style="height:calc(100vh-45px);" style="height:calc(100vh-45px);"
v-if="src && fileType ==='office'" v-if="src && fileType ==='office'"
:value="src" :value="src"
:url="src" :url="src"
language="JavaScript" language="JavaScript"
...@@ -490,14 +489,14 @@ export default { ...@@ -490,14 +489,14 @@ export default {
}, },
aFun(e) { aFun(e) {
const fun = (e, url) => { const fun = (e, url) => {
this.src = window.location.protocol + window.location.host + url.path
this.src = 'https://asc.hnasct.cn' + url.path
this.fileType = e this.fileType = e
this.drawerPreview = true this.drawerPreview = true
} }
if (e.suffix === '.jpg' || e.suffix === '.jpeg' || e.suffix === '.png' || e.suffix === '.pdf') { if (e.suffix === '.jpg' || e.suffix === '.jpeg' || e.suffix === '.png' || e.suffix === '.pdf') {
fun('image', e) fun('image', e)
} else if (e.suffix === '.doc' || e.suffix === '.docx' || e.suffix === '.xls' } else if (e.suffix === '.doc' || e.suffix === '.docx' || e.suffix === '.xls'
|| e.suffix === '.xlsx') { || e.suffix === '.xlsx') {
fun('office', e) fun('office', e)
......
...@@ -5,6 +5,7 @@ import Setting from '@/setting'; ...@@ -5,6 +5,7 @@ import Setting from '@/setting';
import dayjs from "dayjs"; import dayjs from "dayjs";
import * as api from '../../api/requestUtils' import * as api from '../../api/requestUtils'
import {Message, Notice} from 'view-design'; import {Message, Notice} from 'view-design';
import router from "@/router";
// 创建一个错误 // 创建一个错误
function errorCreate(msg) { function errorCreate(msg) {
...@@ -53,12 +54,12 @@ const refreshToken = async () => { ...@@ -53,12 +54,12 @@ const refreshToken = async () => {
if (flag === 1) { if (flag === 1) {
flag = 2 flag = 2
let currentTime = dayjs(dayjs().valueOf()) let currentTime = dayjs(dayjs().valueOf())
let refreshTime = dayjs(dayjs(util.cookies.get('refreshTime')).valueOf()) let refreshTime = dayjs(dayjs(util.cookies.get('competition-refreshTime')).valueOf())
if (refreshTime.diff(currentTime) <= 2 * 60 * 60) { if (refreshTime.diff(currentTime) <= 2 * 60 * 60) {
try { try {
const res = await api.RefreshToken() const res = await api.RefreshToken()
util.cookies.set('token', res.response.token_content) util.cookies.set('competition-token', res.response.token_content)
util.cookies.set('refreshTime', res.response.expires) util.cookies.set('competition-refreshTime', res.response.expires)
} catch (e) { } catch (e) {
console.error('1') console.error('1')
} finally { } finally {
...@@ -72,7 +73,7 @@ service.interceptors.request.use( ...@@ -72,7 +73,7 @@ service.interceptors.request.use(
config => { config => {
// 在请求发送之前做一些处理 // 在请求发送之前做一些处理
// const token = util.cookies.get('token'); // const token = util.cookies.get('token');
let token = util.cookies.get('token') let token = util.cookies.get('competition-token')
// 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改 // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
config.headers['Authorization'] = 'Bearer ' + token; config.headers['Authorization'] = 'Bearer ' + token;
config.headers['X-Token'] = token; config.headers['X-Token'] = token;
...@@ -126,9 +127,10 @@ service.interceptors.response.use( ...@@ -126,9 +127,10 @@ service.interceptors.response.use(
error.message = '请求错误'; error.message = '请求错误';
break; break;
case 401: case 401:
error.message = '未授权,请登录'; // error.message = '未授权,请登录';
util.cookies.remove('token'); util.cookies.remove('competition-token');
util.cookies.remove('userinfo'); util.cookies.remove('competition-userinfo');
router.replace({name: '403'})
break; break;
case 403: case 403:
error.message = '拒绝访问'; error.message = '拒绝访问';
......
...@@ -13,6 +13,17 @@ import routes from './routes'; ...@@ -13,6 +13,17 @@ import routes from './routes';
Vue.use(VueRouter); Vue.use(VueRouter);
// 截取url中的token
function getUrlKey(name) {
return (
decodeURIComponent(
(new RegExp("[?|&]" + name + "=" + "([^&;]+?)(&|#|;|$)").exec(
location.href
) || [, ""])[1].replace(/\+/g, "%20")
) || null
);
}
// 导出路由 在 main.js 里使用 // 导出路由 在 main.js 里使用
const router = new VueRouter({ const router = new VueRouter({
routes, routes,
...@@ -30,34 +41,33 @@ router.beforeEach(async (to, from, next) => { ...@@ -30,34 +41,33 @@ router.beforeEach(async (to, from, next) => {
// 判断是否需要登录才可以进入 // 判断是否需要登录才可以进入
if (to.matched.some(_ => _.meta.auth)) { if (to.matched.some(_ => _.meta.auth)) {
// 这里依据 token 判断是否登录,可视情况修改 // 这里依据 token 判断是否登录,可视情况修改
const token = util.cookies.get('token'); const token = util.cookies.get('competition-token');
if (token && token !== 'undefined') { const urlKey = getUrlKey('token');
next(); if (urlKey) {
} else {
console.log("🚀🚀2---------2222🚀,")
let token = ''
if (Cookies.get('token') && Cookies.get('token') !== 'undefined' || Cookies.get('token') && Cookies.get('token') !== 'null') {
token = Cookies.get('token')
console.log("🚀🚀Cookies🚀,", token)
} else {
token = localStorage.getItem('token')
// Cookies.set('token', token)
console.log("🚀🚀localStorage🚀,", token)
}
await store.dispatch('admin/account/ascLogin', { await store.dispatch('admin/account/ascLogin', {
"token": token "token": urlKey
}, {root: true}); }, {root: true});
next(); next();
}
// 没有登录的时候跳转到登录界面 // else if (token === '' && urlKey) {
// 携带上登陆成功之后需要跳转的页面完整路径 // // console.log("🚀🚀2---------2222🚀,")
// next({ // await store.dispatch('admin/account/ascLogin', {
// name: 'login', // "token": urlKey
// query: { // }, {root: true});
// redirect: to.fullPath // next();
// // 没有登录的时候跳转到登录界面
// // 携带上登陆成功之后需要跳转的页面完整路径
// // next({
// // name: 'login',
// // query: {
// // redirect: to.fullPath
// // }
// // });
// } // }
// }); else if (token) {
next();
} else {
next({name: '403'});
} }
} else { } else {
// 不需要身份校验 直接通过 // 不需要身份校验 直接通过
......
import BasicLayout from '@/layouts/basic-layout'; import BasicLayout from '@/layouts/basic-layout';
const meta = { const meta = {
...@@ -10,8 +9,8 @@ export default { ...@@ -10,8 +9,8 @@ export default {
name: '', name: '',
meta, meta,
component: BasicLayout, component: BasicLayout,
directive:{ directive: {
name:'Certificate' name: 'Certificate'
}, },
children: [ children: [
{ {
......
import BasicLayout from '@/layouts/basic-layout'; import BasicLayout from '@/layouts/basic-layout';
const meta = { const meta = {
...@@ -10,8 +9,8 @@ export default { ...@@ -10,8 +9,8 @@ export default {
name: '', name: '',
meta, meta,
component: BasicLayout, component: BasicLayout,
directive:{ directive: {
name:'CompetitionSign' name: 'CompetitionSign'
}, },
children: [ children: [
{ {
...@@ -22,7 +21,11 @@ export default { ...@@ -22,7 +21,11 @@ export default {
title: '报名列表', title: '报名列表',
closable: false closable: false
}, },
component: () => import('@/pages/CompetitionSign/index.vue') component: () => import('@/pages/CompetitionSign/index.vue'),
// beforeEnter: (to, from, next) => {
// window.open('/CompetitionSignForm?id=102&remark=CompetitionSign&entrance=flow', '_blank');
// next(false); // Prevent Vue Router from navigating
// },
} }
] ]
}; };
import BasicLayout from '@/layouts/basic-layout';
const pre = '/eventCatalogue';
const meta = {
auth: true
};
export default {
path: '/',
name: '',
meta,
component: BasicLayout,
children: [
{
path: `${pre}-directoryQuery`,
name: `directoryQuery`,
meta: {
...meta,
title: '目录查询',
closable: false,
},
component: () => import('@/pages/eventCatalogue/index.vue')
},
{
path: `${pre}-eventApplication`,
name: `eventApplication`,
meta: {
...meta,
title: '参赛申请',
closable: false
},
component: () => import('@/pages/eventCatalogue/eventApplication.vue'),
}
]
};
...@@ -20,6 +20,8 @@ import CompetitionSign from "@/router/modules/CompetitionSign"; ...@@ -20,6 +20,8 @@ import CompetitionSign from "@/router/modules/CompetitionSign";
import flowAssemble from "@/router/modules/flowAssemble"; import flowAssemble from "@/router/modules/flowAssemble";
import competitionNotice from "@/router/modules/competitionNotice"; import competitionNotice from "@/router/modules/competitionNotice";
import competitionScore from "@/router/modules/competitionScore"; import competitionScore from "@/router/modules/competitionScore";
import eventCatalogue from "@/router/modules/eventCatalogue";
/** /**
* 在主框架内显示 * 在主框架内显示
...@@ -29,19 +31,30 @@ const frameIn = [ ...@@ -29,19 +31,30 @@ const frameIn = [
{ {
path: '/', path: '/',
redirect: { redirect: {
name: 'welcome' name: 'directoryQuery'
}, },
// component: () => import('@/pages/SSO.vue'),
component: BasicLayout, component: BasicLayout,
children: [ children: [
// {
// path: 'welcome',
// name: 'welcome',
// meta: {
// title: '竞赛列表',
// auth: true,
// closable: false
// },
// component: () => import('@/pages/welcome/index.vue')
// },
{ {
path: 'welcome', path: '/eventCatalogue-directoryQuery',
name: 'welcome', name: 'directoryQuery',
meta: { meta: {
title: '竞赛列表', title: '目录查询',
auth: true, auth: true,
closable: false closable: false
}, },
component: () => import('@/pages/welcome/index.vue') component: () => import('@/pages/eventCatalogue/index.vue')
}, },
{ {
path: 'log', path: 'log',
...@@ -99,7 +112,7 @@ const frameIn = [ ...@@ -99,7 +112,7 @@ const frameIn = [
flowAssemble, flowAssemble,
competitionNotice, competitionNotice,
competitionScore, competitionScore,
eventCatalogue,
]; ];
/** /**
......
...@@ -9,7 +9,7 @@ const Setting = { ...@@ -9,7 +9,7 @@ const Setting = {
* 基础配置 * 基础配置
* */ * */
// 网页标题的后缀 // 网页标题的后缀
titleSuffix: '竞赛管理系统', titleSuffix: '竞赛管理',
// 路由模式,可选值为 history 或 hash // 路由模式,可选值为 history 或 hash
routerMode: 'hash', routerMode: 'hash',
// 应用的基路径 // 应用的基路径
......
...@@ -5,9 +5,10 @@ import util from '@/libs/util'; ...@@ -5,9 +5,10 @@ import util from '@/libs/util';
import router from '@/router'; import router from '@/router';
import Setting from '@/setting'; import Setting from '@/setting';
import * as api from '../../../../api/requestUtils' import * as api from '../../../../api/requestUtils'
import { AccountLogin, AccountRegister } from '@api/account'; import * as hooks from '@/hook'
import {AccountLogin, AccountRegister} from '@api/account';
import { Modal } from 'view-design'; import {Modal} from 'view-design';
export default { export default {
namespaced: true, namespaced: true,
...@@ -19,41 +20,59 @@ export default { ...@@ -19,41 +20,59 @@ export default {
* @param {Object} param password {String} 密码 * @param {Object} param password {String} 密码
* @param {Object} param route {Object} 登录成功后定向的路由对象 任何 vue-router 支持的格式 * @param {Object} param route {Object} 登录成功后定向的路由对象 任何 vue-router 支持的格式
*/ */
ascLogin({ dispatch }, { ascLogin({dispatch}, {
token token
} = {}) { } = {}) {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
await api.SSOPC({ await api.SSOPC({
token:token token: token
}) })
.then(async res => { .then(async res => {
if(res.code !== 1){ if (res.code !== 1) {
await router.push({ await router.push({
name: '403', name: '403',
}) })
}else if(res.response.access_token.token_content){ } else if (res.response.access_token.token_content) {
// 设置 cookie 一定要存 uuid 和 token 两个 cookie // 设置 cookie 一定要存 uuid 和 token 两个 cookie
// 整个系统依赖这两个数据进行校验和存储 // 整个系统依赖这两个数据进行校验和存储
// uuid 是用户身份唯一标识 用户注册的时候确定 并且不可改变 不可重复 // uuid 是用户身份唯一标识 用户注册的时候确定 并且不可改变 不可重复
// token 代表用户当前登录状态 建议在网络请求中携带 token // token 代表用户当前登录状态 建议在网络请求中携带 token
// 如有必要 token 需要定时更新,默认保存一天,可在 setting.js 中修改 // 如有必要 token 需要定时更新,默认保存一天,可在 setting.js 中修改
// 如果你的 token 不是通过 cookie 携带,而是普通字段,也可视情况存储在 localStorage // 如果你的 token 不是通过 cookie 携带,而是普通字段,也可视情况存储在 localStorage
util.cookies.set('token', res.response.access_token.token_content); // 这个util的cookie会自带admin前缀 util.cookies.set('competition-token', res.response.access_token.token_content); // 这个util的cookie会自带admin前缀
util.cookies.set('refreshTime', res.response.access_token.expires); util.cookies.set('competition-refreshTime', res.response.access_token.expires);
// console.log("dsadass"+res.response.access_token.token_content); // console.log("dsadass"+res.response.access_token.token_content);
// util.cookies.set('token', res.token); // util.cookies.set('token', res.token);
await api.GetTokenInfo().then(async res => { // 这个接口是解析单点返回的token(admin_token) 获取到用户信息 且每次请求都会带上此token(admin_token) 在请求拦截中配置 await api.GetTokenInfo().then(async res => { // 这个接口是解析单点返回的token(admin_token) 获取到用户信息 且每次请求都会带上此token(admin_token) 在请求拦截中配置
// console.log("GetTokenInfo方法获取用户信息",res.response); // console.log("GetTokenInfo方法获取用户信息",res.response);
util.cookies.set('userinfo', res.response);
// store 赋值 // store 赋值
// await dispatch('admin/user/set', res.response, { root: true }); // await dispatch('admin/user/set', res.response, { root: true });
// await dispatch('load', { loadOpenedTabs: Setting.page.loadOpenedTabs }); // await dispatch('load', { loadOpenedTabs: Setting.page.loadOpenedTabs });
let aaa = ''
await new Promise((resolve) => {
util.cookies.set('competition-userinfo', res.response);
// localStorage.setItem('menu', hooks.getUserRole())
aaa = hooks.getUserRole()
resolve()
})
// 获取动态菜单 // 获取动态菜单
if (Setting.dynamicMenu) await dispatch('admin/menu/getMenuList', false, { root: true }); if (Setting.dynamicMenu) await dispatch('admin/menu/getMenuList', false, {root: true});
// let Role = '管理员' // let Role = '管理员'
// let split = res.response.role[0].split('"') // let split = res.response.role[0].split('"')
// if(split.indexOf(Role)!== -1){ // if(split.indexOf(Role)!== -1){
var info = {
name: 'asc666',
avatar: 'https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar',
access: [aaa ? 'admin' : "xxx"]
}
// await
dispatch('admin/user/set', info, {root: true});
// 用户登录后从持久化数据加载一系列的设置
dispatch('load');
// 结束
// resolve();
resolve() resolve()
// }else{ // }else{
// router.push({ // router.push({
...@@ -72,35 +91,35 @@ export default { ...@@ -72,35 +91,35 @@ export default {
} }
}) })
.catch(err => { .catch(err => {
console.log("🚀🚀🚀,",err) console.log("🚀🚀🚀,", err)
reject(err); reject(err);
}) })
// util.cookies.set('uuid', 'asc666'); // util.cookies.set('uuid', 'asc666');
// util.cookies.set('token', 'rooooo'); // util.cookies.set('token', 'rooooo');
// 设置 vuex 用户信息 // 设置 vuex 用户信息
var info = { // var info = {
name: 'asc666', // name: 'asc666',
avatar: 'https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar', // avatar: 'https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar',
access: ['admin'] // access: [localStorage.getItem('menu') ? 'admin' : "xxx"]
} // }
// await // // await
dispatch('admin/user/set', info, { root: true }); // dispatch('admin/user/set', info, {root: true});
// 用户登录后从持久化数据加载一系列的设置 // // 用户登录后从持久化数据加载一系列的设置
dispatch('load'); // dispatch('load');
// 结束 // // 结束
resolve(); // resolve();
}) })
}, },
/** /**
* @description 退出登录 * @description 退出登录
* */ * */
logout({ commit, dispatch }, { confirm = false, vm } = {}) { logout({commit, dispatch}, {confirm = false, vm} = {}) {
async function logout() { async function logout() {
// 删除cookie // 删除cookie
util.cookies.remove('token'); util.cookies.remove('token');
util.cookies.remove('uuid'); util.cookies.remove('uuid');
// 清空 vuex 用户信息 // 清空 vuex 用户信息
await dispatch('admin/user/set', {}, { root: true }); await dispatch('admin/user/set', {}, {root: true});
// 跳转路由 // 跳转路由
// router.push({ // router.push({
// name: 'login' // name: 'login'
...@@ -145,7 +164,7 @@ export default { ...@@ -145,7 +164,7 @@ export default {
* @param {Object} param mobile {String} 手机号码 * @param {Object} param mobile {String} 手机号码
* @param {Object} param captcha {String} 验证码 * @param {Object} param captcha {String} 验证码
*/ */
register({ dispatch }, { register({dispatch}, {
mail = '', mail = '',
password = '', password = '',
mobile = '', mobile = '',
...@@ -165,7 +184,7 @@ export default { ...@@ -165,7 +184,7 @@ export default {
util.cookies.set('uuid', res.uuid); util.cookies.set('uuid', res.uuid);
util.cookies.set('token', res.token); util.cookies.set('token', res.token);
// 设置 vuex 用户信息 // 设置 vuex 用户信息
await dispatch('admin/user/set', res.info, { root: true }); await dispatch('admin/user/set', res.info, {root: true});
// 用户登录后从持久化数据加载一系列的设置 // 用户登录后从持久化数据加载一系列的设置
await dispatch('load'); await dispatch('load');
// 结束 // 结束
...@@ -183,19 +202,19 @@ export default { ...@@ -183,19 +202,19 @@ export default {
* @param {Object} dispatch vuex dispatch * @param {Object} dispatch vuex dispatch
* @param {Object} loadOpenedTabs 是否加载页签信息 * @param {Object} loadOpenedTabs 是否加载页签信息
*/ */
load({ state, dispatch }, { loadOpenedTabs = true } = {}) { load({state, dispatch}, {loadOpenedTabs = true} = {}) {
return new Promise(async resolve => { return new Promise(async resolve => {
// 加载用户登录信息 // 加载用户登录信息
await dispatch('admin/user/load', null, { root: true }); await dispatch('admin/user/load', null, {root: true});
// 持久化数据加载上次退出时的多页列表 // 持久化数据加载上次退出时的多页列表
await dispatch('admin/page/openedLoad', { loadOpenedTabs }, { root: true }); await dispatch('admin/page/openedLoad', {loadOpenedTabs}, {root: true});
// end // end
resolve(); resolve();
}) })
} }
}, },
setCookie (name, value, time) { setCookie(name, value, time) {
var d = new Date() var d = new Date()
d.setTime(d.getTime() + time) d.setTime(d.getTime() + time)
var expires = 'expires=' + d.toUTCString() var expires = 'expires=' + d.toUTCString()
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或