feat: 流程详情通过instanceId获取

src/api/flow/processTask.ts

@@ -12,7 +12,6 @@ const api = {
 	consentTask: '/v1/process-task/consent', // 审批同意
 	rejectionTask: '/v1/process-task/rejection', // 审批拒绝
 	reviewTask: '/v1/process-task/comment', // 评论审批
-	approvalInfo: '/v1/process-task/approval-info', // 审批详情
 	appendNode: '/v1/process-task/append-node', // 加签审批
 	transfer: '/v1/process-task/transfer', // 转交任务
 	claimProcess: '/v1/process-task/claim', // 认领任务
@@ -101,14 +100,6 @@ export function processReviewTaskApi(data: any): AxiosPromise {
 	})
 }
 
-// 审批详情
-export function processApprovalInfoApi(taskId: string): AxiosPromise {
-	return request({
-		url: `${api.approvalInfo}-${taskId}`,
-		method: 'post'
-	})
-}
-
 // 加签审批
 export function processAppendNodeApi(data: any): AxiosPromise {
 	return request({
@@ -128,10 +119,11 @@ export function processTransferApi(data: any): AxiosPromise {
 }
 
 // 查看审批信息
-export function processTaskApprovalInfo(taskId: string): AxiosPromise {
+export function processTaskApprovalInfo(data: any): AxiosPromise {
 	return request({
-		url: `/v1/process-task/approval-info-${taskId}`,
-		method: 'post'
+		url: `/v1/process-task/approval-info`,
+		method: 'post',
+		data
 	})
 }
 
@@ -176,7 +168,6 @@ export default {
 	processConsentTaskApi,
 	processRejectionTaskApi,
 	processReviewTaskApi,
-	processApprovalInfoApi,
 	processTaskApprovalInfo,
 	processAppendNodeApi,
 	processTransferApi,

src/views/approve/components/approvedContent.vue

@@ -2,12 +2,12 @@
 	<div class="flow-detail-content">
 		<div class="flow-detail-container">
 			<!-- 值为空 -->
-			<div v-if="!currentTaskRow.taskId" class="flow-empty-detail-box">
+			<div v-if="!currentTaskRow.instanceId" class="flow-empty-detail-box">
 				<el-empty description="暂无数据" />
 			</div>
 
 			<!-- 值不为空 -->
-			<template v-if="currentTaskRow.taskId">
+			<template v-if="currentTaskRow.instanceId">
 				<!-- 1、头部信息 -->
 				<div class="flow-status-stamp">
 					<div class="flow-stamp-container">
@@ -167,7 +167,7 @@ import FlowStatusTag from '@/components/Flow/FlowStatusTag.vue'
 import FlowNodeAvatar from '@/components/Flow/FlowNodeAvatar.vue'
 import FlowTypeDot from '@/components/Flow/FlowTypeDot.vue'
 import { ChatLineSquare, Check, Close, Switch, DArrowLeft, Plus, Minus, More } from '@element-plus/icons-vue'
-import { processApprovalInfoApi, processTaskApprovalInfo, processClaimTaskApi, processRevokeTaskApi } from '@/api/flow/processTask'
+import { processTaskApprovalInfo, processClaimTaskApi, processRevokeTaskApi } from '@/api/flow/processTask'
 import { formatTimestamp } from '@/utils/datetime'
 import ReviewDialog from './reviewDialog'
 import AddSignDialog from './addSignDialog'
@@ -288,14 +288,14 @@ const openComment = async (visibleType, item) => {
  */
 const getTaskDetail = () => {
 	const cur = currentTaskRow.value || {}
-	processApprovalInfoApi(cur.taskId).then(data => {
-		// console.log(JSON.stringify(data))
-		activeData.value = data
-	})
 	// 提交的表单 数据展示
 	validateForm.value.loading = true
-	processTaskApprovalInfo(cur.taskId)
+	processTaskApprovalInfo({
+		taskId: cur.taskId,
+		instanceId: cur.instanceId
+	})
 		.then(data => {
+			activeData.value = data
 			console.log(data, 'data.......')
 			// validateForm.value.origin = data
 			try {
@@ -352,19 +352,13 @@ const claimTaskEv = async () => {
 	console.log(res, 'res====')
 }
 
-/** 撤回审批 **/
-const withDrawTaskEv = async () => {
-	const res = await processRevokeTaskApi({ instanceId: currentTaskRow.value.instanceId })
-	console.log(res)
-}
-
 /**
- * 监听同级子组件的taskId的值变化 这里可能也有实例Id
- * 1、监听taskId的值变化，如果值有变化，则重新获取审批详情
- * 2、如果taskId没有值，则不请求接口，暂时暂无数据img
+ * 监听同级子组件的instanceId的值变化 这里可能也有实例Id
+ * 1、监听instanceId的值变化，如果值有变化，则重新获取审批详情
+ * 2、如果instanceId没有值，则不请求接口，暂时暂无数据img
  */
 watch(
-	() => currentTaskRow.value.taskId,
+	() => currentTaskRow.value.instanceId,
 	(nValue, oValue) => {
 		if (!nValue) return
 		nextTick(() => {

src/views/approve/components/approvedItem.vue

@@ -22,11 +22,11 @@
 		<!-- 内容值 -->
 		<div v-infinite-scroll="load" :infinite-scroll-disabled="disabledInfinite" class="flow-list-box">
 			<div
-				v-for="(i, index) in satelliteList"
-				:key="i.taskId"
+				v-for="(i) in satelliteList"
+				:key="i.instanceId"
 				class="item-box"
-				:class="[activeItem === index ? 'item-box-choosed' : '']"
-				@click="getTaskDetail(i, index)"
+				:class="[i.instanceId === taskProcessInfo.currentTaskRow.instanceId ? 'item-box-choosed' : '']"
+				@click="getTaskDetail(i)"
 			>
 				<div class="flow-card-box flow-card-box-hoverable">
 					<!--头部-->
@@ -92,8 +92,6 @@ const props = defineProps({
 
 // store值
 const taskProcessInfo = useTaskProcessStore()
-
-const activeItem = ref(null)
 const input3 = ref('')
 // 下拉滚动属性值 start
 const loading = ref(false) // loading
@@ -160,8 +158,7 @@ const getPagedSatellites = async () => {
 }
 
 // 点击当前实例的具体
-const getTaskDetail = (item, index) => {
-	activeItem.value = index
+const getTaskDetail = item => {
 	taskProcessInfo.setCurrentTaskRow(item)
 }
 

src/views/approve/components/reviewDialog.vue

@@ -64,7 +64,7 @@ const $myEmit = defineEmits(['update:modelValue', 'successCb'])
 // 提交
 const submitForm = () => {
 	btnDisabled.value = true
-	const formData = { ...form, taskId: props.taskId }
+	const formData = { ...form, taskId: props.taskId, instanceId: props.instanceId }
 	formRef.value
 		.validate()
 		.then(async valid => {
@@ -73,7 +73,7 @@ const submitForm = () => {
 				if (flag) {
 					await processReviewTaskApi(formData)
 				} else {
-					await processRevokeTaskApi({ ...formData, instanceId: props.instanceId })
+					await processRevokeTaskApi(formData)
 				}
 				$myEmit('successCb')
 				closeDialog()