adtec-core-package 2.9.7 → 2.9.8

package/package.json

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

package/src/api/workflow/workflowCommentApi.ts

@@ -17,7 +17,10 @@ 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 })
+  getBatchInfo(tpApplyId: string, batchPrefer: 'max' | 'min' = 'max') {
+    return request.get<ITpReviewBatch>('/api/tm/tpApplyCheck/getBatchInfo', { tpApplyId, batchPrefer })
+  },
+  getBatchInfoByTaskId(taskId: string) {
+    return request.get<ITpReviewBatch>('/api/tm/tpApplyCheck/getBatchInfoByTaskId', { taskId })
   },
 }

package/src/components/upload/FileView.vue

@@ -115,27 +115,31 @@ const title = useVModel(props, 'title', emit)
 const fileId = useVModel(props, 'fileId', emit)
 const url = useVModel(props, 'url', emit)
 const edit = useVModel(props, 'edit', emit)
-const getFileType = () => {
-  if ((url.value + '').indexOf('.docx') !== -1 || (url.value + '').indexOf('.doc') !== -1) {
-    return 'docx'
-  } else if ((url.value + '').indexOf('.pdf') !== -1) {
-    return 'pdf'
-  } else if ((url.value + '').indexOf('.xlsx') !== -1 || (url.value + '').indexOf('.xls') !== -1) {
-    return 'xlsx'
-  } else if ((url.value + '').indexOf('.pptx') !== -1 || (url.value + '').indexOf('.pptx') !== -1) {
-    return 'pptx'
+
+const resolveFileExt = (type?: string, name?: string, fileUrl?: string) => {
+  const normalizedType = (type || '').toLowerCase().replace(/^\./, '')
+  if (normalizedType) {
+    return normalizedType === 'doc' ? 'docx' : normalizedType
+  }
+  const fromName = (name || '').match(/\.([a-z0-9]+)$/i)?.[1]?.toLowerCase()
+  if (fromName) {
+    return fromName === 'doc' ? 'docx' : fromName
   }
+  const urlStr = (fileUrl || '').toLowerCase()
+  if (urlStr.includes('.docx') || urlStr.includes('.doc')) return 'docx'
+  if (urlStr.includes('.pdf')) return 'pdf'
+  if (urlStr.includes('.xlsx') || urlStr.includes('.xls')) return 'xlsx'
+  if (urlStr.includes('.pptx') || urlStr.includes('.ppt')) return 'pptx'
+  return ''
 }
+
+const getFileType = () => resolveFileExt(undefined, title.value, url.value)
 const getDocumentType = () => {
-  if ((url.value + '').indexOf('.docx') !== -1 || (url.value + '').indexOf('.doc') !== -1) {
-    return 'word'
-  } else if ((url.value + '').indexOf('.pdf') !== -1) {
-    return 'pdf'
-  } else if ((url.value + '').indexOf('.xlsx') !== -1 || (url.value + '').indexOf('.xls') !== -1) {
-    return 'cell'
-  } else if ((url.value + '').indexOf('.pptx') !== -1 || (url.value + '').indexOf('.pptx') !== -1) {
-    return 'slide'
-  }
+  const ext = getFileType()
+  if (ext === 'docx' || ext === 'doc') return 'word'
+  if (ext === 'pdf') return 'pdf'
+  if (ext === 'xlsx' || ext === 'xls') return 'cell'
+  if (ext === 'pptx' || ext === 'ppt') return 'slide'
 }
 const download= async ()=>{
   try{

package/src/components/workflow/components/AddOrMinusMultiDialog.vue

@@ -54,6 +54,7 @@ import { ElMessage } from 'element-plus'
 import { userInfoStore } from '../../../stores/userInfoStore'
 import type { ISysUserInfo } from '../../../interface/ISysUserInfo'
 import frameworkUtils from '../../../utils/FrameworkUtils.ts'
+const emit = defineEmits<{ success: [] }>()
 const userInfo = userInfoStore()
 const data = ref<IWfTaskUsersVo>({
   assignee: [],
@@ -81,6 +82,11 @@ const open = async (taskId: string, type: string) => {
     data.value = { ...(await workflowInstApi.getTaskCandidate(taskId)), assignee: [] }
     //设置当前的审批人
     defaultAssignee.value = data.value.candidate?.map((e:ISysUserInfo) => e.id!) || []
+    if (type === 'minusMulti' && defaultAssignee.value.length <= 1) {
+      ElMessage.warning('至少需保留一名审核人，当前仅剩一名审核人，无法减签')
+      dialogVisible.value = false
+      return
+    }
     data.value.assignee = [...defaultAssignee.value]
   } catch (err: any) {
     frameworkUtils.messageError(err)
@@ -122,18 +128,26 @@ const disableFunc = (val: string) => {
   }
 }
 const save = async () => {
-  if (data.value.candidate?.length == 0 || data.value.assignee.length == 0) {
+  if (data.value.candidate?.length == 0) {
     ElMessage.warning('请指定执行人！')
     return
   }
   //加签逻辑判断
   if (dialogType.value === 'addMulti') {
+    if (data.value.assignee.length == 0) {
+      ElMessage.warning('请指定执行人！')
+      return
+    }
     if (data.value.assignee.length <= defaultAssignee.value.length) {
       ElMessage.warning('加签必须选择非原审批人！')
       return
     }
   } else if (dialogType.value === 'minusMulti') {
-    //减签逻辑判断
+    //减签逻辑判断：至少保留一名审核人
+    if (data.value.assignee.length < 1) {
+      ElMessage.warning('至少需保留一名审核人')
+      return
+    }
     if (data.value.assignee.length >= defaultAssignee.value.length) {
       ElMessage.warning('减签必须取消选中原审批人！')
       return
@@ -145,6 +159,7 @@ const save = async () => {
     await workflowInstApi.addOrMinusAssignee(data.value)
     ElMessage.success('操作成功')
     dialogVisible.value = false
+    emit('success')
   } catch (err: any) {
     frameworkUtils.messageError(err)
   } finally {

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

@@ -201,6 +201,9 @@ const open = async (
     //转办
     dialogLabel.value = '转办原因'
     dialogTitle.value = '转办审批'
+    // 每次打开转办弹窗清空原因与转办人，避免复用 taskVo 上次的审批/转办意见
+    task.value.comment = ''
+    transferUser.value = { id: '', userName: '' }
   }
   loading.value = false
 }

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

@@ -220,13 +220,28 @@ const getStatus = (task: IWfTaskVo) => {
   }
 }
 const compParam = ref()
+const resolveReviewBatch = async (task: IWfTaskVo) => {
+  if (task.taskId) {
+    const byTask = await workflowcommentApi.getBatchInfoByTaskId(task.taskId)
+    if (byTask?.revMeetingId) {
+      return byTask
+    }
+  }
+  const batchPrefer = task.taskName === '专家会审(答辩)' ? 'max' : 'min'
+  return workflowcommentApi.getBatchInfo(task.businessId ?? '', batchPrefer)
+}
 const viewDetail = async (task: IWfTaskVo) => {
   if (task.taskName === '专家评审' || task.taskName === '专家会审(答辩)') {
-    //获取第二批次信息
-    const batchInfo = await workflowcommentApi.getBatchInfo(task.businessId ?? '')
+    const batchInfo = await resolveReviewBatch(task)
+    if (!batchInfo?.revMeetingId) {
+      ElMessage.warning('暂无评审详情')
+      return
+    }
     const taskInfo = {
       businessId: batchInfo.revMeetingId + '_' + (task.businessId ?? ''),
       nodeTag: 'TECPM:/src/views/meetingHost/componets/comp.viewResult.vue',
+      nodeParam: batchInfo.reviewType ?? '10',
+      taskName: task.taskName,
     }
     await showTodoDialog(ref(taskInfo as IWfTaskVo), compParam)
   } else {