wangyifang
/
sz-kjsxy-web
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改

Browse Source
master
lion 6 months ago
parent 22a363b4b1
commit 02d4fb5744
16 changed files with 1993 additions and 1868 deletions
Show Stats Download Patch File Download Diff File

2
src/views/book/components/addBook.vue
Unescape View File

@ -73,7 +73,7 @@
<span style="color: red;font-weight: bold;padding-right: 4px;">*</span>预约时间：
</div>
<div class="xy-table-item-content">
<el-date-picker type="datetimerange" @change="changeTimeRange" v-model="form.timeRange" style="width:100%" range-separator="至"
<el-date-picker unlink-panels type="datetimerange" @change="changeTimeRange" v-model="form.timeRange" style="width:100%" range-separator="至"
start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>

2
src/views/course/apply.vue
Unescape View File

@ -9,7 +9,7 @@
<el-input v-model="select.name" placeholder="请输入课程名称"></el-input>
</div>
<div>
<el-date-picker @change="changeDateRange" v-model="select.dateRange" type="daterange" range-separator="至"
<el-date-picker unlink-panels @change="changeDateRange" v-model="select.dateRange" type="daterange" range-separator="至"
value-format="yyyy-MM-dd" format="yyyy-MM-dd" start-placeholder="开课日期" end-placeholder="结束日期">
</el-date-picker>
</div>

2
src/views/course/class.vue
Unescape View File

@ -10,7 +10,7 @@
<el-input v-model="select.name" placeholder="请输入课程名称"></el-input>
</div>
<div>
<el-date-picker @change="changeDateRange" v-model="dateRange" type="daterange" range-separator="至"
<el-date-picker unlink-panels @change="changeDateRange" v-model="dateRange" type="daterange" range-separator="至"
value-format="yyyy-MM-dd" format="yyyy-MM-dd" start-placeholder="开课日期" end-placeholder="结束日期">
</el-date-picker>
</div>

2
src/views/course/components/addCourse.vue
Unescape View File

@ -102,7 +102,7 @@
<span style="color: red;font-weight: bold;padding-right: 4px;"></span>开课日期：
</div>
<div class="xy-table-item-content">
<el-date-picker @change="changeDateRange" style="width: 100%;" v-model="form.dateRange" type="daterange"
<el-date-picker unlink-panels @change="changeDateRange" style="width: 100%;" v-model="form.dateRange" type="daterange"
range-separator="至" value-format="yyyy-MM-dd" format="yyyy-MM-dd" start-placeholder="开课日期"
end-placeholder="结束日期">
</el-date-picker>

2
src/views/course/history.vue
Unescape View File

@ -10,7 +10,7 @@
<el-input v-model="select.name" placeholder="请输入课程名称"></el-input>
</div>
<div>
<el-date-picker @change="changeDateRange" v-model="dateRange" type="daterange" range-separator="至"
<el-date-picker unlink-panels @change="changeDateRange" v-model="dateRange" type="daterange" range-separator="至"
value-format="yyyy-MM-dd" format="yyyy-MM-dd" start-placeholder="开课日期" end-placeholder="结束日期">
</el-date-picker>
</div>

75
src/views/course/index.vue
Unescape View File

@ -10,7 +10,7 @@
<el-input v-model="select.name" placeholder="请输入课程名称"></el-input>
</div>
<div>
<el-date-picker @change="changeDateRange" v-model="dateRange" type="daterange" range-separator="至"
<el-date-picker unlink-panels @change="changeDateRange" v-model="dateRange" type="daterange" range-separator="至"
value-format="yyyy-MM-dd" format="yyyy-MM-dd" start-placeholder="开课日期" end-placeholder="结束日期">
</el-date-picker>
</div>
@ -26,6 +26,12 @@
</el-option>
</el-select>
</div>
<div>
<el-select v-model="select.is_chart" placeholder="是否统计" clearable style="width: 150px;">
<el-option label="否" :value="0"></el-option>
<el-option label="是" :value="1"></el-option>
</el-select>
</div>
<div>
<el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
</div>
@ -125,6 +131,7 @@
dateRange: '',
type: "",
course_status: '',
is_chart: '',
page: 1,
page_size: 10,
},
@ -193,38 +200,62 @@
this.select.name = ''
this.select.type = ''
this.select.course_status = ''
this.select.is_chart = ''
this.select.dateRange = ''
this.select.page=1
this.getList()
},
async getList() {
const filter = []
if (this.select.name) {
filter.push({
key: 'name',
op: 'like',
value: this.select.name
})
}
if (this.select.type !== '' && this.select.type !== null) {
filter.push({
key: 'type',
op: 'eq',
value: this.select.type
})
}
if (this.select.course_status !== '' && this.select.course_status !== null) {
filter.push({
key: 'course_status',
op: 'eq',
value: this.select.course_status
})
}
if (this.select.dateRange) {
filter.push({
key: 'start_date',
op: 'range',
value: this.select.dateRange
})
}
// 只有 is_chart 不为空时才添加（0 和 1 都需要传递）
if (this.select.is_chart !== '' && this.select.is_chart !== null && this.select.is_chart !== undefined) {
filter.push({
key: 'is_chart',
op: 'eq',
value: this.select.is_chart
})
}
const res = await index({
page: this.select.page,
page_size: this.select.page_size,
show_relation: ['type_detail'],
sort_name: 'start_date',
sort_type: 'DESC',
// course_status:this.select.course_status,
filter: [{
key: 'name',
op: 'like',
value: this.select.name
}, {
key: 'type',
op: 'eq',
value: this.select.type
},
{
key: 'course_status',
op: 'eq',
value: this.select.course_status
},
{
key: 'start_date',
op: 'range',
value: this.select.dateRange
}
]
filter: filter
})
this.list = res.data
this.total = res.total

26
src/views/employee/components/addEmployee.vue
Unescape View File

@ -114,6 +114,16 @@
</div>
</div>
</template>
<template v-slot:total>
<div class="xy-table-item">
<div class="xy-table-item-label" style="font-weight: bold">
<span style="color: red;font-weight: bold;padding-right: 4px;"></span>数量：
</div>
<div class="xy-table-item-content">
<el-input v-model="form.total" placeholder="请输入数量" clearable style="width: 100%;" />
</div>
</div>
</template>
</xy-dialog>
</div>
</template>
@ -144,7 +154,8 @@ export default {
end_date: '',
company_name: '',
name: '',
department: ''
department: '',
total: 1
},
rules: {
type: [{
@ -162,6 +173,10 @@ export default {
end_date: [{
required: true,
message: '请选择结束日期'
}],
total: [{
required: true,
message: '请输入数量'
}]
}
}
@ -282,7 +297,8 @@ export default {
end_date: res.end_date || '',
company_name: res.company_name || '',
name: res.name || '',
department: res.department || ''
department: res.department || '',
total: res.total || 1
}
// 设置课程类型后，需要筛选课程列表
this.$nextTick(() => {
@ -312,7 +328,8 @@ export default {
end_date: '',
company_name: '',
name: '',
department: ''
department: '',
total: 1
}
this.filterCourseOptions()
}
@ -328,7 +345,8 @@ export default {
end_date: '',
company_name: '',
name: '',
department: ''
department: '',
total: 1
}
this.$refs['dialog'].reset()
}

8
src/views/employee/index.vue
Unescape View File

@ -48,7 +48,7 @@
</el-table-column>
</template>
<template v-slot:btns>
<el-table-column align="center" label="操作" width="180" header-align="center">
<el-table-column align="center" fixed="right" label="操作" width="180" header-align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="editEmployee('editor',scope.row.id)">编辑</el-button>
<el-popconfirm title="确定删除吗？" style="margin:0 10px" @confirm="deleteList(scope.row.id)">
@ -91,7 +91,6 @@ export default {
prop: 'type',
label: '类型',
align: 'center',
width: 150
}, {
prop: 'course_type_id',
label: '课程体系',
@ -127,6 +126,11 @@ export default {
label: '部门',
align: 'center',
width: 150
}, {
prop: 'total',
label: '数量',
align: 'center',
width: 150
}]
}
},

28
src/views/historyCourse/index.vue
Unescape View File

@ -8,6 +8,12 @@
<div>
<el-input v-model="select.course_name" placeholder="请输入课程名称" clearable />
</div>
<div>
<el-select filterable v-model="select.type" placeholder="请选择课程体系" clearable style="width: 200px;">
<el-option v-for="item in courseTypeOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
<div>
<el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
</div>
@ -30,7 +36,7 @@
</el-table-column>
</template>
<template v-slot:btns>
<el-table-column align="center" label="操作" width="180" header-align="center">
<el-table-column align="center" fixed="right" label="操作" width="180" header-align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="editHistoryCourse('editor',scope.row.id)">编辑</el-button>
<el-popconfirm title="确定删除吗？" style="margin:0 10px" @confirm="deleteList(scope.row.id)">
@ -59,6 +65,7 @@ export default {
return {
select: {
course_name: '',
type: '',
page: 1,
page_size: 10
},
@ -156,13 +163,28 @@ export default {
page_size: this.select.page_size,
page: this.select.page
}
const filter = []
if (this.select.course_name) {
params.filter = [{
filter.push({
key: 'course_name',
op: 'like',
value: this.select.course_name
}]
})
}
if (this.select.type !== '' && this.select.type !== null) {
filter.push({
key: 'type',
op: 'eq',
value: this.select.type
})
}
if (filter.length > 0) {
params.filter = filter
}
const res = await index(params, false)
this.list = res.data
this.total = res.total

2
src/views/stockCompany/index.vue
Unescape View File

@ -12,6 +12,7 @@
<div style="width:250px">
<el-date-picker
v-model="stockDates"
unlink-panels
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
@ -25,6 +26,7 @@
<div style="width:250px">
<el-date-picker
v-model="enrollmentDates"
unlink-panels
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"

4
src/views/student/black.vue
Unescape View File

@ -47,7 +47,7 @@
</div>
<div style="width:250px">
<el-date-picker v-model="birthdayDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
<el-date-picker unlink-panels v-model="birthdayDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width:100%" @change="changeBirthdayDates" type="daterange" range-separator="至"
start-placeholder="出生日期" end-placeholder="出生日期">
</el-date-picker>
@ -102,7 +102,7 @@
</div>
<div style="width:250px">
<el-date-picker v-model="companyDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
<el-date-picker unlink-panels v-model="companyDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width:100%" @change="changeCompanyDates" type="daterange" range-separator="至"
start-placeholder="公司成立日期" end-placeholder="公司成立日期">
</el-date-picker>

2079
src/views/student/index.vue
View File

File diff suppressed because it is too large Load Diff

4
src/views/student/schoolmate.vue
Unescape View File

@ -52,7 +52,7 @@
</el-select>
</div>
<div style="width:250px">
<el-date-picker v-model="birthdayDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
<el-date-picker unlink-panels v-model="birthdayDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width:100%" @change="changeBirthdayDates" type="daterange" range-separator="至"
start-placeholder="出生日期" end-placeholder="出生日期">
</el-date-picker>
@ -106,7 +106,7 @@
</el-select>
</div>
<div style="width:250px">
<el-date-picker v-model="companyDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
<el-date-picker unlink-panels v-model="companyDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width:100%" @change="changeCompanyDates" type="daterange" range-separator="至"
start-placeholder="公司成立日期" end-placeholder="公司成立日期">
</el-date-picker>

1615
src/views/student/schoolmateCompany.vue
View File

File diff suppressed because it is too large Load Diff

4
src/views/student/search.vue
Unescape View File

@ -48,7 +48,7 @@
</div>
<div style="width:250px">
<el-date-picker v-model="birthdayDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
<el-date-picker unlink-panels v-model="birthdayDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width:100%" @change="changeBirthdayDates" type="daterange" range-separator="至"
start-placeholder="出生日期" end-placeholder="出生日期">
</el-date-picker>
@ -116,7 +116,7 @@
</el-select>
</div>
<div style="width:250px">
<el-date-picker v-model="companyDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
<el-date-picker unlink-panels v-model="companyDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width:100%" @change="changeCompanyDates" type="daterange" range-separator="至"
start-placeholder="公司成立日期" end-placeholder="公司成立日期">
</el-date-picker>

6
src/views/survey/components/SurveyResultsDialog.vue
Unescape View File

@ -57,14 +57,14 @@
<!-- 题目分析 -->
<div v-if="questions && questions.length > 0">
<div v-for="(q, idx) in questions" :key="q.id" class="question-analysis">
<div class="question-header">
<div class="question-header">
<div class="question-title-wrapper">
<div class="question-title">
<span class="question-number">{{ idx + 1 }}.</span>
{{ q.name }}
<span v-if="q.rule && q.rule.includes('required')" class="required-mark">*</span>
</div>
<div class="question-meta">
<div class="question-meta">
<span class="meta-tag">题型：{{ getQuestionTypeText(q.edit_input) }}</span>
<span v-if="q.course_content" class="meta-tag">
<i class="el-icon-document"></i> {{ q.course_content.theme }}
@ -297,7 +297,7 @@
</div>
<div slot="footer">
<el-button @click="detailDialogVisible = false">关闭</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
</template>

Write Preview
Loading…
Cancel
Save