diff --git a/pages/checklist/detail.vue b/pages/checklist/detail.vue index ed5c940..59b1ee4 100644 --- a/pages/checklist/detail.vue +++ b/pages/checklist/detail.vue @@ -104,7 +104,7 @@ const checkItems = ref([]) const typeMap = { 1: '日常检查', 2: '专项检查', 3: '设备检查' } const cycleMap = { 1: '每天一次', 2: '每周', 3: '每月', 4: '每季度' } -const runModeMap = { 1: '单人完成', 2: '全员', 3: '指定分组' } +const runModeMap = { 1: '单人完成', 2: '全员', 3: '指定分组', 4: '排班模式' } const weekendMap = { 1: '包含周末', 2: '不包含周末' } const typeLabel = computed(() => detail.value.typeName || typeMap[detail.value.type] || '-') @@ -112,8 +112,16 @@ const cycleLabel = computed(() => detail.value.cycleName || cycleMap[detail.valu const runModeLabel = computed(() => detail.value.runModeName || runModeMap[detail.value.runMode] || '-') const weekendLabel = computed(() => detail.value.isWeekendName || weekendMap[detail.value.isWeekend] || '-') const executorLabel = computed(() => { - if (Number(detail.value.runMode) === 2) return '全员' - return detail.value.executorName || '-' + const runMode = Number(detail.value.runMode) + if (runMode === 2) return '全员' + if (runMode === 4) { + const rosterItems = detail.value.rosterItems || [] + if (rosterItems.length > 0) { + return rosterItems.map((item) => item.identityName).filter(Boolean).join('、') || '-' + } + return '-' + } + return detail.value.executorIdentityName || detail.value.executorName || '-' }) const formatDate = (value) => { diff --git a/pages/editchecklist/editchecklist.vue b/pages/editchecklist/editchecklist.vue index 5a9de86..5f00e2f 100644 --- a/pages/editchecklist/editchecklist.vue +++ b/pages/editchecklist/editchecklist.vue @@ -1,4 +1,5 @@