Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage

This commit is contained in:
zhangsir
2024-11-28 19:04:09 +08:00

View File

@@ -23,38 +23,38 @@
<div class="addTime">授课日期</div>
<a-range-picker v-model:value="searchdate" style="width: 420px" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
separator="至" :placeholder="[' 开始时间', ' 结束时间']" v-on:keydown.enter="enterPressHadlerSearch" />
<!-- @change="searchTimeChange" -->
<!-- @change="searchTimeChange" -->
</div>
</a-form-item>
<!-- <div style="width:100%"></div> -->
<a-form-item class="select">
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.createFrom" placeholder="录入类型"
<a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.createFrom" placeholder="录入类型"
:options="entryTypeList" allowClear v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
</a-form-item>
<a-form-item class="select">
<a-select style="width: 230px" v-model:value="searchParam.courseStatus" placeholder="开课状态"
:options="AuthenticationStatusList" allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
<a-select style="width: 235px" v-model:value="searchParam.courseStatus" placeholder="开课状态"
:options="AuthenticationStatusList" a llowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
</a-form-item>
<a-form-item class="select">
<a-select style="width: 230px" placeholder="请选择讲师体系" v-model:value="searchParam.tSystemId"
<a-select style="width: 235px" placeholder="请选择讲师体系" v-model:value="searchParam.tSystemId"
:options="LecturerSystemList" allowClear showSearch @change="changetlevel"
v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
</a-form-item>
<a-form-item class="select">
<!-- <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.sourceBelongId"
<!-- <a-select style="width: 235px" placeholder="请选择所属组织" v-model:value="searchParam.sourceBelongId"
:options="getOrganizationList" allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
</a-select> -->
<OrgClass v-model:value="searchParam.orgId" :placeholder="'请选择讲师组织'"
style="width: 230px"
style="width: 235px"
></OrgClass>
</a-form-item>
<a-form-item class="select">
<a-tree-select style="width: 230px" :fieldNames="{
<a-tree-select style="width: 235px" :fieldNames="{
children: 'children',
label: 'name',
value: 'code',
@@ -66,13 +66,13 @@
</a-form-item>
<!-- <div style="width: 100%;"></div> -->
<a-form-item class="select">
<a-select style="min-width: 230px ; height: auto ;margin-bottom:20px" v-model:value="score" placeholder="请选择评分"
<a-select style="min-width: 235px ; height: auto ;margin-bottom:20px" v-model:value="score" placeholder="请选择评分"
:options="scoreList" allowClear showSearch mode="multiple" @change="scoreChange"
v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
</a-form-item>
<a-form-item class="select">
<a-select style="width: 230px" v-model:value="searchParam.studys" placeholder="授课人数" :options="studysList"
<a-select style="width: 235px" v-model:value="searchParam.studys" placeholder="授课人数" :options="studysList"
allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
</a-select>
<!-- <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
@@ -526,7 +526,7 @@ export default {
pageNo: 1,
pageSize: 1000
}
getOrganization(obj).then((res) => {
getOrganization(obj).then ((res) => {
if (res.data.code === 200) {
let arr = res.data.data.records;
let array = [];
@@ -822,7 +822,7 @@ export default {
sourceBelongId: [{ required: true, message: '', log: '课程归属组织不能为空' }],
teachingDate: [{ required: true, message: '', log: '授课日期不能为空' }],
teaching: [{ required: true, message: '', log: '授课时长不能为空' }],
courseStatus: [{ required: true, message: '', log: '开课状态不能为空' }],
courseStatus: [{ required: true, message: '', log: '开课状态不能为空' }],
}
//展开切换
const handlemoreid = () => {
@@ -867,7 +867,7 @@ export default {
const searchReset = () => {
state.searchdate = undefined,
state.score = undefined
state.searchParam = {
state.searchParam = {
recordType: 1,
pageNo: 1,
pageSize: 10,