diff --git a/src/components/project/BatchLecturer.vue b/src/components/project/BatchLecturer.vue index 83dd29bd..7cc2a42e 100644 --- a/src/components/project/BatchLecturer.vue +++ b/src/components/project/BatchLecturer.vue @@ -16,7 +16,7 @@
-
选择讲师费汇总:{{payableExpense||0}}元
+
选择讲师费汇总:{{payableExpense.toFixed(2)||0}}元
{return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}}, }, { diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue index 18116de5..a890c48d 100644 --- a/src/components/project/ConfirmLecturer.vue +++ b/src/components/project/ConfirmLecturer.vue @@ -271,6 +271,8 @@ const columns = [ dataIndex: 'orgName', key: 'orgName', align: 'center', + ellipsis: true, + customCell :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}}, }, { diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue index 911cb9df..56653ed1 100644 --- a/src/components/project/OrgClass.vue +++ b/src/components/project/OrgClass.vue @@ -18,7 +18,6 @@ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" :placeholder="placeholder" :labelInValue="true" - allow-clear v-model:treeExpandedKeys="stuTreeExpandedKeys" :loading="orgLoading" :load-data="onLoadData" diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 436e547a..73a6a11d 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -264,6 +264,7 @@ const search = sessionStorage.getItem('searchApprlval') if(search){ state.searchParam = JSON.parse(search) + state.searchdate = state.searchParam.searchdate } getTableDate() }) @@ -546,6 +547,7 @@ let objA = { ...state.searchParam }; objA.beginTime = state.searchdate ? dayjs(state.searchdate[0]).format("YYYY-MM-DD") : "", objA.endTime = state.searchdate ? dayjs(state.searchdate[1]).format("YYYY-MM-DD") : "", + delete objA.searchdate expenseBillList(objA) .then((res) => { tableData.value = res.data.data.records @@ -619,6 +621,7 @@ } } const goDdit = (record) => { + state.searchParam.searchdate = state.searchdate sessionStorage.setItem('searchApprlval', JSON.stringify(state.searchParam)) router.push({ path:'/LecturerAppEdit',