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

- 20240930 优化保存

上级 62de8927
流水线 #29633 已通过 ,包含阶段
in 43 second
.carClass[data-v-e1b6510a]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-e1b6510a] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-e1b6510a] .ivu-select-dropdown{width:inherit;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}.filelist[data-v-e1b6510a]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-e1b6510a]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-e1b6510a]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-e1b6510a]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-e1b6510a]:hover{transform:scale(1.2)}.container[data-v-e1b6510a]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-e1b6510a],.tableList[data-v-79c8e826]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-79c8e826]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-79c8e826]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-79c8e826]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-79c8e826]{width:500px;height:50px;text-align:center}.Atext[data-v-79c8e826]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-79c8e826]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-79c8e826]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-79c8e826] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out} .carClass[data-v-135205d8]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-135205d8] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-135205d8] .ivu-select-dropdown{width:inherit;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}.filelist[data-v-135205d8]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-135205d8]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-135205d8]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-135205d8]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-135205d8]:hover{transform:scale(1.2)}.container[data-v-135205d8]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-135205d8],.tableList[data-v-79c8e826]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-79c8e826]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-79c8e826]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-79c8e826]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-79c8e826]{width:500px;height:50px;text-align:center}.Atext[data-v-79c8e826]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-79c8e826]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-79c8e826]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-79c8e826] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}
\ No newline at end of file \ 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~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.f7636414.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~253ae210.c21551cb.js></script><script src=js/chunk-vendors~db300d2f.e266578a.js></script><script src=js/chunk-vendors~690b702c.00a2f77e.js></script><script src=js/chunk-vendors~f9ca8911.d0f6cd33.js></script><script src=js/app~748942c6.524cd1e4.js></script></body></html> <!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~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.db0ab0a4.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~253ae210.c21551cb.js></script><script src=js/chunk-vendors~db300d2f.e266578a.js></script><script src=js/chunk-vendors~690b702c.00a2f77e.js></script><script src=js/chunk-vendors~f9ca8911.977a03a2.js></script><script src=js/app~748942c6.f90fca4c.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
<div> <div>
<Form <Form
class="searchDiv" :label-colon="labelColon"
:model="searchCondObj"
:label-width="labelWidth" :label-width="labelWidth"
:label-colon="labelColon"> :model="searchCondObj"
<Row justify="space-between" :gutter="32"> class="searchDiv">
<Col v-bind="grid" <Row :gutter="32" justify="space-between">
v-for="item in searchCondList.filter(a => a.show)" :key="item.id"> <Col v-for="item in searchCondList.filter(a => a.show)"
:key="item.id" v-bind="grid">
<FormItem> <FormItem>
<Input <Input
v-if="item.type == 'input'" v-if="item.type == 'input'"
v-model="searchCondObj[item.id]" v-model="searchCondObj[item.id]"
clearable :placeholder="'请输入'+item.name"
:placeholder="'请输入'+item.name"> clearable>
<template #prepend> <template #prepend>
<div> <div>
{{ item.name }} {{ item.name }}
...@@ -24,13 +24,12 @@ ...@@ -24,13 +24,12 @@
</Input> </Input>
<Select <Select
v-else-if="item.type == 'select'" v-else-if="item.type == 'select'"
v-model="searchCondObj[item.id]" v-model="searchCondObj[item.id]"
:clearable="!item.clearable" :clearable="!item.clearable"
:placeholder="'请选择'+item.name" :placeholder="'请选择'+item.name"
@on-change="selectChange($event,item.id)" @on-change="selectChange($event,item.id)"
style="width: 100%;display: block; white-space: nowrap !important;overflow-x: hidden !important;"
> >
<template #prefix> <template #prefix>
<div> <div>
...@@ -40,16 +39,19 @@ ...@@ -40,16 +39,19 @@
<Option <Option
v-for="it in item.optList" v-for="it in item.optList"
:key="it.value" :key="it.value"
:value="it.value">{{ it.label }} :value="it.value">
{{
it.label
}}
</Option> </Option>
</Select> </Select>
<Select <Select
v-else-if="item.type == 'selectMultiple'" v-else-if="item.type == 'selectMultiple'"
v-model="searchCondObj[item.id]" v-model="searchCondObj[item.id]"
:clearable="!item.clearable" :clearable="!item.clearable"
:multiple="true"
:placeholder="'请选择'+item.name" :placeholder="'请选择'+item.name"
@on-change="selectChange($event,item.id)" @on-change="selectChange($event,item.id)"
:multiple="true"
> >
<template #prefix> <template #prefix>
<div> <div>
...@@ -65,9 +67,9 @@ ...@@ -65,9 +67,9 @@
<DatePicker <DatePicker
v-else-if="item.type == 'daterange'" v-else-if="item.type == 'daterange'"
v-model="searchCondObj[item['id']]" v-model="searchCondObj[item['id']]"
type="daterange"
format="yyyy-MM-dd"
:placeholder="'请选择'+item.name" :placeholder="'请选择'+item.name"
format="yyyy-MM-dd"
type="daterange"
@on-change="(val1, val2) => daterangeChange(val1, val2, item.id)"> @on-change="(val1, val2) => daterangeChange(val1, val2, item.id)">
<template #prefix> <template #prefix>
<div> <div>
...@@ -79,14 +81,14 @@ ...@@ -79,14 +81,14 @@
<DatePicker <DatePicker
v-else-if="item.type == 'datetime'" v-else-if="item.type == 'datetime'"
v-model="searchCondObj[item['id']]" v-model="searchCondObj[item['id']]"
type="datetime"
format="yyyy-MM-dd HH:mm"
:placeholder="'请选择'+item.name" :placeholder="'请选择'+item.name"
format="yyyy-MM-dd HH:mm"
type="datetime"
@on-change="(val1, val2) => datetimeChange(val1, val2, item.id)"/> @on-change="(val1, val2) => datetimeChange(val1, val2, item.id)"/>
</FormItem> </FormItem>
</Col> </Col>
<Col v-bind="grid" class="buttonCol"> <Col class="buttonCol" v-bind="grid">
<Button type="primary" @click="searchBt">查询</Button> <Button type="primary" @click="searchBt">查询</Button>
<Button @click="resetBt">重置</Button> <Button @click="resetBt">重置</Button>
</Col> </Col>
...@@ -165,13 +167,14 @@ ...@@ -165,13 +167,14 @@
} }
</script> </script>
<style scoped lang="less"> <style lang="less" scoped>
/*
/deep/ .ivu-select-single .ivu-select-selection { /deep/ .ivu-select-single .ivu-select-selection {
height: auto; height: auto;
position: relative; position: relative;
} }
*/
/deep/ .ivu-input-group-prepend, .ivu-input-group-append { /deep/ .ivu-input-group-prepend, .ivu-input-group-append {
......
...@@ -878,9 +878,39 @@ ...@@ -878,9 +878,39 @@
//监听属性 类似于data概念", //监听属性 类似于data概念",
computed: { computed: {
verifyStudentsAwardCertificates() {
//验证学生获奖证书
let whetherThereAreStudents = this.teamObjectData.some(cur => {
//是否含学生
return !!cur.student_list.length
})
if (whetherThereAreStudents) return this.formValidate.files_list.some(cur => {
return cur.module === 'StudentExcellence'
})
else {
return true
}
},
verifyTeachersAwardCertificates() {
//验证教师获奖证书
let whetherThereAreTeachers = this.teamObjectData.some(cur => {
//是否含教师
return !!cur.contestant_teacher_list.length || !!cur.guide_teacher_list.length
})
if (whetherThereAreTeachers) return this.formValidate.files_list.some(cur => {
return cur.module === 'TeacherExcellence'
})
else {
return true
}
},
approvalState1oR2() { approvalState1oR2() {
//审批状态等于 1|| 2 //审批状态等于 1|| 2
return (this.formValidate.approval_state === 1 || this.formValidate.approval_state === 2) return (this.formValidate.approval_state === 1 || this.formValidate.approval_state === 2);
} }
}, },
//监控data中的数据变化", //监控data中的数据变化",
...@@ -1238,7 +1268,7 @@ ...@@ -1238,7 +1268,7 @@
}) })
return cur return cur
}) })
this.teamArray = [] this.teamArray = [];
res.response.map((cur, index) => { res.response.map((cur, index) => {
this.teamArray.push({label: cur.teanname, id: cur.teamid}) this.teamArray.push({label: cur.teanname, id: cur.teamid})
}) })
...@@ -1333,6 +1363,8 @@ ...@@ -1333,6 +1363,8 @@
handleSubmit() { handleSubmit() {
this.$refs['formValidate'].validate(async (cur) => { this.$refs['formValidate'].validate(async (cur) => {
if (cur) { if (cur) {
if (this.verifyStudentsAwardCertificates) {
if (this.verifyTeachersAwardCertificates) {
this.hooks.myEncapsulationFunction(async () => { this.hooks.myEncapsulationFunction(async () => {
// this.formValidate.competitionname = this.competitionname // this.formValidate.competitionname = this.competitionname
let data = _.cloneDeep({ let data = _.cloneDeep({
...@@ -1349,6 +1381,14 @@ ...@@ -1349,6 +1381,14 @@
return res return res
}) })
}) })
} else {
this.$Message.error('团队存在教师,需上传获奖证书,请检查教师获奖证书是否上传。')
}
} else {
this.$Message.error('团队存在参赛学生,需上传获奖证书,请检查学生获奖证书是否上传。')
}
} else {
this.$Message.error('表单验证未通过,请检查表单内容是否填写完整。')
} }
}) })
}, },
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或