From d76e720ceb6fc100049fbdd6adca9c46e7b8ee22 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 28 Nov 2024 16:45:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/ConfirmLecturer.vue | 5 ++++- src/views/lecturer/LecturerFee.vue | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue index ea9e58bd..18116de5 100644 --- a/src/components/project/ConfirmLecturer.vue +++ b/src/components/project/ConfirmLecturer.vue @@ -240,7 +240,10 @@ const searchData = (val) => { const startDateTimestamp = new Date(dateValue.value[0]).getTime(); const endDateTimestamp = new Date(dateValue.value[1]).getTime(); const isDateInRange = teachingDateTimestamp >= startDateTimestamp && teachingDateTimestamp <= endDateTimestamp; - return isNameMatch && isDateInRange; + if(nameUserNo.value&&startDateTimestamp&&endDateTimestamp){ + return isNameMatch && isDateInRange; + } + return isNameMatch || isDateInRange; }); searchList.value = filteredList; } diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 348429a4..d8ce8698 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -588,12 +588,15 @@ //课程类型 const OnTheJobStatusList = ref([ { value: '', label: "全部" }, - { value: 0, label: "面授课" }, - { value: 1, label: "在线课" }, + { value: '0', label: "面授课" }, + { value: '1', label: "在线课" }, + { value: '2', label: "课程开发" }, + { value: '3', label: "作业员入模培训" }, + { value: '4', label: "其他" }, ]) //认证状态 const AuthenticationStatusList = ref([ - { value: 0, label: "待提交" }, + { value: 0, label: "待确认" }, { value: 1, label: "待审核" }, { value: 2, label: "审核中" }, { value: 4, label: "审核拒绝" },