adtec-core-package 2.6.2 → 2.6.3

package/package.json

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

package/src/api/workflow/workflowInstApi.ts

@@ -69,4 +69,7 @@ export default {
   getProcessTaskList(processInstId: string) {
     return request.get<IWfProcessInstVo>('/api/workflow/workbench/process/' + processInstId)
   },
+  getWfProcessInstByBusinessId(businessId: string) {
+    return request.get<IWfTaskVo>(baseUrl + '/getUserTaskInfo', { businessId })
+  },
 }

package/src/components/workflow/TaskOperation.vue

@@ -11,14 +11,15 @@
           params?.cancelBtnText ?? '取消'
         }}
       </el-button>
-      <el-button v-if="showProcessBtn && task?.taskId" type="info" :loading="butLoading || taskLoading" @click="processShow = true">
+      <el-button v-if="showProcessBtn && task?.procInsId" type="info" :loading="butLoading || taskLoading"
+                 @click="processShow = true">
         流程详情
       </el-button>
       <template v-if="isAssignee">
         <el-button type="primary" :loading="butLoading || taskLoading" @click="openDialog('assignee')">指定执行人
         </el-button>
       </template>
-      <template v-if="!isAssignee && task?.taskId && task?.operations">
+      <template v-if="!isAssignee && task?.taskId && task?.operations && showOperationsBtn">
         <el-button :loading="butLoading || taskLoading" v-if="params?.saveBtnText" type="primary"
                    @click="params?.saveFunction">{{
             params?.saveBtnText
@@ -112,10 +113,12 @@ const processShow = ref(false)
 const taskFlexRef = ref<HTMLElement | null>(null)
 const $props = defineProps({
   // modelValue: { type: Object, required: false },
-  taskId: { type: String, required: true },
+  taskId: { type: String, required: false },
   showProcessBtn: { type: Boolean, required: false, default: false },
   butLoading: { type: Boolean, required: false, default: false },
-  params: { type: Object as PropType<ITaskOperate>, required: false }
+  params: { type: Object as PropType<ITaskOperate>, required: false },
+  taskInfo: { type: Object as PropType<IWfTaskVo>, required: false },
+  showOperationsBtn: { type: Boolean, required: false, default: true },
 })
 
 const emit = defineEmits(['success'])
@@ -240,7 +243,13 @@ const loadEnd = () => {
   // loading.close()
 }
 const reloadTask = async () => {
-  if ($props.taskId) {
+  if ($props.taskInfo) {
+    task.value = $props.taskInfo
+    if (task.value.finishTime) {
+      // ElMessage.info('该待办已完成！')
+      console.log('该待办已完成！')
+    }
+  } else if ($props.taskId) {
     try {
       loadStart()
       task.value = await workflowInstApi.getTaskInst($props.taskId)