diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index fc503f9d..b40f7629 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -72,7 +72,7 @@ export const recovery = (id) => http.post(`/admin/affiliation/recovery?id=${id}` //删除培训发生组织 export const affiliationDelById = (id)=>http.post(`/admin/affiliation/delById?id=${id}`) //停用启用培训发生组织 -export const isEnable = (obj) => http.post(`/admin/affiliation/isEnable?id=${obj.id}&status=${obj.status}`) +export const isEnable = (obj) => http.post(`/admin/affiliation/isEnable`,obj) //撤回培训发生组织 export const affiliatIsConfirm = (id) => http.post(`/admin/affiliation/isConfirm?id=${id}`) //讲师费统计详情 diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index fd8ef57c..cbcb6ccd 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -520,6 +520,10 @@ export default { label:item } }) + supperList.value.unshift({ + value: '', + label: '全部' + }) } }) } diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index d50d3a7f..7e1a6533 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -674,6 +674,10 @@ export default { array.push(obj); }); LecturerSystemList.value = array; + LecturerSystemList.value.unshift({ + value: "", + label: "全部" + }) } }) } @@ -706,6 +710,10 @@ export default { array.push(obj); }); getLevelList.value = array; + getLevelList.value.unshift({ + value: "", + label: "全部" + }) } }) } diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 9f2e7454..635cf95d 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -64,7 +64,7 @@ - @@ -659,6 +659,10 @@ export default { array.push(obj); }); LecturerSystemList.value = array; + LecturerSystemList.value.unshift({ + value: '', + label: '全部' + }) } console.log("获取讲师", LecturerSystemList); }) @@ -687,7 +691,7 @@ export default { { value: '1', label: "手动录入" }, ]) const scoreList = ref([ - // { value: '', label: "全部" }, + { value: '', label: "全部" }, { value: '90-100', label: "90-100" }, { value: '80-90', label: "80-90" }, { value: '70-80', label: "70-80" }, @@ -699,6 +703,7 @@ export default { { value: '10~20', label: "10~20" }, ]) const studysList = ref([ + { value: '', label: "全部" }, { value: '0-30', label: "0~30" }, { value: '0-50', label: "0~50" }, { value: '0-70', label: "0~70" }, diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 58ec5f0e..62a14aa4 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -387,6 +387,10 @@ array.push(obj); }); trainOrglist.value = array; + trainOrglist.value.unshift({ + value: '', + label: "全部" + }) } }) } @@ -400,7 +404,7 @@ ]) //认证状态0待确认 1待提交 2审核中 3审核通过 4.审核拒绝 const AuthenticationStatusList = ref([ - // { value: 0, label: "待确认" }, + { value: '', label: "全部" }, { value: 1, label: "待提交" }, { value: 2, label: "审核中" }, { value: 4, label: "审核拒绝" }, diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 33701967..aa95871c 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -699,6 +699,9 @@ value: item.id } }) + state.orgList.unshift({ + label: '全部', value: '' + }) }) } //费用类型 @@ -721,6 +724,7 @@ ]) //认证状态 const AuthenticationStatusList = ref([ + { value: '', label: "全部" }, { value: '0', label: "待确认" }, { value: '1', label: "待提交" }, { value: '2', label: "审核中" }, @@ -748,6 +752,10 @@ array.push(obj); }); lecturerSystemList.value = array; + lecturerSystemList.value.unshift({ + value: '', + label: '全部' + }) } }) } @@ -768,6 +776,10 @@ getAllLevelList().then((res) => { array.push(obj); }); getLevelList.value = array; + getLevelList.value.unshift({ + value: "", + label: "全部" + }) } }) } diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue index 6669d8e5..30eb8f49 100644 --- a/src/views/lecturer/LecturerFeeStatistics.vue +++ b/src/views/lecturer/LecturerFeeStatistics.vue @@ -378,6 +378,10 @@ export default { array.push(obj); }); TrainOrglist.value = array; + TrainOrglist.value.unshift({ + value: '', + label: "全部" + }) } console.log("获取发薪地",TrainOrglist); }) diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue index d234c097..7ee60546 100644 --- a/src/views/lecturer/MonthlyStatistics.vue +++ b/src/views/lecturer/MonthlyStatistics.vue @@ -305,8 +305,8 @@ export default { }, { title: '开发课程时长 ', - dataIndex: 'expense', - key: 'expense', + dataIndex: 'teachingDevelop', + key: 'teachingDevelop', ellipsis: true, align: "center", width: 160, diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue index a1509e0c..bc1f9bfd 100644 --- a/src/views/lecturer/Organization.vue +++ b/src/views/lecturer/Organization.vue @@ -41,8 +41,8 @@ 编辑 撤回 - 启用 - 停用 + 启用 + 停用