Skip to content

T
tea-resources-web
Commit 68791454 authored by FangYuePeng's avatar FangYuePeng
Browse files
Options

单位开课和个人开课的开始日期、结束日期范围查询；修改大赛支持中大赛描述的字数为100

parent c8443dbe
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 26 deletions
src/views/contentManagement/competitionSupport/index.vue
View file @ 68791454
......@@ -155,7 +155,7 @@
:rows="8"
placeholder="请输入大赛描述"
resize="none"
maxlength="200"
maxlength="100"
show-word-limit
/>
</el-form-item>
......
src/views/courseInformation/classManagement/index.vue
View file @ 68791454
......@@ -52,24 +52,28 @@
/>
</el-select>
</el-form-item>
<el-form-item label="开始日期" prop="beginTrialTime">
<el-form-item label="开始日期">
<el-date-picker
v-model="queryParams.beginTrialTime"
value-format="yyyy-MM-dd"
style="width: 200px"
v-model="dateRangeBegin"
size="small"
type="date"
placeholder="开始日期"
style="width: 200px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始"
end-placeholder="结束"
/>
</el-form-item>
<el-form-item label="结束日期" prop="endTrialTime">
<el-form-item label="结束日期">
<el-date-picker
v-model="queryParams.endTrialTime"
value-format="yyyy-MM-dd"
style="width: 200px"
v-model="dateRangeEnd"
size="small"
type="date"
placeholder="结束日期"
style="width: 200px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始"
end-placeholder="结束"
/>
</el-form-item>
<el-form-item>
......@@ -634,6 +638,11 @@ export default {
dicts: ['tec_classify', 'job_classify'],
data() {
return {
// 开始日期数组
dateRangeBegin: [],
// 结束日期
dateRangeEnd: [],
// 导入列表
fileList: [],
// 开课导入参数
......@@ -1005,11 +1014,27 @@ export default {
// })
// })
// },
// 添加日期范围(多日期)
addDateRanges(params, dateRange1, dateRange2) {
var search = params
search.beginBeginTime = ''
search.beginEndTime = ''
search.endBeginTime = ''
search.endEndTime = ''
if (dateRange1 != null && dateRange1 !== '') {
search.beginBeginTime = dateRange1[0]
search.beginEndTime = dateRange1[1]
}
if (dateRange2 != null && dateRange2 !== '') {
search.endBeginTime = dateRange2[0]
search.endEndTime = dateRange2[1]
}
return search
},
/** 查询开课列表 */
getList() {
this.loading = true
listTeaTrialCourse(this.queryParams).then(response => {
listTeaTrialCourse(this.addDateRanges(this.queryParams, this.dateRangeBegin, this.dateRangeEnd)).then(response => {
this.dateList = response.rows
this.total = response.total
this.loading = false
......@@ -1045,6 +1070,8 @@ export default {
/** 重置按钮操作 */
resetQuery() {
// this.dateRange = []
this.dateRangeBegin = []
this.dateRangeEnd = []
this.queryParams = {
page: 1,
rows: 10,
......@@ -1057,6 +1084,7 @@ export default {
endTrialTime: '',
applicantType: 2
}
this.handleQuery()
},
......
src/views/courseInformation/tryoutCommencement/index.vue
View file @ 68791454
......@@ -45,26 +45,51 @@
</el-select>
</el-form-item>
<el-form-item label="开始日期" prop="beginTrialTime">
<el-form-item label="开始日期">
<el-date-picker
v-model="queryParams.beginTrialTime"
value-format="yyyy-MM-dd"
v-model="dateRangeBegin"
size="small"
type="date"
style="width: 200px"
placeholder="开始日期"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始"
end-placeholder="结束"
/>
</el-form-item>
<el-form-item label="结束日期" prop="endTrialTime">
<el-form-item label="结束日期">
<el-date-picker
v-model="queryParams.endTrialTime"
value-format="yyyy-MM-dd"
v-model="dateRangeEnd"
size="small"
type="date"
style="width: 200px"
placeholder="结束日期"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始"
end-placeholder="结束"
/>
</el-form-item>
<!-- <el-form-item label="开始日期" prop="beginTrialTime">-->
<!-- <el-date-picker-->
<!-- v-model="queryParams.beginTrialTime"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- size="small"-->
<!-- type="date"-->
<!-- style="width: 200px"-->
<!-- placeholder="开始日期"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="结束日期" prop="endTrialTime">-->
<!-- <el-date-picker-->
<!-- v-model="queryParams.endTrialTime"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- size="small"-->
<!-- type="date"-->
<!-- style="width: 200px"-->
<!-- placeholder="结束日期"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- //查询按钮-->
<el-button
:class="commonField.queryClass"
......@@ -583,6 +608,11 @@ export default {
name: 'TryoutApplication',
data() {
return {
// 开始日期数组
dateRangeBegin: [],
// 结束日期
dateRangeEnd: [],
// 显示开关
showSwitch: {
courseContent: true,
......@@ -850,6 +880,8 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.dateRangeBegin = []
this.dateRangeEnd = []
this.queryParams = {
page: 1,
rows: 10,
......@@ -965,13 +997,31 @@ export default {
}).catch(function() {
})
},
// 添加日期范围(多日期)
addDateRanges(params, dateRange1, dateRange2) {
var search = params
search.beginBeginTime = ''
search.beginEndTime = ''
search.endBeginTime = ''
search.endEndTime = ''
if (dateRange1 != null && dateRange1 !== '') {
search.beginBeginTime = dateRange1[0]
search.beginEndTime = dateRange1[1]
}
if (dateRange2 != null && dateRange2 !== '') {
search.endBeginTime = dateRange2[0]
search.endEndTime = dateRange2[1]
}
return search
},
loadData() {
// 列表渲染数据
var data = []
const _this = this
this.tableData = []
_this.fullscreenLoading = true
listTeaTrialCourse(this.queryParams).then(res => {
listTeaTrialCourse(this.addDateRanges(this.queryParams, this.dateRangeBegin, this.dateRangeEnd)).then(res => {
var pages = res.rows// 查询过来的每页数据
_this.total = res.total// 总记录数
_this.bussid = []
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment