adtec-core-package 2.6.2 → 2.6.4

package/package.json

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

package/src/api/workflow/workflowCommentApi.ts

@@ -17,4 +17,7 @@ export default {
   addOrEditComment(tpReviewBatch: ITpReviewBatch) {
     return request.post<ITpReviewBatch>('/api/tm/tpApplyCheck/updateBatchInfo', tpReviewBatch)
   },
+  getBatchInfo(tpApplyId: string) {
+    return request.get<ITpReviewBatch>('/api/tm/tpApplyCheck/getBatchInfo', { tpApplyId })
+  },
 }

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)

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

@@ -16,7 +16,7 @@ import frameworkUtils from '../../../utils/FrameworkUtils.ts'
 import workflowApi from '../../../api/workflow/workflow'
 import type { SysWorkflowVerType } from '../../../interface/workflow/workflow'
 import { userInfoStore } from '../../../stores/userInfoStore'
-
+import { showTodoDialog } from '../../../hooks/workflowTodo2'
 const userInfo = userInfoStore()
 const props = withDefaults(
   defineProps<{
@@ -82,9 +82,11 @@ const init = async (procDefId: string, procInstId: string) => {
     ) {
       //调整显示
       if (taskGroup.value.length) {
-        const find = taskGroup.value.find(item => item.parentExecutionId === 'node_c9zht:2025-11-19 15:44:56')
+        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')
+          const task = find.tasks.filter((item) => item.businessId === '1963833051911258114')
           task[0].comment = ''
           task[0].finishTime = undefined
           find.tasks = task
@@ -217,8 +219,19 @@ const getStatus = (task: IWfTaskVo) => {
     return ''
   }
 }
-const viewDetail = (taskInfo: IWfTaskVo) => {
-  emit('viewDetail', taskInfo)
+const compParam = ref()
+const viewDetail = async (task: IWfTaskVo) => {
+  if (task.taskName === '专家评审' || task.taskName === '专家会审(答辩)') {
+    //获取第二批次信息
+    const batchInfo = await workflowcommentApi.getBatchInfo(task.businessId ?? '')
+    const taskInfo = {
+      businessId: batchInfo.revMeetingId + '_' + (task.businessId ?? ''),
+      nodeTag: 'TECPM:/src/views/meetingHost/componets/comp.viewResult.vue',
+    }
+    await showTodoDialog(ref(taskInfo as IWfTaskVo), compParam)
+  } else {
+    await showTodoDialog(ref(task), compParam)
+  }
 }
 const saveComment = async (taskInfo: IWfTaskVo) => {
   const confirm = await ElMessageBox.confirm('您确定保存数据?', '提示', {
@@ -255,107 +268,106 @@ defineExpose({
         :key="item.parentExecutionId"
         :status="item.tasks.find((x) => !x.finishTime) ? 'finish' : 'success'"
       >
-        <!--          <template #icon>-->
-        <!--            <flow-icon :name="getIcon(item.tasks)" :size="20" />-->
-        <!--          </template>-->
         <template #title>
           <span style="display: block">{{ item.taskName }}</span>
         </template>
         <template #description>
-          <el-flex
-            :vertical="false"
-            style="max-width: 100%; min-width: 180px; min-height: 60px"
-            justify="flex-start"
-          >
-            <!--            width="170px"-->
-            <el-flex
-              :vertical="true"
-              v-for="task in item.tasks"
-              :key="task.taskId"
-              style="
-                margin-bottom: 5px;
-                padding: 5px;
-                margin-right: 5px;
-                border-radius: 8px;
-                background: #f8f8f8;
-              "
-              :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>
-                <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'))
-                    "
-                    model-value="adtec-save"
-                    tip="保存"
-                    @click="saveComment(task)"
-                  />
-                  <el-tag :type="task.finishTime ? 'success' : 'primary'" size="small"
-                    >{{ getStatus(task) }}
-                  </el-tag>
-                </div>
-              </el-flex>
+          <div style="width: 100%">
+            <div style="display: flex; flex-wrap: wrap; gap: 8px; width: 100%">
               <div
+                v-for="task in item.tasks"
+                :key="task.taskId"
                 style="
-                  display: flex;
-                  justify-items: center;
-                  align-items: center;
-                  justify-content: space-between;
-                  width: 100%;
+                  flex: 1 1 calc(33.333% - 8px);
+                  min-width: calc(33.333% - 8px);
+                  margin-bottom: 5px;
+                  padding: 5px;
+                  border-radius: 8px;
+                  background: #f8f8f8;
                 "
+                :style="{
+                  border: task.taskId === taskId ? '1px solid var(--el-color-primary)' : '',
+                  flex:
+                    task.taskDefKey === 'tech_approval' ? '1 1 100%' : '1 1 calc(33.333% - 8px)',
+                  // 修正calc表达式：用模板字符串包裹，变量正确拼接
+                  minWidth:
+                    task.taskDefKey === 'tech_approval'
+                      ? '100%'
+                      : `calc((100% - 16px) / max(3, ${item.tasks.length}))`,
+                }"
               >
-                <el-input
-                  v-if="
-                    ver?.version === 4 &&
-                    task.taskDefKey === 'tech_approval' &&
-                    (userInfo.getUserInfo.roleCodes?.includes('PMRole') ||
-                      userInfo.getUserInfo.roleCodes?.includes('TMRole'))
+                <!-- 内部内容保持不变 -->
+                <el-flex height="30px" align="center" justify="space-between">
+                  <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="
+                        task.taskDefKey === 'tech_approval' &&
+                        (userInfo.getUserInfo.roleCodes?.includes('PMRole') ||
+                          userInfo.getUserInfo.roleCodes?.includes('TMRole'))
+                      "
+                      model-value="adtec-save"
+                      tip="保存"
+                      @click="saveComment(task)"
+                    />
+                    <el-tag :type="task.finishTime ? 'success' : 'primary'" size="small">
+                      {{ getStatus(task) }}
+                    </el-tag>
+                  </div>
+                </el-flex>
+                <div
+                  style="
+                    display: flex;
+                    align-items: center;
+                    justify-content: space-between;
+                    width: 100%;
                   "
-                  v-model="task.comment"
-                  autosize
-                  clearable
-                  placeholder="请输入内容"
-                  type="textarea"
-                ></el-input>
-                <span v-else>{{ task.comment }}</span>
-                <el-icon-btn
-                  tip="查看详情"
-                  v-if="
-                    source === 'showDetail' &&
-                    task.comment &&
-                    task.comment !== '***' &&
-                    (task.taskName === '专家预审' ||
-                      task.taskName === '专家会审(答辩)' ||
-                      task.taskName === '专家评审')
-                  "
-                  model-value="adtec-details"
-                  @click.stop="viewDetail(task)"
-                  style="font-size: 14px"
                 >
-                </el-icon-btn>
+                  <el-input
+                    v-if="
+                      ver?.version === 4 &&
+                      task.taskDefKey === 'tech_approval' &&
+                      (userInfo.getUserInfo.roleCodes?.includes('PMRole') ||
+                        userInfo.getUserInfo.roleCodes?.includes('TMRole'))
+                    "
+                    v-model="task.comment"
+                    autosize
+                    clearable
+                    placeholder="请输入内容"
+                    type="textarea"
+                    style="width: 100%"
+                  ></el-input>
+                  <span v-else style="word-break: break-all">{{ task.comment }}</span>
+                  <el-icon-btn
+                    tip="查看详情"
+                    v-if="
+                      task.comment &&
+                      task.comment !== '***' &&
+                      (task.taskName === '专家预审' ||
+                        task.taskName === '专家会审(答辩)' ||
+                        task.taskName === '专家评审')
+                    "
+                    model-value="adtec-details"
+                    @click.stop="viewDetail(task)"
+                    style="font-size: 14px; margin-left: 8px"
+                  >
+                  </el-icon-btn>
+                </div>
+                <el-flex v-if="taskFiles.some((x) => x.businessId === task.taskId)" width="100%">
+                  <el-uploads
+                    :is-edlt="false"
+                    :vertical="true"
+                    :businessId="task.taskId"
+                    :upload-files-list="taskFiles.filter((x) => x.businessId === task.taskId)"
+                    style="width: 100%"
+                  ></el-uploads>
+                </el-flex>
+                <span style="display: block; color: #909399; margin-top: 4px" v-if="task.comment">
+                  {{ task.finishTime?.substring(0, 19) }}
+                </span>
               </div>
-              <el-flex v-if="taskFiles.some((x) => x.businessId === task.taskId)" width="100%">
-                <!--                <span style="font-size: 14px">附件：</span>-->
-                <el-uploads
-                  :is-edlt="false"
-                  :vertical="true"
-                  :businessId="task.taskId"
-                  :upload-files-list="taskFiles.filter((x) => x.businessId === task.taskId)"
-                ></el-uploads>
-              </el-flex>
-
-              <span style="display: block; color: #909399" v-if="task.comment">{{
-                task.finishTime?.substring(0, 19)
-              }}</span>
-            </el-flex>
-          </el-flex>
+            </div>
+          </div>
         </template>
       </el-step>
     </el-steps>

package/src/hooks/workflowTodo2.ts

@@ -0,0 +1,76 @@
+import type { Ref } from 'vue'
+import WujieVue from 'wujie-vue3'
+import { ElMessage } from 'element-plus'
+import { type IWfTaskVo } from '../../src/interface/workflow/IWfTaskVo'
+import { userInfoStore } from '../../src/stores/userInfoStore'
+import frameworkUtil from '../../src/utils/FrameworkUtils'
+
+/**
+ * 创建人：xux
+ * 说明:
+ * 创建时间: 2025/1/23 下午3:16
+ * 修改时间: 2025/1/23 下午3:16
+ */
+export async function showTodoDialog(taskVo: Ref<IWfTaskVo>, params: any) {
+  if (taskVo.value && taskVo.value.nodeTag) {
+    const nodeTag =
+      taskVo.value.nodeTag.indexOf(':') > -1
+        ? taskVo.value.nodeTag.split(':')[1]
+        : taskVo.value.nodeTag
+    const ps = [
+      { code: 'businessId', value: taskVo.value?.businessId },
+      { code: 'taskId', value: taskVo.value?.taskId },
+      {
+        code: 'nodeTag',
+        value: taskVo.value.nodeTag,
+      },
+    ]
+    params.value = ps
+    if (taskVo.value?.nodeParam) {
+      ps.push({ code: 'nodeParam', value: taskVo.value?.nodeParam })
+    }
+    if (taskVo.value.nodeTag.indexOf(':') > -1) {
+      //子应用
+      //表单页面
+      if (taskVo.value.nodeTag.indexOf('/') > -1) {
+        //给子应用组件发送bus事件
+        WujieVue.bus.$emit(taskVo.value.nodeTag.split(':')[0] + 'WorkflowTodoBus', ps)
+      } else {
+        //菜单页面
+        const find = userInfoStore().getUserInfo.menuList.find((c) => c.code === nodeTag)
+        if (find) {
+          const key = nodeTag + (Math.random() * 100000).toFixed(0)
+          localStorage.setItem(key + '_message', JSON.stringify(taskVo.value))
+          setTimeout(() => {
+            localStorage.removeItem(key + '_message')
+          }, 1000 * 10)
+          let menu = frameworkUtil
+            .getOpenMenuInfoWujie()
+            .find((item: any) => item.id === taskVo.value.taskId)
+          if (!menu) {
+            menu = JSON.parse(JSON.stringify(find))
+            if (menu) {
+              menu.code = key
+              menu.name = taskVo.value.taskName ? taskVo.value.taskName : menu.name
+              menu.id = taskVo.value.taskId
+              ps.push({ code: 'menuCode', value: menu.code })
+              await WujieVue.bus.$emit('openMenu', menu, params)
+            }
+          } else {
+            await WujieVue.bus.$emit('openMenu', menu)
+          }
+          //给子应用组件发送bus事件
+          setTimeout(() => {
+            WujieVue.bus.$emit(taskVo.value?.nodeTag?.split(':')[0] + 'WorkflowTodoBus', ps)
+          }, 1000)
+          // await permissionHooks.openMenu(find)
+          // WujieVue.bus.$emit(taskVo.value.nodeTag.split(':')[0] + 'WorkflowTodoBus', ps)
+        } else {
+          ElMessage.error('未找到该菜单')
+        }
+      }
+    }
+  } else {
+    ElMessage.error('未设置待办处理界面！')
+  }
+}