adtec-core-package 2.0.8 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.0.8",
+  "version": "2.1.0",
   "private": false,
   "type": "module",
   "scripts": {
@@ -18,6 +18,7 @@
     "@types/echarts": "^5.0.0",
     "@vueuse/components": "^13.0.0",
     "@vueuse/core": "^13.0.0",
+    "@vxe-ui/plugin-export-pdf": "4.2.4",
     "@vxe-ui/plugin-export-xlsx": "4.2.1",
     "@vxe-ui/plugin-render-element": "4.0.10",
     "aieditor": "^1.3.4",
@@ -27,6 +28,7 @@
     "element-plus": "2.8.7",
     "exceljs": "4.4.0",
     "jsencrypt": "^3.3.2",
+    "jspdf": "2.5.2",
     "linq-to-ts": "^1.3.0",
     "pinia": "^2.3.0",
     "pinia-plugin-store": "^2.2.9",

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

@@ -1,9 +1,5 @@
-import {
-  VxeGrid
-} from 'vxe-table'
-import {
-  VxeUI
-} from 'vxe-pc-ui'
+import { VxeGrid } from 'vxe-table'
+import { VxeUI } from 'vxe-pc-ui'
 
 import VxeUIPluginRenderElement from '@vxe-ui/plugin-render-element'
 import '@vxe-ui/plugin-render-element/dist/style.css'
@@ -11,20 +7,23 @@ import VxeUIPluginExportXLSX from '@vxe-ui/plugin-export-xlsx'
 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'
 
 /**
  * 局部初始化 vxe-table 插件与配置
  */
-export function initVxeTableInPage(enableExcel: boolean = false) {
+export function initVxeTableInPage(enableExcel: boolean = false, enablePdf: boolean = false) {
   // 设置语言
   VxeUI.setI18n('zh-CN', zhCN)
   VxeUI.setLanguage('zh-CN')
 
   // 局部注册插件
   VxeUI.use(VxeUIPluginRenderElement)
-  VxeUI.use(VxeUIPluginExportXLSX, { ExcelJS })
+  if (enableExcel) VxeUI.use(VxeUIPluginExportXLSX, { ExcelJS })
+  if (enablePdf) VxeUI.use(VxeUIPluginExportPDF, { jsPDF })
 
   // 设置表格配置（可复制你在 VxeTableConfig.ts 中的配置）
   VxeUI.setConfig({
@@ -38,25 +37,25 @@ export function initVxeTableInPage(enableExcel: boolean = false) {
       showFooterOverflow: true,
       cellConfig: {},
       headerCellConfig: {
-        height: 41
+        height: 41,
       },
       resizeConfig: {
-        refreshDelay: 20
+        refreshDelay: 20,
       },
       resizableConfig: {
         dragMode: 'auto',
         showDragTip: false,
         isSyncAutoHeight: true,
         isSyncAutoWidth: true,
-        minHeight: 18
+        minHeight: 18,
       },
       columnDragConfig: {
         showIcon: true,
         showGuidesStatus: false,
-        showDragTip: false
+        showDragTip: false,
       },
       checkboxConfig: {
-        showHeader:true,
+        showHeader: true,
         // trigger: 'default',
         strict: true,
         highlight: false,
@@ -68,7 +67,7 @@ export function initVxeTableInPage(enableExcel: boolean = false) {
         autoPos: true,
         message: 'inline',
         msgMode: 'single',
-        theme: 'beautify'
+        theme: 'beautify',
       },
       columnConfig: {
         maxFixedSize: 4,
@@ -76,13 +75,13 @@ export function initVxeTableInPage(enableExcel: boolean = false) {
       },
       tooltipConfig: {
         enterable: true,
-        theme: 'light'
+        theme: 'light',
       },
       rowConfig: {
         isCurrent: true,
       },
       footerCellConfig: {
-        height: 'unset'
+        height: 'unset',
       },
       // menuConfig: {
       //   visibleMethod () {}
@@ -102,14 +101,14 @@ export function initVxeTableInPage(enableExcel: boolean = false) {
           mask: true,
           lockView: true,
           resize: true,
-          escClosable: true
+          escClosable: true,
         },
         drawerOptions: {
           mask: true,
           lockView: true,
           escClosable: true,
-          resize: true
-        }
+          resize: true,
+        },
       },
       sortConfig: {
         // remote: false,
@@ -119,14 +118,14 @@ export function initVxeTableInPage(enableExcel: boolean = false) {
         showIcon: true,
         allowClear: true,
         allowBtn: true,
-        iconLayout: 'vertical'
+        iconLayout: 'vertical',
       },
       filterConfig: {
         // remote: false,
         // filterMethod: null,
         // destroyOnClose: false,
         // isEvery: false,
-        showIcon: true
+        showIcon: true,
       },
       treeConfig: {
         rowField: 'id',
@@ -138,41 +137,41 @@ export function initVxeTableInPage(enableExcel: boolean = false) {
         transform: true,
         iconOpen: 'vxe-icon-square-minus',
         iconClose: 'vxe-icon-square-plus',
-        showIcon: true
+        showIcon: true,
       },
       expandConfig: {
         // trigger: 'default',
         showIcon: true,
-        mode: 'fixed'
+        mode: 'fixed',
       },
       editConfig: {
         // mode: 'cell',
         showIcon: true,
         showAsterisk: true,
-        autoFocus: true
+        autoFocus: true,
       },
       importConfig: {
         _typeMaps: {
           csv: 1,
           html: 1,
           xml: 1,
-          txt: 1
-        }
+          txt: 1,
+        },
       },
       exportConfig: {
         _typeMaps: {
           csv: 1,
           html: 1,
           xml: 1,
-          txt: 1
-        }
+          txt: 1,
+        },
       },
       printConfig: {},
       mouseConfig: {
-        extension: true
+        extension: true,
       },
       keyboardConfig: {
-        isEsc: true
+        isEsc: true,
       },
       areaConfig: {
         autoClear: true,
@@ -182,44 +181,44 @@ export function initVxeTableInPage(enableExcel: boolean = false) {
           top: true,
           left: true,
           bottom: true,
-          right: true
-        }
+          right: true,
+        },
       },
       clipConfig: {
         isCopy: true,
         isCut: true,
-        isPaste: true
+        isPaste: true,
       },
       fnrConfig: {
         isFind: true,
-        isReplace: true
+        isReplace: true,
       },
       virtualXConfig: {
         enabled: true,
         gt: 60,
         preSize: 0,
-        oSize: 1
+        oSize: 1,
       },
       virtualYConfig: {
         enabled: true,
         gt: 100,
         preSize: 1,
-        oSize: 2
+        oSize: 2,
       },
       scrollbarConfig: {
         // width: 0,
         // height: 0
-      }
+      },
     },
     grid: {
       formConfig: {
-        enabled: true
+        enabled: true,
       },
       pagerConfig: {
-        enabled: true
+        enabled: true,
       },
       toolbarConfig: {
-        enabled: true
+        enabled: true,
       },
       columnConfig: {
         maxFixedSize: 4,
@@ -234,16 +233,15 @@ export function initVxeTableInPage(enableExcel: boolean = false) {
           list: null,
           result: 'result',
           total: 'page.total',
-          message: 'message'
-        }
-      }
+          message: 'message',
+        },
+      },
     },
-    toolbar: {
-    }
+    toolbar: {},
   })
 }
 
 // 导出组件供子应用局部注册
 export const components = {
-  VxeGrid
+  VxeGrid,
 }

package/src/interface/ISortList.ts

@@ -0,0 +1,6 @@
+
+export interface ISortList  {
+  field: string
+  order: string
+  sortTime: number
+}