adtec-core-package 2.3.9 → 2.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.3.9",
+  "version": "2.4.0",
   "private": false,
   "type": "module",
   "scripts": {

package/src/api/workflow/workflowCommentApi.ts

@@ -1,20 +1,23 @@
-/**
- * 创建人：xux
- * 说明: 流程管理
- * 创建时间: 2024/10/9 上午9:16
- * 修改时间: 2024/10/9 上午9:16
- */
-
-import request from '../../utils/request'
-import { IWorkflowCommentVo } from 'adtec-core-package/src/interface/workflow/IWorkflowCommentVo'
-
-export default {
-  // 查询流程版本
-  getComment(businessId: string,taskId:string) {
-    return request.get<IWorkflowCommentVo>('/api/tm/workFlowComment/getComment', { businessId,taskId })
-  },
-  // 添加流程版本
-  addOrEditComment(data: IWorkflowCommentVo) {
-    return request.post<IWorkflowCommentVo>('/api/tm/workFlowComment/addOrEditComment', data)
-  },
-}
+/**
+ * 创建人：xux
+ * 说明: 流程管理
+ * 创建时间: 2024/10/9 上午9:16
+ * 修改时间: 2024/10/9 上午9:16
+ */
+
+import request from '../../utils/request'
+import { IWorkflowCommentVo } from 'adtec-core-package/src/interface/workflow/IWorkflowCommentVo'
+
+export default {
+  // 查询流程版本
+  getComment(businessId: string, taskId: string) {
+    return request.get<IWorkflowCommentVo>('/api/tm/workFlowComment/getComment', {
+      businessId,
+      taskId,
+    })
+  },
+  // 添加流程版本
+  addOrEditComment(data: IWorkflowCommentVo) {
+    return request.post<IWorkflowCommentVo>('/api/tm/workFlowComment/addOrEditComment', data)
+  },
+}

package/src/components/workflow/TaskOperation.vue

@@ -6,57 +6,59 @@
   <div ref="taskFlexRef">
     <el-flex align="center" justify="flex-end" v-loading="taskLoading">
       <slot name="left"></slot>
-      <el-button v-if="params?.cancelBtnText !== ''" @click="params?.cancelFunction">{{ params?.cancelBtnText ?? '取消' }}</el-button>
-      <el-button v-if="showProcessBtn"  type="info" @click="processShow = true">流程详情</el-button>
+      <el-button v-if="params?.cancelBtnText !== ''" @click="params?.cancelFunction">{{
+        params?.cancelBtnText ?? '取消'
+      }}</el-button>
+      <el-button v-if="showProcessBtn" type="info" @click="processShow = true">流程详情</el-button>
       <template v-if="isAssignee">
         <el-button type="primary" @click="openDialog('assignee')">指定执行人</el-button>
       </template>
       <template v-if="!isAssignee && task?.taskId && task?.operations">
-        <el-button
-          v-if="params?.saveBtnText"
-          type="primary"
-          @click="params?.saveFunction"
-        >{{ params?.saveBtnText }}</el-button
-        >
+        <el-button v-if="params?.saveBtnText" type="primary" @click="params?.saveFunction">{{
+          params?.saveBtnText
+        }}</el-button>
         <el-button
           v-if="task?.operations.indexOf('addMulti') > -1"
           type="warning"
           @click="openDialog('addMulti')"
-        >加签</el-button
+          >加签</el-button
         >
         <el-button
           v-if="task?.operations.indexOf('minusMulti') > -1"
           type="danger"
           @click="openDialog('minusMulti')"
-        >减签</el-button
+          >减签</el-button
         >
         <el-button
           v-if="task?.operations.indexOf('refuse') > -1 && params?.refuseBtnText !== ''"
           type="danger"
           @click="openDialog('refuse')"
-        >{{ params?.refuseBtnText ?? '终止' }}</el-button
+          >{{ params?.refuseBtnText ?? '终止' }}</el-button
         >
         <el-button
           v-if="task?.operations.indexOf('transfer') > -1 && params?.transferBtnText !== ''"
           type="warning"
           @click="openDialog('transfer')"
-        >{{ params?.transferBtnText ?? '转办' }}</el-button
+          >{{ params?.transferBtnText ?? '转办' }}</el-button
         >
         <el-button
           v-if="task?.operations.indexOf('back') > -1 && params?.backBtnText !== ''"
           type="danger"
           @click="openDialog('back')"
-        >{{ params?.backBtnText ?? '退回' }}</el-button
+          >{{ params?.backBtnText ?? '退回' }}</el-button
         >
         <el-button
           v-if="task?.operations.indexOf('complete') > -1 && params?.completeBtnText !== ''"
           type="primary"
           @click="openDialog('complete')"
-        >{{ params?.completeBtnText ?? '同意' }}</el-button
+          >{{ params?.completeBtnText ?? '同意' }}</el-button
         >
       </template>
       <slot name="right"></slot>
-      <select-assignee-dialog ref="assigneeRef" @success="selectAssigneeSuccess"></select-assignee-dialog>
+      <select-assignee-dialog
+        ref="assigneeRef"
+        @success="selectAssigneeSuccess"
+      ></select-assignee-dialog>
       <select-return-activity-dialog
         ref="returnActivityRef"
         @success="reloadTask"
@@ -66,9 +68,7 @@
         @open-assignee="openAssignee"
         @success="operSuccess"
       ></check-dialog>
-      <add-or-minus-multi-dialog
-        ref="addOrMinusMultiRef"
-      ></add-or-minus-multi-dialog>
+      <add-or-minus-multi-dialog ref="addOrMinusMultiRef"></add-or-minus-multi-dialog>
       <Teleport to="body">
         <process-detail-dialog v-model="processShow" :task="task"></process-detail-dialog>
       </Teleport>
@@ -76,10 +76,9 @@
   </div>
 </template>
 <script setup lang="ts">
-import { type PropType, ref, watch, watchEffect, onMounted, computed } from 'vue'
+import { computed, onMounted, type PropType, ref, watch } from 'vue'
 import workflowInstApi from '../../api/workflow/workflowInstApi'
 import type { IWfTaskVo } from '../../interface/workflow/IWfTaskVo'
-import { ElMessage, ElLoading  } from 'element-plus'
 import SelectAssigneeDialog from './components/SelectAssigneeDialog.vue'
 import SelectReturnActivityDialog from './components/SelectReturnActivityDialog.vue'
 import ProcessDetailDialog from './components/ProcessDetailDialog.vue'
@@ -89,8 +88,9 @@ import type { ITaskOperate } from '../../hooks/userWorkflowHooks'
 import frameworkUtils from '../../utils/FrameworkUtils.ts'
 import { userInfoStore } from '../../stores/userInfoStore.ts'
 import WujieVue from 'wujie-vue3'
+
 const processShow = ref(false)
-const taskFlexRef = ref<HTMLElement | null>(null);
+const taskFlexRef = ref<HTMLElement | null>(null)
 const $props = defineProps({
   // modelValue: { type: Object, required: false },
   taskId: { type: String, required: true },
@@ -137,20 +137,24 @@ const openDialog = async (type: string) => {
       const res = await $props.params?.beforeCompleteFunction({
         taskId: task.value.taskId,
         userId: userInfoStore().getUserInfo.id,
-        comment: '同意。'
+        comment: '同意。',
+        procInsId: task.value.procInsId,
+        procDefKey: task.value.procDefKey,
       })
       if (res === false) return
       if (res?.readonly) {
         commentReadonly = true
       }
-      task.value = {...task.value,...res}
+      task.value = { ...task.value, ...res }
     } catch (err: any) {
       return
     }
   }
-  if (type === 'addMulti' || type === 'minusMulti') { //加减签
+  if (type === 'addMulti' || type === 'minusMulti') {
+    //加减签
     addOrMinusMultiRef.value?.open(task.value.taskId, type)
-  } else if (type === 'assignee') { //指定审批人
+  } else if (type === 'assignee') {
+    //指定审批人
     openAssignee(task.value.taskId)
   } else {
     checkRef.value?.open(task.value, type, $props?.params, commentReadonly)
@@ -174,28 +178,31 @@ const operSuccess = (taskVo: IWfTaskVo) => {
 }
 
 // 向上定义递归查找函数
-const findParentWithClass = (element: HTMLElement | null, targetClass: string): HTMLElement | null => {
+const findParentWithClass = (
+  element: HTMLElement | null,
+  targetClass: string,
+): HTMLElement | null => {
   if (!element) {
-    return null;
+    return null
   }
   if (element.classList?.contains(targetClass)) {
-    return element;
+    return element
   }
-  return findParentWithClass(element.parentElement, targetClass);
+  return findParentWithClass(element.parentElement, targetClass)
 }
 // 定义查找 todo-dialog-class 元素的方法
 const findTodoDialog = () => {
-  const targetElement = findParentWithClass(taskFlexRef.value as HTMLElement, 'todo-dialog-class');
+  const targetElement = findParentWithClass(taskFlexRef.value as HTMLElement, 'todo-dialog-class')
   if (targetElement) {
-    console.log('找到满足条件的元素:', targetElement);
+    console.log('找到满足条件的元素:', targetElement)
   } else {
-    console.log('未找到满足条件的元素');
+    console.log('未找到满足条件的元素')
   }
   return targetElement
 }
 let parentDom: any
 onMounted(() => {
-  parentDom = findTodoDialog();
+  parentDom = findTodoDialog()
   reloadTask()
 })
 let loading: any
@@ -236,6 +243,5 @@ watch(() => $props.taskId, reloadTask)
 //     reloadTask()
 //   }
 // })
-
 </script>
 <style scoped lang="scss"></style>

package/src/components/workflow/components/CheckDialog.vue

@@ -74,9 +74,18 @@
           </el-flex>
         </el-form-item>
         <el-form-item v-if="showSelPersons" label="下一步审核人" required>
-          <el-select v-model="task.variables.nextChecker" multiple placeholder="请选择下一步审核人"
-                     :disabled="task.variables.persons?.length === 1">
-            <el-option v-for="item in task.variables.persons" :key="item.code" :label="item.name" :value="item.code">
+          <el-select
+            v-model="task.variables.nextChecker"
+            :disabled="task.variables.persons?.length === 1"
+            multiple
+            placeholder="请选择下一步审核人"
+          >
+            <el-option
+              v-for="item in task.variables.persons"
+              :key="item.code"
+              :label="item.name"
+              :value="item.code"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -107,21 +116,21 @@
   </el-dialog>
 </template>
 <script setup lang="ts">
-import {Search} from '@element-plus/icons-vue'
+import { Search } from '@element-plus/icons-vue'
 import UserTag from '../../../components/bpmntree/components/UserSelector/UserTag.vue'
-import {ref, computed} from 'vue'
-import type {IWfTaskVo} from '../../../interface/workflow/IWfTaskVo'
-import type {ISysUserInfo} from '../../../interface/ISysUserInfo'
-import type {IWfReturnNodeVo} from '../../../interface/workflow/IWfReturnNodeVo'
+import { computed, ref } from 'vue'
+import type { IWfTaskVo } from '../../../interface/workflow/IWfTaskVo'
+import type { ISysUserInfo } from '../../../interface/ISysUserInfo'
+import type { IWfReturnNodeVo } from '../../../interface/workflow/IWfReturnNodeVo'
 import workflowInstApi from '../../../api/workflow/workflowInstApi'
-import {ElMessage} from 'element-plus'
+import { ElMessage } from 'element-plus'
 import UserSelect from '../../../components/business/userSelect.vue'
 import ElUploads from '../../../components/upload/ElUploads.vue'
-import {userInfoStore} from '../../../stores/userInfoStore'
-import type {ISysUploadFiles} from '../../../interface/ISysUploadFiles'
+import { userInfoStore } from '../../../stores/userInfoStore'
+import type { ISysUploadFiles } from '../../../interface/ISysUploadFiles'
 import documentApi from '../../../api/DocumentApi'
 import frameworkUtils from '../../../utils/FrameworkUtils.ts'
-import type {ITaskOperate} from '@/hooks/userWorkflowHooks.ts'
+import type { ITaskOperate } from '@/hooks/userWorkflowHooks.ts'
 
 const emit = defineEmits(['success', 'openAssignee'])
 const dialogVisible = ref(false)
@@ -131,7 +140,7 @@ const dialogLabel = ref('')
 const dialogType = ref('')
 const task = ref()
 const taskFiles = ref<ISysUploadFiles[]>([])
-const transferUser = ref<ISysUserInfo>({id: '', userName: ''})
+const transferUser = ref<ISysUserInfo>({ id: '', userName: '' })
 const returnData = ref<IWfReturnNodeVo[]>([])
 const selectActivity = ref<string>('')
 const taskOperate = ref<ITaskOperate>()
@@ -139,7 +148,12 @@ const readonly = ref(false)
 const showSelPersons = computed(() => {
   return task.value.variables?.persons?.length > 0
 })
-const open = async (taskVo: IWfTaskVo, type: string, params: ITaskOperate, commentReadonly: boolean) => {
+const open = async (
+  taskVo: IWfTaskVo,
+  type: string,
+  params: ITaskOperate,
+  commentReadonly: boolean,
+) => {
   if (commentReadonly) {
     readonly.value = true
   } else {
@@ -228,7 +242,9 @@ const handleComplete = async () => {
         taskId: task.value.taskId,
         userId: userInfoStore().getUserInfo.id,
         comment: task.value.comment,
-        variables: task.value.variables
+        procInsId: task.value.procInsId,
+        procDefKey: task.value.procDefKey,
+        variables: task.value.variables,
       }
       //若自定义了同意函数，则调用自定义函数
       if (taskOperate.value?.completeFunction) {
@@ -257,7 +273,7 @@ const handleComplete = async () => {
         taskId: task.value.taskId,
         userId: userInfoStore().getUserInfo.id,
         comment: task.value.comment,
-        stopWorkflow: true //false,
+        stopWorkflow: true, //false,
       }
       //若自定义了终止函数，则调用自定义函数
       if (taskOperate.value?.refuseFunction) {
@@ -283,7 +299,8 @@ const handleComplete = async () => {
         userId: userInfoStore().getUserInfo.id,
         comment: task.value.comment,
         targetKey: selectActivity.value,
-        isFirstActivity: returnData.value.find(x => x.taskKey === selectActivity.value)?.isFirstActivity
+        isFirstActivity: returnData.value.find((x) => x.taskKey === selectActivity.value)
+          ?.isFirstActivity,
       }
       if (taskOperate.value?.backFunction) {
         await taskOperate.value.backFunction(askVo)

package/src/components/workflow/components/ProcessDetailComp.vue

@@ -102,7 +102,7 @@ const open = async () => {
       data.value = props.task
       loading.value = true
       bpmnRef.value?.init(props.task.procDefKey, props.task.procInsId)
-      stepRef.value?.init(props.task.procInsId)
+      stepRef.value?.init(props.task.procDefKey,props.task.procInsId)
     } catch (err: any) {
       frameworkUtils.messageError(err)
     } finally {
@@ -115,7 +115,7 @@ const open = async () => {
       data.value = await workflowInstApi.getWfTaskByBusinessId(props.businessId)
       if (data.value.procDefKey && data.value.procInsId) {
         bpmnRef.value?.init(data.value.procDefKey, data.value.procInsId)
-        stepRef.value?.init(data.value.procInsId)
+        stepRef.value?.init(data.value.procDefKey,data.value.procInsId)
       } else {
         ElMessage.warning('流程信息缺失！')
       }

package/src/components/workflow/components/ProcessDetailDialog.vue

@@ -100,7 +100,7 @@ const open = async () => {
       data.value = props.task
       loading.value = true
       bpmnRef.value?.init(props.task.procDefKey, props.task.procInsId)
-      stepRef.value?.init(props.task.procInsId)
+      stepRef.value?.init(props.task.procDefKey,props.task.procInsId)
     } catch (err: any) {
       frameworkUtils.messageError(err)
     } finally {
@@ -112,7 +112,7 @@ const open = async () => {
       data.value = await workflowInstApi.getWfTaskByBusinessId(props.businessId)
       if (data.value.procDefKey && data.value.procInsId) {
         bpmnRef.value?.init(data.value.procDefKey, data.value.procInsId)
-        stepRef.value?.init(data.value.procInsId)
+        stepRef.value?.init(data.value.procDefKey, data.value.procInsId)
       } else {
         ElMessage.warning('流程信息缺失！')
       }

package/src/components/workflow/components/ProcessInstanceStep.vue

@@ -6,7 +6,7 @@
 import workbenchInstApi from '../../../api/workflow/workflowInstApi'
 import workflowcommentApi from '../../../api/workflow/workflowCommentApi'
 import type { IWorkflowCommentVo } from '../../../interface/workflow/IWorkflowCommentVo'
-import { ElMessage,ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref } from 'vue'
 import type { IWfProcessInstVo, IWfTaskVo } from '../../../interface/workflow/IWfTaskVo'
 import ElUploads from '../../../components/upload/ElUploads.vue'
@@ -25,8 +25,8 @@ const props = withDefaults(
   }>(),
   {
     procInstId: '',
-    source: ''
-  }
+    source: '',
+  },
 )
 const emit = defineEmits(['viewDetail'])
 const loading = ref<boolean>(false)
@@ -60,7 +60,7 @@ const init = async (procDefId: string, procInstId: string) => {
           .getUpLoadFilesByBussinessIds(
             wfProcessInstVo.value.hisTasks
               .filter((item) => item.comment !== '***' && item.taskDefKey !== 'tech_approval')
-              .map((item) => item.taskId)
+              .map((item) => item.taskId),
           )
           .then((res) => {
             taskFiles.value = res
@@ -73,47 +73,54 @@ const init = async (procDefId: string, procInstId: string) => {
     if (wfProcessInstVo.value?.activeTasks?.length) {
       setTaskGroup(wfProcessInstVo.value.activeTasks || [])
     }
-    if (taskGroup.value.length && ver.value.workflowCode === 'CompanyProjectApplyWorkflow' && ver.value.version === 4) {
+    if (
+      taskGroup.value.length &&
+      ver.value.workflowCode === 'CompanyProjectApplyWorkflow' &&
+      ver.value.version === 4
+    ) {
       if (taskGroup.value.length) {
         // 判断taskGroup.value中的专家预审的位置index
-        const expertPretrialIndex = taskGroup.value.findIndex(item => item.taskName === '专家预审')
+        const expertPretrialIndex = taskGroup.value.findIndex(
+          (item) => item.taskName === '专家预审',
+        )
         if (expertPretrialIndex !== -1) {
           //判断是否是最后一个节点
           if (expertPretrialIndex < taskGroup.value.length - 1) {
             //拿到专家预审节点
             const expertPretrialTask = taskGroup.value[expertPretrialIndex]
             //获取保存的评论
-            techComment.value = await workflowcommentApi.getComment(expertPretrialTask.tasks[0].businessId, expertPretrialTask.tasks[0].taskId)
+            techComment.value = await workflowcommentApi.getComment(
+              expertPretrialTask.tasks[0].businessId,
+              expertPretrialTask.tasks[0].taskId,
+            )
             // 拼接expertPretrialTask 的 tasks里面的所有 comment
             const allComment = expertPretrialTask.tasks
-              .map(task => task.comment)
-              .filter(comment => comment)
+              .map((task) => task.comment)
+              .filter((comment) => comment)
               .join('\n')
 
             //此时说明预审已经完成，在其后增加一个新数组
             taskGroup.value.splice(expertPretrialIndex + 1, 0, {
-              taskName: '科技管理室审批',
+              taskName: '科技管理室汇总',
               finishTime: expertPretrialTask.finishTime,
-              tasks: [{
-                taskId: expertPretrialTask.tasks[0].taskId,
-                taskName: '科技管理室审批',
-                taskDefKey: 'tech_approval',
-                parentExecutionId: expertPretrialTask.parentExecutionId,
-                businessId: expertPretrialTask.tasks[0].businessId,
-                createTime: expertPretrialTask.createTime,
-                finishTime: expertPretrialTask.finishTime,
-                assigneeName: '科技管理员',
-                comment: techComment.value?.techComment || allComment,
-                commentList: [
-                  { type: 1 }
-                ]
-              }]
+              tasks: [
+                {
+                  taskId: expertPretrialTask.tasks[0].taskId,
+                  taskName: '科技管理室汇总',
+                  taskDefKey: 'tech_approval',
+                  parentExecutionId: expertPretrialTask.parentExecutionId,
+                  businessId: expertPretrialTask.tasks[0].businessId,
+                  createTime: expertPretrialTask.createTime,
+                  finishTime: expertPretrialTask.finishTime,
+                  assigneeName: '科技管理员',
+                  comment: techComment.value?.techComment || allComment,
+                  commentList: [{ type: 1 }],
+                },
+              ],
             })
           }
         }
       }
-
-
     }
   } catch (err: any) {
     taskGroup.value = []
@@ -127,7 +134,7 @@ const setTaskGroup = (tasks: IWfTaskVo[]) => {
   for (const hisTask of tasks) {
     const exist = taskGroup.value.find(
       (x) =>
-        x.taskDefKey === hisTask.taskDefKey && x.parentExecutionId === hisTask.parentExecutionId
+        x.taskDefKey === hisTask.taskDefKey && x.parentExecutionId === hisTask.parentExecutionId,
     )
     if (exist) {
       if (hisTask.finishTime && hisTask.finishTime > exist.finishTime) {
@@ -153,14 +160,14 @@ const setTaskGroup = (tasks: IWfTaskVo[]) => {
         parentExecutionId: hisTask.parentExecutionId || '',
         finishTime: hisTask.finishTime || '',
         createTime: hisTask.createTime || '',
-        tasks: [hisTask]
+        tasks: [hisTask],
       })
     }
   }
   if (taskGroup.value.length > 0) {
     taskGroup.value.sort((a, b) => {
       const n1 = (a.finishTime ? a.finishTime : '9999').localeCompare(
-        b.finishTime ? b.finishTime : '9999'
+        b.finishTime ? b.finishTime : '9999',
       )
       if (n1 == 0) {
         return a.createTime.localeCompare(b.createTime)
@@ -182,7 +189,7 @@ const getStatus = (task: IWfTaskVo) => {
     if (task.commentList && task.commentList.length > 0) {
       return ['待办', '已办', '已办', '终止', '委派', '转办', '终止', '撤回'][
         Number(task.commentList[task.commentList.length - 1].type)
-        ]
+      ]
     }
     return ''
   }
@@ -194,7 +201,7 @@ const saveComment = async (taskInfo: IWfTaskVo) => {
   const confirm = await ElMessageBox.confirm('您确定保存数据?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning'
+    type: 'warning',
   })
   if (!confirm) {
     return
@@ -202,7 +209,9 @@ const saveComment = async (taskInfo: IWfTaskVo) => {
   try {
     loading.value = true
     techComment.value = await workflowcommentApi.addOrEditComment({
-      ...techComment.value, ...taskInfo, ...{ techComment: taskInfo.comment }
+      ...techComment.value,
+      ...taskInfo,
+      ...{ techComment: taskInfo.comment },
     })
     ElMessage.success('保存成功')
   } catch (err) {
@@ -210,10 +219,9 @@ const saveComment = async (taskInfo: IWfTaskVo) => {
   } finally {
     loading.value = false
   }
-
 }
 defineExpose({
-  init
+  init,
 })
 </script>
 
@@ -249,20 +257,27 @@ defineExpose({
                 border-radius: 8px;
                 background: #f8f8f8;
               "
-              :style="{width:task.taskDefKey === 'tech_approval' ? '100%' : '31%'}"
+              :style="{ width: task.taskDefKey === 'tech_approval' ? '100%' : '31%' }"
             >
               <el-flex height="30px" align="center" justify="space-between">
-                <span class="ellipsis" style="font-size: 14px">{{ task.assigneeName }}</span>
-                <div style="display: inline-flex;align-items: center;gap: 8px">
+                <el-auto-tool-tip :tooltip-content="task.assigneeName">
+                  <span slot="content" class="ellipsis" style="font-size: 14px">{{
+                    task.assigneeName
+                  }}</span>
+                </el-auto-tool-tip>
+                <div style="display: inline-flex; align-items: center; gap: 8px">
                   <el-icon-btn
-                    v-if="task.taskDefKey === 'tech_approval' && (userInfo.getUserInfo.roleCodes?.includes('PMRole') || userInfo.getUserInfo.roleCodes?.includes('TMRole')) "
-                    tip="保存"
+                    v-if="
+                      task.taskDefKey === 'tech_approval' &&
+                      (userInfo.getUserInfo.roleCodes?.includes('PMRole') ||
+                        userInfo.getUserInfo.roleCodes?.includes('TMRole'))
+                    "
                     model-value="adtec-save"
+                    tip="保存"
                     @click="saveComment(task)"
                   />
-                  <el-tag size="small" :type="task.finishTime ? 'success' : 'primary'">{{
-                      getStatus(task)
-                    }}
+                  <el-tag :type="task.finishTime ? 'success' : 'primary'" size="small"
+                    >{{ getStatus(task) }}
                   </el-tag>
                 </div>
               </el-flex>
@@ -276,17 +291,26 @@ defineExpose({
                 "
               >
                 <el-input
-                  v-if="task.taskDefKey === 'tech_approval' && (userInfo.getUserInfo.roleCodes?.includes('PMRole') || userInfo.getUserInfo.roleCodes?.includes('TMRole'))"
-                  type="textarea"
-                  placeholder="请输入内容"
-                  autosize
+                  v-if="
+                    task.taskDefKey === 'tech_approval' &&
+                    (userInfo.getUserInfo.roleCodes?.includes('PMRole') ||
+                      userInfo.getUserInfo.roleCodes?.includes('TMRole'))
+                  "
                   v-model="task.comment"
+                  autosize
                   clearable
+                  placeholder="请输入内容"
+                  type="textarea"
                 ></el-input>
                 <span v-else>{{ task.comment }}</span>
                 <el-icon-btn
                   tip="查看详情"
-                  v-if="task.taskName === '专家预审' && source === 'showDetail' && task.comment && task.comment !== '***'"
+                  v-if="
+                    task.taskName === '专家预审' &&
+                    source === 'showDetail' &&
+                    task.comment &&
+                    task.comment !== '***'
+                  "
                   model-value="adtec-details"
                   @click.stop="viewDetail(task)"
                   style="font-size: 14px"
@@ -304,8 +328,8 @@ defineExpose({
               </el-flex>
 
               <span style="display: block; color: #909399" v-if="task.comment">{{
-                  task.finishTime?.substring(0, 19)
-                }}</span>
+                task.finishTime?.substring(0, 19)
+              }}</span>
             </el-flex>
           </el-flex>
         </template>

package/src/interface/workflow/IWfTaskAskVo.ts

@@ -62,4 +62,5 @@ export interface IWfTaskAskVo {
    * 是否是第一个节点
    */
   isFirstActivity?: string
+  procDefKey?: string
 }

package/src/interface/workflow/IWorkflowCommentVo.ts

@@ -4,21 +4,21 @@ export interface IWorkflowCommentVo extends BaseEntity {
   /**
    * 主键 ID
    */
-  id?: string;
+  id?: string
 
   /**
    * 业务 ID
    */
-  businessId?: string;
+  businessId?: string
 
   /**
    * 当前工作流 ID
    */
-  taskId?: string;
+  taskId?: string
 
   /**
    * 汇总结论
    */
 
-  techComment?: string;
+  techComment?: string
 }