diff --git a/src/views/oa_CopyMe/index.vue b/src/views/oa_CopyMe/index.vue index 677670c..06fc077 100644 --- a/src/views/oa_CopyMe/index.vue +++ b/src/views/oa_CopyMe/index.vue @@ -14,7 +14,7 @@ <el-table-column label="备注" prop="remarks" show-overflow-tooltip /> <el-table-column label="操作" width="120" fixed="right"> <template #default="{ row }"> - <el-button type="primary" link @click="handDetail(row.id)"> + <el-button type="primary" link @click="handDetail(row)"> 详情 </el-button> </template> @@ -26,7 +26,7 @@ </div> </el-card> <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()" - @close="showDetail = false, getLists()" /> + @close="showDetail = false, getLists()" :typeName="typeName" /> </div> </template> @@ -34,8 +34,6 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiOaoaApproveCopy } from '@/api/oa_Initiate' -import { timeFormat } from '@/utils/util' -import feedback from '@/utils/feedback' import detailPopup from '@/views/oa_Initiate/detail.vue' import { apiOaoaApproveDetail } from "@/api/oa_Initiate" @@ -49,6 +47,7 @@ const queryParams = reactive({ title: '', status: '' }) +const typeName = ref('') // 选中数据 const selectData = ref<any[]>([]) @@ -67,8 +66,9 @@ const { pager, getLists, resetParams, resetPage } = usePaging({ params: queryParams }) -const handDetail = async (id: any) => { - let res = await apiOaoaApproveDetail({ id }) +const handDetail = async (row: any) => { + typeName.value = row.type_name + let res = await apiOaoaApproveDetail({ id: row.id }) showDetail.value = true await nextTick() detailRef.value?.open() diff --git a/src/views/oa_Deal/index.vue b/src/views/oa_Deal/index.vue index d6f377f..0395420 100644 --- a/src/views/oa_Deal/index.vue +++ b/src/views/oa_Deal/index.vue @@ -47,8 +47,6 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiOaoaApprovelst } from '@/api/oa_Initiate' -import { timeFormat } from '@/utils/util' -import feedback from '@/utils/feedback' import detailPopup from '@/views/oa_Initiate/detail.vue' import { apiOaoaApproveDetail } from "@/api/oa_Initiate"