adtec-core-package 2.5.0 → 2.5.1

package/package.json

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

package/src/components/workflow/TaskOperation.vue

@@ -6,52 +6,56 @@
   <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 :loading="butLoading" 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 :loading="butLoading" 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
+          :loading="butLoading"
           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"
           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"
           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"
           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>
@@ -95,6 +99,7 @@ const $props = defineProps({
   // modelValue: { type: Object, required: false },
   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 },
 })
 

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

@@ -27,8 +27,8 @@ const props = withDefaults(
   {
     procInstId: '',
     source: '',
-    taskId: '',
-  },
+    taskId: ''
+  }
 )
 const emit = defineEmits(['viewDetail'])
 const loading = ref<boolean>(false)
@@ -62,7 +62,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
@@ -83,7 +83,7 @@ const init = async (procDefId: string, procInstId: string) => {
       if (taskGroup.value.length) {
         // 判断taskGroup.value中的专家预审的位置index
         const expertPretrialIndex = taskGroup.value.findIndex(
-          (item) => item.taskName === '专家预审',
+          (item) => item.taskName === '专家预审'
         )
         if (expertPretrialIndex !== -1) {
           debugger
@@ -97,7 +97,7 @@ const init = async (procDefId: string, procInstId: string) => {
             //获取保存的评论
             techComment.value = await workflowcommentApi.getComment(
               expertPretrialTask.tasks[0].businessId,
-              expertPretrialTask.tasks[0].taskId,
+              expertPretrialTask.tasks[0].taskId
             )
             // 拼接expertPretrialTask 的 tasks里面的所有 comment
             let allComment = expertPretrialTask.tasks
@@ -129,9 +129,9 @@ const init = async (procDefId: string, procInstId: string) => {
                     : undefined,
                   assigneeName: '科技管理员',
                   comment: techComment.value?.techComment || allComment,
-                  commentList: [{ type: techComment.value?.techComment ? 1 : 0 }],
-                },
-              ],
+                  commentList: [{ type: techComment.value?.techComment ? 1 : 0 }]
+                }
+              ]
             })
           }
         }
@@ -149,7 +149,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) {
@@ -175,14 +175,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)
@@ -204,7 +204,7 @@ const getStatus = (task: IWfTaskVo) => {
     if (task.commentList && task.commentList.length > 0) {
       return ['待办', '已办', '已办', '终止', '委派', '转办', '终止', '撤回'][
         Number(task.commentList[task.commentList.length - 1].type)
-      ]
+        ]
     }
     return ''
   }
@@ -216,7 +216,7 @@ const saveComment = async (taskInfo: IWfTaskVo) => {
   const confirm = await ElMessageBox.confirm('您确定保存数据?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning',
+    type: 'warning'
   })
   if (!confirm) {
     return
@@ -226,7 +226,7 @@ const saveComment = async (taskInfo: IWfTaskVo) => {
     techComment.value = await workflowcommentApi.addOrEditComment({
       ...techComment.value,
       ...taskInfo,
-      ...{ techComment: taskInfo.comment },
+      ...{ techComment: taskInfo.comment }
     })
     ElMessage.success('保存成功')
   } catch (err) {
@@ -236,7 +236,7 @@ const saveComment = async (taskInfo: IWfTaskVo) => {
   }
 }
 defineExpose({
-  init,
+  init
 })
 </script>
 
@@ -275,7 +275,7 @@ defineExpose({
               :style="{ width: task.taskDefKey === 'tech_approval' ? '100%' : '31%',border:task.taskId===taskId?'1px solid var(--el-color-primary)':'' }"
             >
               <el-flex height="30px" align="center" justify="space-between">
-                <el-auto-tool-tip :content="task.assigneeName"> </el-auto-tool-tip>
+                <el-auto-tool-tip :content="task.assigneeName"></el-auto-tool-tip>
                 <div style="display: inline-flex; align-items: center; gap: 8px">
                   <el-icon-btn
                     v-if="
@@ -288,7 +288,7 @@ defineExpose({
                     @click="saveComment(task)"
                   />
                   <el-tag :type="task.finishTime ? 'success' : 'primary'" size="small"
-                    >{{ getStatus(task) }}
+                  >{{ getStatus(task) }}
                   </el-tag>
                 </div>
               </el-flex>
@@ -302,7 +302,7 @@ defineExpose({
                 "
               >
                 <el-input
-                  v-if="
+                  v-if="ver?.version===4 &&
                     task.taskDefKey === 'tech_approval' &&
                     (userInfo.getUserInfo.roleCodes?.includes('PMRole') ||
                       userInfo.getUserInfo.roleCodes?.includes('TMRole'))
@@ -334,8 +334,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>