adtec-core-package 2.5.1 → 2.5.2

package/package.json

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

package/src/api/workflow/workflowCommentApi.ts

@@ -6,18 +6,15 @@
  */
 
 import request from '../../utils/request'
-import { IWorkflowCommentVo } from 'adtec-core-package/src/interface/workflow/IWorkflowCommentVo'
+import type { ITpReviewBatch } from '../../interface/ITpReviewBatch.ts'
 
 export default {
   // 查询流程版本
-  getComment(businessId: string, taskId: string) {
-    return request.get<IWorkflowCommentVo>('/api/tm/workFlowComment/getComment', {
-      businessId,
-      taskId,
-    })
+  getComment(tpApplyId?: string) {
+    return request.get<ITpReviewBatch>('/api/tm/tpApplyCheck/getMinReviewBatch', {tpApplyId})
   },
   // 添加流程版本
-  addOrEditComment(data: IWorkflowCommentVo) {
-    return request.post<IWorkflowCommentVo>('/api/tm/workFlowComment/addOrEditComment', data)
+  addOrEditComment(tpReviewBatch: ITpReviewBatch) {
+    return request.post<ITpReviewBatch>('/api/tm/tpApplyCheck/updateBatchInfo', tpReviewBatch)
   },
 }

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

@@ -5,7 +5,7 @@
 <script setup lang="ts">
 import workbenchInstApi from '../../../api/workflow/workflowInstApi'
 import workflowcommentApi from '../../../api/workflow/workflowCommentApi'
-import type { IWorkflowCommentVo } from '../../../interface/workflow/IWorkflowCommentVo'
+import type { ITpReviewBatch } from '../../../interface/ITpReviewBatch.ts'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref } from 'vue'
 import type { IWfProcessInstVo, IWfTaskVo } from '../../../interface/workflow/IWfTaskVo'
@@ -27,14 +27,14 @@ const props = withDefaults(
   {
     procInstId: '',
     source: '',
-    taskId: ''
-  }
+    taskId: '',
+  },
 )
 const emit = defineEmits(['viewDetail'])
 const loading = ref<boolean>(false)
 const wfProcessInstVo = ref<IWfProcessInstVo>()
 const ver = ref<SysWorkflowVerType>()
-const techComment = ref<IWorkflowCommentVo>()
+const techComment = ref<ITpReviewBatch>()
 
 interface IWfTaskGroup {
   taskName: string
@@ -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,10 +83,9 @@ 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
           //判断是否是最后一个节点
           if (
             expertPretrialIndex < taskGroup.value.length - 1 ||
@@ -97,7 +96,6 @@ const init = async (procDefId: string, procInstId: string) => {
             //获取保存的评论
             techComment.value = await workflowcommentApi.getComment(
               expertPretrialTask.tasks[0].businessId,
-              expertPretrialTask.tasks[0].taskId
             )
             // 拼接expertPretrialTask 的 tasks里面的所有 comment
             let allComment = expertPretrialTask.tasks
@@ -124,14 +122,14 @@ const init = async (procDefId: string, procInstId: string) => {
                   parentExecutionId: expertPretrialTask.parentExecutionId,
                   businessId: expertPretrialTask.tasks[0].businessId,
                   createTime: expertPretrialTask.createTime,
-                  finishTime: techComment.value?.techComment
+                  finishTime: techComment.value?.opinion
                     ? expertPretrialTask.finishTime
                     : undefined,
                   assigneeName: '科技管理员',
-                  comment: techComment.value?.techComment || allComment,
-                  commentList: [{ type: techComment.value?.techComment ? 1 : 0 }]
-                }
-              ]
+                  comment: techComment.value?.opinion || allComment,
+                  commentList: [{ type: techComment.value?.opinion ? 1 : 0 }],
+                },
+              ],
             })
           }
         }
@@ -149,7 +147,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 +173,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 +202,7 @@ const getStatus = (task: IWfTaskVo) => {
     if (task.commentList && task.commentList.length > 0) {
       return ['待办', '已办', '已办', '终止', '委派', '转办', '终止', '撤回'][
         Number(task.commentList[task.commentList.length - 1].type)
-        ]
+      ]
     }
     return ''
   }
@@ -216,7 +214,7 @@ const saveComment = async (taskInfo: IWfTaskVo) => {
   const confirm = await ElMessageBox.confirm('您确定保存数据?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning'
+    type: 'warning',
   })
   if (!confirm) {
     return
@@ -225,8 +223,7 @@ const saveComment = async (taskInfo: IWfTaskVo) => {
     loading.value = true
     techComment.value = await workflowcommentApi.addOrEditComment({
       ...techComment.value,
-      ...taskInfo,
-      ...{ techComment: taskInfo.comment }
+      ...{ opinion: taskInfo.comment },
     })
     ElMessage.success('保存成功')
   } catch (err) {
@@ -236,7 +233,7 @@ const saveComment = async (taskInfo: IWfTaskVo) => {
   }
 }
 defineExpose({
-  init
+  init,
 })
 </script>
 
@@ -272,7 +269,10 @@ defineExpose({
                 border-radius: 8px;
                 background: #f8f8f8;
               "
-              :style="{ width: task.taskDefKey === 'tech_approval' ? '100%' : '31%',border:task.taskId===taskId?'1px solid var(--el-color-primary)':'' }"
+              :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>
@@ -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,8 @@ defineExpose({
                 "
               >
                 <el-input
-                  v-if="ver?.version===4 &&
+                  v-if="
+                    ver?.version === 4 &&
                     task.taskDefKey === 'tech_approval' &&
                     (userInfo.getUserInfo.roleCodes?.includes('PMRole') ||
                       userInfo.getUserInfo.roleCodes?.includes('TMRole'))
@@ -334,8 +335,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>

package/src/interface/ITpReviewBatch.ts

@@ -0,0 +1,52 @@
+import type { BaseEntity } from './BaseEntity.ts'
+
+export interface ITpReviewBatch extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string
+
+  /**
+   * 批次号（按照科技项目申报ID自动递增生成）
+   */
+  batchNum?: number
+
+  /**
+   * 评审类型（存评审类型字典"ComReviewType"值）
+   */
+  reviewType?: string
+
+  /**
+   * 评审方法表ID
+   */
+  revMethodId?: string
+
+  /**
+   * 结论值（新增时为空）
+   */
+  conclusionValue?: string
+
+  /**
+   * 结论描述（新增时为空）
+   */
+  conclusionText?: string
+
+  /**
+   * 科技项目申报表ID
+   */
+  tpApplyId?: string
+
+  /**
+   * 结论是否提交
+   */
+  isSubmit?: string
+
+  /**
+   * 合作经费额度
+   */
+  cooperateFee?: string
+
+  opinion?: string
+
+  revMeetingId?: string
+}

package/src/interface/workflow/IWorkflowCommentVo.ts

@@ -1,24 +0,0 @@
-import type { BaseEntity } from '../BaseEntity.ts'
-
-export interface IWorkflowCommentVo extends BaseEntity {
-  /**
-   * 主键 ID
-   */
-  id?: string
-
-  /**
-   * 业务 ID
-   */
-  businessId?: string
-
-  /**
-   * 当前工作流 ID
-   */
-  taskId?: string
-
-  /**
-   * 汇总结论
-   */
-
-  techComment?: string
-}