adtec-core-package 2.0.9 → 2.1.0

package/package.json

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

package/src/components/workflow/TaskOperation.vue

@@ -142,7 +142,7 @@ const openDialog = async (type: string) => {
       if (res?.readonly) {
         commentReadonly = true
       }
-      task.value.comment = res.comment
+      task.value = {...task.value,...res}
     } catch (err: any) {
       return
     }

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

@@ -73,6 +73,13 @@
             </el-card>
           </el-flex>
         </el-form-item>
+        <el-form-item v-if="showSelPersons" label="下一步审核人" required>
+          <el-select v-model="task.variables.nextChecker" multiple placeholder="请选择下一步审核人"
+                     :disabled="task.variables.persons?.length === 1">
+            <el-option v-for="item in task.variables.persons" :key="item.code" :label="item.name" :value="item.code">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item v-if="dialogType !== 'transfer'" label="附件" style="margin-bottom: 0">
         </el-form-item>
       </el-form>
@@ -100,21 +107,22 @@
   </el-dialog>
 </template>
 <script setup lang="ts">
-import { Search } from '@element-plus/icons-vue'
+import {Search} from '@element-plus/icons-vue'
 import UserTag from '../../../components/bpmntree/components/UserSelector/UserTag.vue'
-import { ref } from 'vue'
-import type { IWfTaskVo } from '../../../interface/workflow/IWfTaskVo'
-import type { ISysUserInfo } from '../../../interface/ISysUserInfo'
-import type { IWfReturnNodeVo } from '../../../interface/workflow/IWfReturnNodeVo'
+import {ref, computed} from 'vue'
+import type {IWfTaskVo} from '../../../interface/workflow/IWfTaskVo'
+import type {ISysUserInfo} from '../../../interface/ISysUserInfo'
+import type {IWfReturnNodeVo} from '../../../interface/workflow/IWfReturnNodeVo'
 import workflowInstApi from '../../../api/workflow/workflowInstApi'
-import { ElMessage } from 'element-plus'
+import {ElMessage} from 'element-plus'
 import UserSelect from '../../../components/business/userSelect.vue'
 import ElUploads from '../../../components/upload/ElUploads.vue'
-import { userInfoStore } from '../../../stores/userInfoStore'
-import type { ISysUploadFiles } from '../../../interface/ISysUploadFiles'
+import {userInfoStore} from '../../../stores/userInfoStore'
+import type {ISysUploadFiles} from '../../../interface/ISysUploadFiles'
 import documentApi from '../../../api/DocumentApi'
 import frameworkUtils from '../../../utils/FrameworkUtils.ts'
-import type { ITaskOperate } from '@/hooks/userWorkflowHooks.ts'
+import type {ITaskOperate} from '@/hooks/userWorkflowHooks.ts'
+
 const emit = defineEmits(['success', 'openAssignee'])
 const dialogVisible = ref(false)
 const loading = ref(false)
@@ -123,11 +131,14 @@ const dialogLabel = ref('')
 const dialogType = ref('')
 const task = ref()
 const taskFiles = ref<ISysUploadFiles[]>([])
-const transferUser = ref<ISysUserInfo>({ id: '', userName: '' })
+const transferUser = ref<ISysUserInfo>({id: '', userName: ''})
 const returnData = ref<IWfReturnNodeVo[]>([])
 const selectActivity = ref<string>('')
 const taskOperate = ref<ITaskOperate>()
 const readonly = ref(false)
+const showSelPersons = computed(() => {
+  return task.value.variables?.persons?.length > 0
+})
 const open = async (taskVo: IWfTaskVo, type: string, params: ITaskOperate, commentReadonly: boolean) => {
   if (commentReadonly) {
     readonly.value = true
@@ -208,12 +219,16 @@ const handleComplete = async () => {
         ElMessage.warning('请填写审批意见！')
         return
       }
+      if (showSelPersons.value && !task.value.variables.nextChecker?.length) {
+        ElMessage.warning('请选择下一步审核人！')
+        return
+      }
       //同意
       const askVo = {
         taskId: task.value.taskId,
         userId: userInfoStore().getUserInfo.id,
         comment: task.value.comment,
-        // variables: task.value.variables
+        variables: task.value.variables
       }
       //若自定义了同意函数，则调用自定义函数
       if (taskOperate.value?.completeFunction) {
@@ -322,6 +337,7 @@ defineExpose({
   .el-card__body {
     padding: 5px;
   }
+
   .el-upload-dragger {
     padding: 5px;
     //height: 120px;

package/src/components/workflow/components/SelectAssigneeDialog.vue

@@ -9,6 +9,7 @@
         v-for="(data, index) of datas"
         labelPosition="top"
         size="default"
+        :key="data.procInsId"
         :style="{ width: '100%' }"
       >
         <el-form-item label="任务名">

package/src/config/VxeTableConfig.ts

@@ -8,6 +8,7 @@ import ExcelJS from 'exceljs'
 import 'vxe-pc-ui/lib/style.css'
 import '../css/vxeTableUI/all.scss'
 import VxeUIPluginExportPDF from '@vxe-ui/plugin-export-pdf'
+import { jsPDF } from 'jspdf'
 // 导入默认的语言
 import zhCN from 'vxe-table/lib/locale/lang/zh-CN'
 
@@ -22,7 +23,7 @@ export function initVxeTableInPage(enableExcel: boolean = false, enablePdf: bool
   // 局部注册插件
   VxeUI.use(VxeUIPluginRenderElement)
   if (enableExcel) VxeUI.use(VxeUIPluginExportXLSX, { ExcelJS })
-  if (enablePdf) VxeUI.use(VxeUIPluginExportPDF, {  })
+  if (enablePdf) VxeUI.use(VxeUIPluginExportPDF, { jsPDF })
 
   // 设置表格配置（可复制你在 VxeTableConfig.ts 中的配置）
   VxeUI.setConfig({