adtec-core-package 1.5.6 → 1.5.8

package/package.json

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

package/src/components/bpmntree/views/flowDesign/nodes/PopoverView.vue

@@ -52,7 +52,7 @@ const getStatus = (task: IWfTaskVo) => {
       return '提交'
     }
     if (task.commentList && task.commentList.length > 0) {
-      return ['待办', '同意', '不同意', '终止', '委派', '转办', '终止', '撤回'][
+      return ['待办', '已办', '已办', '终止', '委派', '转办', '终止', '撤回'][
         Number(task.commentList[task.commentList.length - 1].type)
       ]
     }

package/src/components/workflow/TaskOperation.vue

@@ -6,7 +6,7 @@
   <div ref="taskFlexRef">
     <el-flex align="center" justify="flex-end" v-loading="taskLoading">
       <slot name="left"></slot>
-      <el-button v-if="showCancelBtn" @click="params?.cancelFunction">{{ params?.cancelBtnText ?? '取消' }}</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>
@@ -31,25 +31,25 @@
         >减签</el-button
         >
         <el-button
-          v-if="task?.operations.indexOf('refuse') > -1"
+          v-if="task?.operations.indexOf('refuse') > -1 && params?.refuseBtnText !== ''"
           type="danger"
           @click="openDialog('refuse')"
         >{{ params?.refuseBtnText ?? '终止' }}</el-button
         >
         <el-button
-          v-if="task?.operations.indexOf('transfer') > -1"
+          v-if="task?.operations.indexOf('transfer') > -1 && params?.transferBtnText !== ''"
           type="warning"
           @click="openDialog('transfer')"
         >{{ params?.transferBtnText ?? '转办' }}</el-button
         >
         <el-button
-          v-if="task?.operations.indexOf('back') > -1"
+          v-if="task?.operations.indexOf('back') > -1 && params?.backBtnText !== ''"
           type="danger"
           @click="openDialog('back')"
         >{{ params?.backBtnText ?? '退回' }}</el-button
         >
         <el-button
-          v-if="task?.operations.indexOf('complete') > -1"
+          v-if="task?.operations.indexOf('complete') > -1 && params?.completeBtnText !== ''"
           type="primary"
           @click="openDialog('complete')"
         >{{ params?.completeBtnText ?? '同意' }}</el-button
@@ -94,7 +94,6 @@ const $props = defineProps({
   // modelValue: { type: Object, required: false },
   taskId: { type: String, required: true },
   showProcessBtn: { type: Boolean, required: false, default: false },
-  showCancelBtn: { type: Boolean, required: false, default: true },
   params: { type: Object as PropType<ITaskOperate>, required: false },
 })
 

package/src/components/workflow/WorkflowTodoDialog.vue

@@ -53,6 +53,7 @@ const initTodoDialog = async (params: IParameter[]) => {
     return
   }
   if (linkModelPath) {
+
     if (linkModelPath.indexOf('/') > -1) {
       //组件
       showComp.value = true

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

@@ -197,6 +197,10 @@ const handleComplete = async () => {
       }
     }
     if (dialogType.value === 'complete') {
+      if (!task.value.comment) {
+        ElMessage.warning('请填写审批意见！')
+        return
+      }
       //同意
       const askVo = {
         taskId: task.value.taskId,
@@ -206,14 +210,18 @@ const handleComplete = async () => {
       }
       //若自定义了同意函数，则调用自定义函数
       if (taskOperate.value?.completeFunction) {
-        await taskOperate.value.completeFunction(askVo)
+        const res = await taskOperate.value.completeFunction(askVo)
+        if (res && res?.taskId) {
+          task.value = res
+        } else {
+          task.value = await workflowInstApi.getTaskInst(task.value.taskId)
+        }
       } else {
         task.value = await workflowInstApi.taskComplete(askVo)
       }
-      dialogVisible.value = false
       //需要动态制定审批人
       if (task.value.operations && task.value.operations?.indexOf('assignee') > -1) {
-        // assigneeRef.value?.open(task.value.taskId)
+        dialogVisible.value = false
         emit('openAssignee', task.value.taskId)
         return
       }
@@ -232,6 +240,7 @@ const handleComplete = async () => {
       //若自定义了终止函数，则调用自定义函数
       if (taskOperate.value?.refuseFunction) {
         await taskOperate.value.refuseFunction(askVo)
+        task.value = await workflowInstApi.getTaskInst(task.value.taskId)
       } else {
         task.value = await workflowInstApi.taskReject(askVo)
       }
@@ -256,6 +265,7 @@ const handleComplete = async () => {
       }
       if (taskOperate.value?.backFunction) {
         await taskOperate.value.backFunction(askVo)
+        task.value = await workflowInstApi.getTaskInst(task.value.taskId)
       } else {
         task.value = await workflowInstApi.taskReturn(askVo)
       }
@@ -283,12 +293,13 @@ const handleComplete = async () => {
       }
       if (taskOperate.value?.transferFunction) {
         await taskOperate.value.transferFunction(askVo)
+        task.value = await workflowInstApi.getTaskInst(task.value.taskId)
       } else {
         task.value = await workflowInstApi.taskTransfer(askVo)
       }
     }
-    dialogVisible.value = false
     emit('success', task.value)
+    dialogVisible.value = false
   } catch (err: any) {
     frameworkUtils.messageError(err)
   } finally {

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

@@ -118,7 +118,7 @@ const getStatus = (task: IWfTaskVo) => {
       return '提交'
     }
     if (task.commentList && task.commentList.length > 0) {
-      return ['待办', '同意', '不同意', '终止', '委派', '转办', '终止', '撤回'][
+      return ['待办', '已办', '已办', '终止', '委派', '转办', '终止', '撤回'][
         Number(task.commentList[task.commentList.length - 1].type)
       ]
     }