diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue index 950c0c3b..35f56bef 100644 --- a/src/components/project/BatchLecturer.vue +++ b/src/components/project/BatchLecturer.vue @@ -18,10 +18,22 @@
选择讲师费汇总:{{payableExpense.toFixed(2)||0}}元
+
+
+ +
+
+ +
+
+ 搜索 + 重置 +
+
props.visible,(val)=>{ selectsData.value = [] } }) +const nameUserNo = ref(null) +const dateValue = ref(null) +const searchTrue = ref(false) +const searchList = ref([]) +const resetData = () => { + nameUserNo.value = null + dateValue.value = null + searchData(false) +} +const searchData = (val) => { + searchTrue.value = val + if(!nameUserNo.value&&!dateValue.value){ + searchList.value = tableData.value; + return + } + //搜索 数组expenseList.value 参数名字或者工号:nameUserNo.value 日期:dateValue.value + const filteredList = tableData.value.filter(item => { + const isNameMatch = (item.name + item.userNo).includes(nameUserNo.value); + const teachingDateTimestamp = new Date(item.teachingDate).getTime(); + if(dateValue.value==null){ + return isNameMatch + } + const startDateTimestamp = new Date(dateValue.value[0]).getTime(); + const endDateTimestamp = new Date(dateValue.value[1]).getTime(); + const isDateInRange = teachingDateTimestamp >= startDateTimestamp && teachingDateTimestamp <= endDateTimestamp; + if(nameUserNo.value&&startDateTimestamp&&endDateTimestamp){ + return isNameMatch && isDateInRange; + } + return isNameMatch || isDateInRange; + }); + searchList.value = filteredList; +} const loading = ref(false) const selectedRowKeys = ref([]) const selectsData = ref([]); diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue index 8a62c051..9c151d9d 100644 --- a/src/components/project/ConfirmLecturer.vue +++ b/src/components/project/ConfirmLecturer.vue @@ -30,7 +30,7 @@
-
+
{ + customRender: ({text,record})=>{ return ( - text || '-' + text ?
否({text})
:
是({{1:'一',2:'二',3:'三'}[record.code]}级审批)
) }, },