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

- 20240723更新

上级 565a7b26
流水线 #27968 已通过 ,包含阶段
in 41 second
......@@ -72,6 +72,8 @@ _# 竞赛管理系统
- 赛事报名审批页和详情页增加专家字段
- 所有我的流程,流程状态:“退回发起人”,可重新发起流程。
- 新增事申请待办、已办、我的流程列表
- 20240531
- 放开赛事目录权限为所有用户;
- 专家列表编辑、删除,管理员鉴权;
- 20240723
1. 赛事申请:
- 教师调整获取赛事编号追加批次字段作为查询条件
- 学生调整获取赛事编号追加批次字段作为查询条件
[data-v-1c6ffbeb] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-1c6ffbeb] .ivu-select-dropdown{width:500px;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.con[data-v-1c6ffbeb]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-1c6ffbeb]{width:1000px;height:610px;margin:15px auto;padding:15px 50px;background-color:#fff;box-shadow:0 0 10px #bdbdbd}.filelist[data-v-1c6ffbeb]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-1c6ffbeb]:hover{color:red;transform:scale(1.5)}
\ No newline at end of file
[data-v-ab091bc6] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-ab091bc6] .ivu-select-dropdown{width:500px;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.con[data-v-ab091bc6]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-ab091bc6]{width:1000px;height:610px;margin:15px auto;padding:15px 50px;background-color:#fff;box-shadow:0 0 10px #bdbdbd}.filelist[data-v-ab091bc6]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-ab091bc6]:hover{color:red;transform:scale(1.5)}
\ No newline at end of file
[data-v-9140f2c8] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-9140f2c8] .ivu-select-dropdown{width:500px;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.con[data-v-9140f2c8]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-9140f2c8]{width:1000px;height:610px;margin:15px auto;padding:15px 50px;background-color:#fff;box-shadow:0 0 10px #bdbdbd}.filelist[data-v-9140f2c8]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-9140f2c8]:hover{color:red;transform:scale(1.5)}
\ No newline at end of file
[data-v-6ec32152] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-6ec32152] .ivu-select-dropdown{width:500px;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.con[data-v-6ec32152]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-6ec32152]{width:1000px;height:610px;margin:15px auto;padding:15px 50px;background-color:#fff;box-shadow:0 0 10px #bdbdbd}.filelist[data-v-6ec32152]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-6ec32152]:hover{color:red;transform:scale(1.5)}
\ No newline at end of file
.con[data-v-cc7f2272]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-cc7f2272]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-cc7f2272]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-cc7f2272]:hover{color:red;transform:scale(1.5)}[data-v-1e6167cb] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-1e6167cb] .ivu-select-dropdown{width:500px;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.con[data-v-1e6167cb]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-1e6167cb]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-1e6167cb]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-1e6167cb]:hover{color:red;transform:scale(1.5)}.con[data-v-7907c181]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-7907c181]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-7907c181]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-7907c181]:hover{color:red;transform:scale(1.5)}[data-v-b9f5d926] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-b9f5d926] .ivu-select-dropdown{width:500px;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.con[data-v-b9f5d926]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-b9f5d926]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-b9f5d926]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-b9f5d926]:hover{color:red;transform:scale(1.5)}.cancel{cursor:not-allowed;color:#c5c8ce}
\ No newline at end of file
.con[data-v-cc7f2272]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-cc7f2272]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-cc7f2272]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-cc7f2272]:hover{color:red;transform:scale(1.5)}[data-v-14f2980c] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-14f2980c] .ivu-select-dropdown{width:500px;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.con[data-v-14f2980c]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-14f2980c]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-14f2980c]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-14f2980c]:hover{color:red;transform:scale(1.5)}.con[data-v-7907c181]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-7907c181]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-7907c181]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-7907c181]:hover{color:red;transform:scale(1.5)}[data-v-1f6f9472] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-1f6f9472] .ivu-select-dropdown{width:500px;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.con[data-v-1f6f9472]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-1f6f9472]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-1f6f9472]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-1f6f9472]:hover{color:red;transform:scale(1.5)}.cancel{cursor:not-allowed;color:#c5c8ce}
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors.064c214c.css rel=stylesheet><link href=css/app.ad11fdf3.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 竞赛管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.d0680bec.js></script><script src=js/app.52f35e52.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors.064c214c.css rel=stylesheet><link href=css/app.ad11fdf3.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 竞赛管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.98ed7692.js></script><script src=js/app.49a67d05.js></script></body></html>
\ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
import { type AxiosRequestConfig } from "axios";
import { type ReportTempUpdate } from "../../interface";
import { type FlowReportUpdateRequests } from "../../interface";
/**
* 赛事修改暂存修改
* /api/CompetitionReport/api/CompetitionReport/ReportTempSave
*/
export declare function postApiCompetitionReportApiCompetitionReportReportTempSave(input?: ReportTempUpdate, config?: AxiosRequestConfig): import("axios").AxiosPromise<{
export declare function postApiCompetitionReportApiCompetitionReportReportTempSave(input?: FlowReportUpdateRequests, config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
......
......@@ -11,6 +11,7 @@ export declare function getApiFlowViewApiFlowViewGetFlowInfo(params: GetApiFlowV
response: {
taskid: string;
runid: string;
flowid: string;
module: string;
competitionReport: {
competitionreportid: string;
......
export interface CodeRequests {
condition?: string;
competition_method?: number;
competitionbatch_id?: string;
page_index?: number;
page_size?: number;
}
import { type CompetitionFile, type Subitem } from "../../interface";
import { type CompetitionFile } from "../../interface";
export interface FlowReport {
/** 流程id */
flowid?: string;
......@@ -197,6 +197,4 @@ export interface FlowReport {
is_del?: number;
/** 附件列表 */
files_list?: CompetitionFile[];
/** 赛项子项集合 */
subitem_list?: Subitem[];
}
......@@ -2,6 +2,7 @@ import { type CompetitionReport, type CompetitionSign, type Certificate, type Bu
export interface FlowViewModel {
taskid?: string;
runid?: string;
flowid?: string;
module?: string;
competitionReport?: CompetitionReport;
competitionSign?: CompetitionSign;
......
......@@ -34,7 +34,8 @@
total: 0,
pageIndex: 1,
pageSize: 5,
competition_method: 0
competition_method: 0,
"competitionbatch_id": "",
},
changecommitid: '',
flowid: 113,
......@@ -126,7 +127,30 @@
},
props: ['formId', 'runId',],
methods: {
batchChange(value) {
//批次变化
this.formValidate = {
flowid: 113,
competition_method: 0,
name: '',
competitionreportid: '',
competitionbatch_id: '',
report_code: '',
competitionname: '',
competitionsubitem_name: '',
dept_id: [],
sponsor: '',
competition_level_id: '',
competition_type_id: '',
way: '',
specialty: '',
"files_list": [],
}
},
async addAddressManually() {
//编号列表
this.selectionOfEvents = true
this.contestItem.loading = true
await new Promise((resolve) => {
......@@ -136,6 +160,7 @@
page_index: this.contestItem.pageIndex,
page_size: this.contestItem.pageSize,
competition_method: this.contestItem.competition_method,
competitionbatch_id: this.formValidate.competitionbatch_id,
}
api.GetCodeList(data).then(res => {
this.contestItem.total = res.response.data_count
......@@ -148,29 +173,17 @@
this.contestItem.loading = false
},
saveTheEventSingleOption() {
this.formValidate = {...this.formValidate, ...this.selectTheNumberMedian, competition_method: this.tabsName}
this.formValidate = {
...this.formValidate,
...this.selectTheNumberMedian,
competitionbatch_id: this.formValidate.competitionbatch_id,
competition_method: this.tabsName,
dept_id: this.selectTheNumberMedian.dept_id ? this.selectTheNumberMedian.dept_id.split(';').filter(cur => cur !== '') : []
}
this.formValidate.competition_type_name !== 'A类' ? this.formValidate.class_hour = String(0) : null
this.$refs.select.visible = false
this.$refs.select1.visible = false
this.selectionOfEvents = false
},
contestItemhandleChangePage(e) {
this.contestItem.pageIndex = e
this.addAddressManually()
this.tableKeys++
},
contestItemhandleChangePageSize(e) {
this.contestItem.pageSize = e
this.addAddressManually()
this.tableKeys++
},
tableRadio(e) {
this.selectTheNumberMedian = e
console.log("🚀🚀🚀,", e)
},
async onOpenChange(e) {
if (e) {
this.contestItem.loading = true
......@@ -181,6 +194,7 @@
page_index: this.contestItem.pageIndex,
page_size: this.contestItem.pageSize,
competition_method: this.contestItem.competition_method,
competitionbatch_id: this.formValidate.competitionbatch_id,
}
api.GetCodeList(data).then(res => {
this.contestItem.total = res.response.data_count
......@@ -194,6 +208,19 @@
}
},
contestItemhandleChangePage(e) {
this.contestItem.pageIndex = e
this.addAddressManually()
this.tableKeys++
},
contestItemhandleChangePageSize(e) {
this.contestItem.pageSize = e
this.addAddressManually()
this.tableKeys++
},
tableRadio(e) {
this.selectTheNumberMedian = e
},
async competitionSelectName(e) {
// const res = await api.ReportChange({id: e})
const res = await api.ReportChangeById({id: e})
......@@ -380,7 +407,8 @@
<Row :span="24" style="display: flex;justify-content: space-between">
<Col v-bind="grid">
<FormItem label="学年名称" prop="competitionbatch_id">
<Select clearable filterable v-model="formValidate.competitionbatch_id" style="width:100%">
<Select @on-clear="batchChange" clearable filterable 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>
......@@ -392,6 +420,7 @@
<FormItem label="赛事编号" prop="report_code">
<div style="display: flex">
<Select
:disabled="!formValidate.competitionbatch_id"
class="Select"
ref="select"
v-model="formValidate.report_code"
......
......@@ -127,6 +127,27 @@
props: ['formId', 'runId',],
methods: {
batchChange(value) {
//批次变化
this.formValidate = {
flowid: 114,
competition_method: 1,
name: '',
competitionreportid: '',
competitionbatch_id: '',
report_code: '',
competitionname: '',
competitionsubitem_name: '',
dept_id: [],
sponsor: '',
competition_level_id: '',
competition_type_id: '',
way: '',
specialty: '',
"files_list": [],
}
},
async addAddressManually() {
this.selectionOfEvents = true
this.contestItem.loading = true
......@@ -137,6 +158,7 @@
page_index: this.contestItem.pageIndex,
page_size: this.contestItem.pageSize,
competition_method: this.contestItem.competition_method,
competitionbatch_id: this.formValidate.competitionbatch_id,
}
api.GetCodeList(data).then(res => {
this.contestItem.total = res.response.data_count
......@@ -148,30 +170,6 @@
})
this.contestItem.loading = false
},
saveTheEventSingleOption() {
this.formValidate = {...this.formValidate, ...this.selectTheNumberMedian, competition_method: this.tabsName}
this.formValidate.competition_type_name !== 'A类' ? this.formValidate.class_hour = String(0) : null
this.$refs.select.visible = false
this.$refs.select1.visible = false
this.selectionOfEvents = false
},
contestItemhandleChangePage(e) {
this.contestItem.pageIndex = e
this.addAddressManually()
this.tableKeys++
},
contestItemhandleChangePageSize(e) {
this.contestItem.pageSize = e
this.addAddressManually()
this.tableKeys++
},
tableRadio(e) {
this.selectTheNumberMedian = e
console.log("🚀🚀🚀,", e)
},
async onOpenChange(e) {
if (e) {
this.contestItem.loading = true
......@@ -182,6 +180,7 @@
page_index: this.contestItem.pageIndex,
page_size: this.contestItem.pageSize,
competition_method: this.contestItem.competition_method,
competitionbatch_id: this.formValidate.competitionbatch_id,
}
api.GetCodeList(data).then(res => {
this.contestItem.total = res.response.data_count
......@@ -194,7 +193,37 @@
this.contestItem.loading = false
}
},
saveTheEventSingleOption() {
//
this.formValidate = {
...this.formValidate,
...this.selectTheNumberMedian,
competitionbatch_id: this.formValidate.competitionbatch_id,
competition_method: this.tabsName,
dept_id: this.selectTheNumberMedian.dept_id ? this.selectTheNumberMedian.dept_id.split(';').filter(cur => cur !== '') : []
}
this.formValidate.competition_type_name !== 'A类' ? this.formValidate.class_hour = String(0) : null
this.$refs.select.visible = false
this.selectionOfEvents = false
},
contestItemhandleChangePage(e) {
this.contestItem.pageIndex = e
this.addAddressManually()
this.tableKeys++
},
contestItemhandleChangePageSize(e) {
this.contestItem.pageSize = e
this.addAddressManually()
this.tableKeys++
},
tableRadio(e) {
this.selectTheNumberMedian = e
console.log("🚀🚀🚀,", e)
},
async competitionSelectName(e) {
const res = await api.ReportChangeById({id: e})
this.formValidate.sponsor = res.response.sponsor
......@@ -378,7 +407,8 @@
<Row :span="24" style="display: flex;justify-content: space-between">
<Col v-bind="grid">
<FormItem label="学年名称" prop="competitionbatch_id">
<Select clearable filterable v-model="formValidate.competitionbatch_id" style="width:100%">
<Select @on-clear="batchChange" clearable filterable 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>
......@@ -390,6 +420,7 @@
<FormItem label="赛事编号" prop="report_code">
<div style="display: flex">
<Select
:disabled="!formValidate.competitionbatch_id"
class="Select"
ref="select"
v-model="formValidate.report_code"
......
......@@ -34,7 +34,8 @@
total: 0,
pageIndex: 1,
pageSize: 5,
competition_method: 0
competition_method: 0,
"competitionbatch_id": "",
},
changecommitid: '',
flowid: 113,
......@@ -125,7 +126,29 @@
this.GetDeptSeletct()
},
methods: {
batchChange(value) {
//批次变化
this.formValidate = {
flowid: 113,
competition_method: 0,
name: '',
competitionreportid: '',
competitionbatch_id: '',
report_code: '',
competitionname: '',
competitionsubitem_name: '',
dept_id: [],
sponsor: '',
competition_level_id: '',
competition_type_id: '',
way: '',
specialty: '',
"files_list": [],
}
},
async addAddressManually() {
//编号列表
this.selectionOfEvents = true
this.contestItem.loading = true
await new Promise((resolve) => {
......@@ -135,6 +158,7 @@
page_index: this.contestItem.pageIndex,
page_size: this.contestItem.pageSize,
competition_method: this.contestItem.competition_method,
competitionbatch_id: this.formValidate.competitionbatch_id,
}
api.GetCodeList(data).then(res => {
this.contestItem.total = res.response.data_count
......@@ -147,29 +171,17 @@
this.contestItem.loading = false
},
saveTheEventSingleOption() {
this.formValidate = {...this.formValidate, ...this.selectTheNumberMedian, competition_method: this.tabsName}
this.formValidate = {
...this.formValidate,
...this.selectTheNumberMedian,
competitionbatch_id: this.formValidate.competitionbatch_id,
competition_method: this.tabsName,
dept_id: this.selectTheNumberMedian.dept_id ? this.selectTheNumberMedian.dept_id.split(';').filter(cur => cur !== '') : []
}
this.formValidate.competition_type_name !== 'A类' ? this.formValidate.class_hour = String(0) : null
this.$refs.select.visible = false
this.$refs.select1.visible = false
this.selectionOfEvents = false
},
contestItemhandleChangePage(e) {
this.contestItem.pageIndex = e
this.addAddressManually()
this.tableKeys++
},
contestItemhandleChangePageSize(e) {
this.contestItem.pageSize = e
this.addAddressManually()
this.tableKeys++
},
tableRadio(e) {
this.selectTheNumberMedian = e
console.log("🚀🚀🚀,", e)
},
async onOpenChange(e) {
if (e) {
this.contestItem.loading = true
......@@ -180,6 +192,7 @@
page_index: this.contestItem.pageIndex,
page_size: this.contestItem.pageSize,
competition_method: this.contestItem.competition_method,
competitionbatch_id: this.formValidate.competitionbatch_id,
}
api.GetCodeList(data).then(res => {
this.contestItem.total = res.response.data_count
......@@ -192,6 +205,20 @@
this.contestItem.loading = false
}
},
contestItemhandleChangePage(e) {
this.contestItem.pageIndex = e
this.addAddressManually()
this.tableKeys++
},
contestItemhandleChangePageSize(e) {
this.contestItem.pageSize = e
this.addAddressManually()
this.tableKeys++
},
tableRadio(e) {
this.selectTheNumberMedian = e
},
async competitionSelectName(e) {
// const res = await api.ReportChange({id: e})
......@@ -377,25 +404,23 @@
<Row :span="24" style="display: flex;justify-content: space-between">
<Col v-bind="grid">
<FormItem label="学年名称" prop="competitionbatch_id">
<Select clearable filterable v-model="formValidate.competitionbatch_id" style="width:100%">
<Select @on-clear="batchChange" clearable filterable 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 v-bind="grid">
<!-- <FormItem label="赛事编码" prop="report_code">
<Input clearable v-model="formValidate.report_code" placeholder="请输入赛事编码"></Input>
</FormItem>-->
<FormItem label="赛事编号" prop="report_code">
<div style="display: flex">
<Select
:disabled="!formValidate.competitionbatch_id"
class="Select"
ref="select"
v-model="formValidate.report_code"
:placeholder="formValidate.report_code"
@on-open-change="onOpenChange"
@on-change="competitionSelectName"
>
<Card>
<template #title>
......
......@@ -34,7 +34,8 @@
total: 0,
pageIndex: 1,
pageSize: 5,
competition_method: 1
competition_method: 1,
"competitionbatch_id": "",
},
changecommitid: '',
flowid: 114,
......@@ -125,6 +126,27 @@
this.GetDeptSeletct()
},
methods: {
batchChange(value) {
//批次变化
this.formValidate = {
flowid: 114,
competition_method: 1,
name: '',
competitionreportid: '',
competitionbatch_id: '',
report_code: '',
competitionname: '',
competitionsubitem_name: '',
dept_id: [],
sponsor: '',
competition_level_id: '',
competition_type_id: '',
way: '',
specialty: '',
"files_list": [],
}
},
async addAddressManually() {
this.selectionOfEvents = true
this.contestItem.loading = true
......@@ -135,6 +157,7 @@
page_index: this.contestItem.pageIndex,
page_size: this.contestItem.pageSize,
competition_method: this.contestItem.competition_method,
competitionbatch_id: this.formValidate.competitionbatch_id,
}
api.GetCodeList(data).then(res => {
this.contestItem.total = res.response.data_count
......@@ -146,30 +169,6 @@
})
this.contestItem.loading = false
},
saveTheEventSingleOption() {
this.formValidate = {...this.formValidate, ...this.selectTheNumberMedian, competition_method: this.tabsName}
this.formValidate.competition_type_name !== 'A类' ? this.formValidate.class_hour = String(0) : null
this.$refs.select.visible = false
this.$refs.select1.visible = false
this.selectionOfEvents = false
},
contestItemhandleChangePage(e) {
this.contestItem.pageIndex = e
this.addAddressManually()
this.tableKeys++
},
contestItemhandleChangePageSize(e) {
this.contestItem.pageSize = e
this.addAddressManually()
this.tableKeys++
},
tableRadio(e) {
this.selectTheNumberMedian = e
console.log("🚀🚀🚀,", e)
},
async onOpenChange(e) {
if (e) {
this.contestItem.loading = true
......@@ -180,6 +179,7 @@
page_index: this.contestItem.pageIndex,
page_size: this.contestItem.pageSize,
competition_method: this.contestItem.competition_method,
competitionbatch_id: this.formValidate.competitionbatch_id,
}
api.GetCodeList(data).then(res => {
this.contestItem.total = res.response.data_count
......@@ -192,6 +192,36 @@
this.contestItem.loading = false
}
},
saveTheEventSingleOption() {
//
this.formValidate = {
...this.formValidate,
...this.selectTheNumberMedian,
competitionbatch_id: this.formValidate.competitionbatch_id,
competition_method: this.tabsName,
dept_id: this.selectTheNumberMedian.dept_id ? this.selectTheNumberMedian.dept_id.split(';').filter(cur => cur !== '') : []
}
this.formValidate.competition_type_name !== 'A类' ? this.formValidate.class_hour = String(0) : null
this.$refs.select.visible = false
this.selectionOfEvents = false
},
contestItemhandleChangePage(e) {
this.contestItem.pageIndex = e
this.addAddressManually()
this.tableKeys++
},
contestItemhandleChangePageSize(e) {
this.contestItem.pageSize = e
this.addAddressManually()
this.tableKeys++
},
tableRadio(e) {
this.selectTheNumberMedian = e
console.log("🚀🚀xx🚀,", e)
},
async competitionSelectName(e) {
const res = await api.ReportChangeById({id: e})
......@@ -277,12 +307,14 @@
info.race_level = Number(info.race_level)
this.formValidate = {...this.formValidate, ...info}
console.log("🚀🚀formValidate🚀,", this.formValidate)
if (this.formValidate.dept_id) {
//分割格式
this.formValidate.dept_id = this.formValidate.dept_id.split(';').filter(cur => cur !== '')
}
this.formValidate.files_list = res.response.files_list
console.log("🚀🚀formValidate🚀,", this.formValidate)
/*res.response.files_list.map((cur, index) => {
if (cur.module === 'Project') this.preparationPlan.push(cur)
}) // 培训方案文件 仅标识*/
......@@ -375,15 +407,13 @@
<Row :span="24" style="display: flex;justify-content: space-between">
<Col v-bind="grid">
<FormItem label="学年名称" prop="competitionbatch_id">
<Select clearable filterable v-model="formValidate.competitionbatch_id" style="width:100%">
<Select @on-clear="batchChange" clearable filterable 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 v-bind="grid">
<!-- <FormItem label="赛事编码" prop="report_code">
<Input clearable v-model="formValidate.report_code" placeholder="请输入赛事编码"></Input>
</FormItem>-->
<FormItem label="赛事编号" prop="report_code">
<div style="display: flex">
<Select
......@@ -393,7 +423,7 @@
:placeholder="formValidate.report_code"
@on-open-change="onOpenChange"
@on-change="competitionSelectName"
:disabled="!formValidate.competitionbatch_id"
>
<Card>
<template #title>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或