adtec-core-package 2.5.0 → 2.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.5.0",
+  "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/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

@@ -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'
@@ -34,7 +34,7 @@ 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
@@ -86,7 +86,6 @@ const init = async (procDefId: string, procInstId: string) => {
           (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,12 +122,12 @@ 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 }],
                 },
               ],
             })
@@ -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) {
@@ -272,10 +269,13 @@ 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>
+                <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="
@@ -303,6 +303,7 @@ defineExpose({
               >
                 <el-input
                   v-if="
+                    ver?.version === 4 &&
                     task.taskDefKey === 'tech_approval' &&
                     (userInfo.getUserInfo.roleCodes?.includes('PMRole') ||
                       userInfo.getUserInfo.roleCodes?.includes('TMRole'))

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
-}