adtec-core-package 2.6.0 → 2.6.2

package/package.json

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

package/src/components/workflow/TaskOperation.vue

@@ -4,58 +4,73 @@
 <!--修改时间: 2024/11/14 上午11:45-->
 <template>
   <div ref="taskFlexRef">
-    <el-flex align="center" justify="flex-end" v-loading="taskLoading">
+    <el-flex align="center" justify="flex-end">
       <slot name="left"></slot>
-      <el-button :loading="butLoading" v-if="params?.cancelBtnText !== ''" @click="params?.cancelFunction">{{
+      <el-button :loading="butLoading || taskLoading" 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>
+      <el-button v-if="showProcessBtn && task?.taskId" type="info" :loading="butLoading || taskLoading" @click="processShow = true">
+        流程详情
+      </el-button>
       <template v-if="isAssignee">
-        <el-button type="primary" @click="openDialog('assignee')">指定执行人</el-button>
+        <el-button type="primary" :loading="butLoading || taskLoading" @click="openDialog('assignee')">指定执行人
+        </el-button>
       </template>
       <template v-if="!isAssignee && task?.taskId && task?.operations">
-        <el-button :loading="butLoading" v-if="params?.saveBtnText" type="primary" @click="params?.saveFunction">{{
+        <el-button :loading="butLoading || taskLoading" v-if="params?.saveBtnText" type="primary"
+                   @click="params?.saveFunction">{{
             params?.saveBtnText
-          }}</el-button>
+          }}
+        </el-button>
         <el-button
           v-if="task?.operations.indexOf('addMulti') > -1"
           type="warning"
+          :loading="butLoading || taskLoading"
           @click="openDialog('addMulti')"
-        >加签</el-button
+        >加签
+        </el-button
         >
         <el-button
           v-if="task?.operations.indexOf('minusMulti') > -1"
           type="danger"
+          :loading="butLoading || taskLoading"
           @click="openDialog('minusMulti')"
-        >减签</el-button
+        >减签
+        </el-button
         >
         <el-button
-          :loading="butLoading"
+          :loading="butLoading || taskLoading"
           v-if="task?.operations.indexOf('refuse') > -1 && params?.refuseBtnText !== ''"
           type="danger"
           @click="openDialog('refuse')"
-        >{{ params?.refuseBtnText ?? '终止' }}</el-button
+        >{{ params?.refuseBtnText ?? '终止' }}
+        </el-button
         >
         <el-button
-          :loading="butLoading"
+          :loading="butLoading || taskLoading"
           v-if="task?.operations.indexOf('transfer') > -1 && params?.transferBtnText !== ''"
           type="warning"
           @click="openDialog('transfer')"
-        >{{ params?.transferBtnText ?? '转办' }}</el-button
+        >{{ params?.transferBtnText ?? '转办' }}
+        </el-button
         >
         <el-button
-          :loading="butLoading"
+          :loading="butLoading || taskLoading"
           v-if="task?.operations.indexOf('back') > -1 && params?.backBtnText !== ''"
           type="danger"
           @click="openDialog('back')"
-        >{{ params?.backBtnText ?? '退回' }}</el-button
+        >{{ params?.backBtnText ?? '退回' }}
+        </el-button
         >
         <el-button
-          :loading="butLoading"
+          :loading="butLoading || taskLoading"
           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>
@@ -100,7 +115,7 @@ const $props = defineProps({
   taskId: { type: String, required: true },
   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 }
 })
 
 const emit = defineEmits(['success'])
@@ -144,7 +159,7 @@ const openDialog = async (type: string) => {
         userId: userInfoStore().getUserInfo.id,
         comment: '同意。',
         procInsId: task.value.procInsId,
-        procDefKey: task.value.procDefKey,
+        procDefKey: task.value.procDefKey
       })
       if (res === false) return
       if (res?.readonly) {
@@ -185,7 +200,7 @@ const operSuccess = (taskVo: IWfTaskVo) => {
 // 向上定义递归查找函数
 const findParentWithClass = (
   element: HTMLElement | null,
-  targetClass: string,
+  targetClass: string
 ): HTMLElement | null => {
   if (!element) {
     return null

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

@@ -80,6 +80,16 @@ const init = async (procDefId: string, procInstId: string) => {
       ver.value.workflowCode === 'CompanyProjectApplyWorkflow' &&
       ver.value.version === 4
     ) {
+      //调整显示
+      if (taskGroup.value.length) {
+        const find = taskGroup.value.find(item => item.parentExecutionId === 'node_c9zht:2025-11-19 15:44:56')
+        if (find) {
+          const task = find.tasks.filter(item => item.businessId === '1963833051911258114')
+          task[0].comment = ''
+          task[0].finishTime = undefined
+          find.tasks = task
+        }
+      }
       if (taskGroup.value.length) {
         // 判断taskGroup.value中的专家预审的位置index
         const expertPretrialIndex = taskGroup.value.findIndex(