|
@@ -394,7 +394,12 @@ export const memoManageMixin = {
|
|
|
} else {
|
|
} else {
|
|
|
_url = '/api/costProjectMemo/v1/pageIndexList'
|
|
_url = '/api/costProjectMemo/v1/pageIndexList'
|
|
|
}
|
|
}
|
|
|
- delete params.memoDate
|
|
|
|
|
|
|
+ if (this.activeTab == 'project') {
|
|
|
|
|
+ delete params.memoDate
|
|
|
|
|
+ } else if (this.activeTab == 'calendar') {
|
|
|
|
|
+ params.memoDate = this.searchParams.memoDate
|
|
|
|
|
+ delete params.year
|
|
|
|
|
+ }
|
|
|
const res = await getMemoList(_url, params)
|
|
const res = await getMemoList(_url, params)
|
|
|
if (res.value && res.value.records.length > 0) {
|
|
if (res.value && res.value.records.length > 0) {
|
|
|
this.memoList = res.value.records || []
|
|
this.memoList = res.value.records || []
|
|
@@ -406,6 +411,9 @@ export const memoManageMixin = {
|
|
|
// 在列表数据设置完成后,只调用一次详情接口获取所有需要的详情
|
|
// 在列表数据设置完成后,只调用一次详情接口获取所有需要的详情
|
|
|
await this.getTasksByDateList()
|
|
await this.getTasksByDateList()
|
|
|
this.listTotal = res.value.total || 0
|
|
this.listTotal = res.value.total || 0
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.memoList = []
|
|
|
|
|
+ this.listTotal = 0
|
|
|
}
|
|
}
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
console.error('获取数据失败:', error)
|
|
console.error('获取数据失败:', error)
|
|
@@ -452,9 +460,8 @@ export const memoManageMixin = {
|
|
|
this.searchParams.content = ''
|
|
this.searchParams.content = ''
|
|
|
this.searchParams.page = 1
|
|
this.searchParams.page = 1
|
|
|
if (tab.name == 'calendar') {
|
|
if (tab.name == 'calendar') {
|
|
|
- ;(this.currentYear = new Date().getFullYear()),
|
|
|
|
|
- (this.currentMonth = new Date().getMonth() + 1), // 月份从1开始
|
|
|
|
|
- this.setCalendarTitle()
|
|
|
|
|
|
|
+ this.setCalendarTitle()
|
|
|
|
|
+ this.handleSearch()
|
|
|
} else {
|
|
} else {
|
|
|
this.handleSearch()
|
|
this.handleSearch()
|
|
|
}
|
|
}
|