diff --git a/src/views/final/comp/RepeatModal.vue b/src/views/final/comp/RepeatModal.vue index b1201a6..3ad1f71 100644 --- a/src/views/final/comp/RepeatModal.vue +++ b/src/views/final/comp/RepeatModal.vue @@ -61,74 +61,98 @@ defineExpose({ diff --git a/src/views/final/comp/copy.vue b/src/views/final/comp/copy.vue new file mode 100644 index 0000000..b1201a6 --- /dev/null +++ b/src/views/final/comp/copy.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/src/views/message/content/List.vue b/src/views/message/content/List.vue index 6358f09..3f4e740 100644 --- a/src/views/message/content/List.vue +++ b/src/views/message/content/List.vue @@ -77,7 +77,8 @@ function switchTab(type: number) { } function goFinalDetail(row) { - router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } }) + console.log(row) + router.push({ name: 'final-detail', query: { id: row.tag.taskId, packageid: row.packageid } }) } function goDetail(item) { diff --git a/src/views/task/content/History.vue b/src/views/task/content/History.vue index 104c805..f4be090 100644 --- a/src/views/task/content/History.vue +++ b/src/views/task/content/History.vue @@ -27,6 +27,27 @@ watch( }, ) +function getItemLabel(states) { + const list = [ + { + value: 1, + label: '待审批', + }, + { + value: 2, + label: '通过', + }, + { + value: 3, + label: '不通过', + }, + ] + const item: any = list.find( + (item: any) => item.value == states, + ) + return item ? item.label : '' +} + function getLabel(states) { const item: any = izstatusList.value.find( (item: any) => item.value == states, @@ -91,7 +112,7 @@ onMounted(() => { 审批人:{{ item.username }}
- 审批结果:{{ getLabel(item.statshis) }} + 审批结果:{{ getItemLabel(item.statshis) }}
备注:{{ item.taskcomment }}