|
|
@@ -261,6 +261,14 @@ const currentSummaryMeeting = computed(() => {
|
|
|
)
|
|
|
})
|
|
|
|
|
|
+const currentWorkloadMeeting = computed(() =>
|
|
|
+ isSummaryMode.value ? currentSummaryMeeting.value : activeMeetings.value[0]
|
|
|
+)
|
|
|
+
|
|
|
+const workloadScopeName = computed(() =>
|
|
|
+ isSummaryMode.value ? currentSummaryScopeName.value : companyDisplayName.value || '公司整体'
|
|
|
+)
|
|
|
+
|
|
|
const meetingSeriesModel = computed({
|
|
|
get: () => props.meeting.meetingSeries,
|
|
|
set: (meetingSeries) => emits('update:meeting', { ...props.meeting, meetingSeries })
|
|
|
@@ -470,7 +478,7 @@ const appendWorkloadProperty = (
|
|
|
|
|
|
const currentSummaryWorkloadProperties = computed(() =>
|
|
|
getSortedExtProperties(
|
|
|
- (currentSummaryMeeting.value?.extProperty || []).filter(
|
|
|
+ (currentWorkloadMeeting.value?.extProperty || []).filter(
|
|
|
(item) => !isNextExtProperty(item) && isVisibleWorkloadExtProperty(item)
|
|
|
)
|
|
|
)
|
|
|
@@ -551,9 +559,8 @@ const getSummaryWorkloadIcon = (item: ExtPropertyItem) => {
|
|
|
|
|
|
const showSummaryWorkload = computed(
|
|
|
() =>
|
|
|
- isSummaryMode.value &&
|
|
|
props.type === 'view' &&
|
|
|
- Boolean(props.companyFilterValue) &&
|
|
|
+ (!isSummaryMode.value || Boolean(props.companyFilterValue)) &&
|
|
|
currentSummaryWorkloadProperties.value.length > 0
|
|
|
)
|
|
|
|
|
|
@@ -577,7 +584,7 @@ const formatWorkloadPropertyValue = (item: ExtPropertyItem) => {
|
|
|
return `${formatSummaryNumber(numericValue)}${item.unit || ''}`
|
|
|
}
|
|
|
|
|
|
-const workloadDetailColumns = computed(() => currentSummaryMeeting.value?.details || [])
|
|
|
+const workloadDetailColumns = computed(() => currentWorkloadMeeting.value?.details || [])
|
|
|
const workloadDetailRows = computed(() => {
|
|
|
const propertyMap = new Map<string, ExtPropertyItem>()
|
|
|
|
|
|
@@ -822,7 +829,7 @@ const getMeetingTableCellClassName = ({ column }: MeetingTableCellStyleProps) =>
|
|
|
|
|
|
<section v-if="showSummaryWorkload" class="meeting-workload-strip">
|
|
|
<div class="meeting-workload-strip__title">
|
|
|
- <span>{{ currentSummaryScopeName }}</span>
|
|
|
+ <span>{{ workloadScopeName }}</span>
|
|
|
<small>工作量完成情况</small>
|
|
|
<el-button
|
|
|
class="meeting-workload-strip__detail"
|
|
|
@@ -873,7 +880,7 @@ const getMeetingTableCellClassName = ({ column }: MeetingTableCellStyleProps) =>
|
|
|
|
|
|
<el-dialog
|
|
|
v-model="workloadDetailVisible"
|
|
|
- :title="`${currentSummaryScopeName}工作量完成情况详情`"
|
|
|
+ :title="`${workloadScopeName}工作量完成情况详情`"
|
|
|
class="meeting-workload-detail-dialog"
|
|
|
width="60%">
|
|
|
<div class="meeting-workload-detail">
|
|
|
@@ -1560,6 +1567,11 @@ const getMeetingTableCellClassName = ({ column }: MeetingTableCellStyleProps) =>
|
|
|
padding-top: 12px;
|
|
|
margin-top: 12px;
|
|
|
border-top: 1px solid var(--el-border-color-lighter);
|
|
|
+
|
|
|
+ :deep(.el-textarea__inner) {
|
|
|
+ color: #000;
|
|
|
+ -webkit-text-fill-color: #000;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.meeting-detail-table-view {
|