adtec-core-package 2.4.4 → 2.4.6

package/src/components/workflow/WorkflowTodoDialog.vue

@@ -1,89 +1,91 @@
-<!--创建人 xux-->
-<!--说明: 工作流待办组件-->
-<!--创建时间: 2025/1/20 下午5:27-->
-<!--修改时间: 2025/1/20 下午5:27-->
-<template>
-  <component :is="compInst" ref="compRef" v-model="showComp" class="todo-dialog-class">
-    <template v-if="taskId" #workflow>
-      <!--      @success="emit('workflowComplete')"-->
-      <task-operation
-        v-if="taskOperationShow"
-        :show-process-btn="true"
-        :taskId="taskId"
-        :params="compRef?.taskOption"
-      >
-      </task-operation>
-    </template>
-  </component>
-</template>
-<script setup lang="ts">
-import type { IParameter } from '../../interface/Message'
-import { nextTick, onMounted, onUnmounted, ref } from 'vue'
-import TaskOperation from './TaskOperation.vue'
-import modules from '../../utils/modules'
-import { ElMessage } from 'element-plus'
-import { useEventBus } from '@vueuse/core'
-
-const applicationModule = import.meta.env.VITE_APPLICATION_MODULE
-// const emit = defineEmits(['workflowComplete'])
-const compInst = ref()
-const compRef = ref()
-const showComp = ref(false)
-const taskId = ref('')
-const taskOperationShow = ref(true)
-onMounted(() => {
-  //@ts-ignore
-  window.$wujie?.bus.$off(applicationModule + 'WorkflowTodoBus')
-  //@ts-ignore
-  window.$wujie?.bus.$on(applicationModule + 'WorkflowTodoBus', async (params: IParameter[]) => {
-    initTodoDialog(params)
-  })
-})
-onUnmounted(() => {
-  //@ts-ignore
-  window.$wujie?.bus.$off(applicationModule + 'WorkflowTodoBus')
-})
-//待办展现逻辑
-const initTodoDialog = async (params: IParameter[]) => {
-  showComp.value = false
-  let linkModelPath = params?.find((x: IParameter) => x.code === 'nodeTag')?.value
-  //去除应用前缀
-  if (linkModelPath.indexOf(':') > -1) {
-    linkModelPath = linkModelPath.split(':')[1]
-  }
-  if (!linkModelPath) {
-    ElMessage.warning('未设置流程前端组件')
-    return
-  }
-  if (linkModelPath) {
-    if (linkModelPath.indexOf('/') > -1) {
-      //组件
-      showComp.value = true
-      const comp = modules[linkModelPath]
-      const d: any = await comp()
-      compInst.value = d.default
-      taskOperationShow.value = false
-      nextTick(() => {
-        taskOperationShow.value = true
-        if (compRef.value?.initByWorkflow) {
-          taskId.value = params?.find((x: IParameter) => x.code === 'taskId')?.value
-          const wParam = {
-            businessId: params?.find((x: IParameter) => x.code === 'businessId')?.value,
-            taskId: taskId.value,
-            nodeTag: params?.find((x: IParameter) => x.code === 'nodeTag')?.value,
-            nodeParam: params?.find((x: IParameter) => x.code === 'nodeParam')?.value,
-            taskName: params?.find((x: IParameter) => x.code === 'taskName')?.value,
-          }
-          compRef.value?.initByWorkflow(wParam)
-        }
-      })
-    } else {
-      //菜单
-      const menuCode = params?.find((x: IParameter) => x.code === 'menuCode')?.value
-      const bus = useEventBus<IParameter[]>((menuCode ?? linkModelPath) + '_message')
-      bus.emit(params)
-    }
-  }
-}
-</script>
-<style scoped lang="scss"></style>
+<!--创建人 xux-->
+<!--说明: 工作流待办组件-->
+<!--创建时间: 2025/1/20 下午5:27-->
+<!--修改时间: 2025/1/20 下午5:27-->
+<template>
+  <component :is="compInst" ref="compRef" v-model="showComp" class="todo-dialog-class">
+    <template v-if="taskId" #workflow>
+      <!--      @success="emit('workflowComplete')"-->
+      <task-operation
+        v-if="taskOperationShow"
+        :show-process-btn="true"
+        :taskId="taskId"
+        :params="compRef?.taskOption"
+      >
+      </task-operation>
+    </template>
+  </component>
+</template>
+<script setup lang="ts">
+import type { IParameter } from '../../interface/Message'
+import { nextTick, onMounted, onUnmounted, ref } from 'vue'
+import TaskOperation from './TaskOperation.vue'
+import modules from '../../utils/modules'
+import { ElMessage } from 'element-plus'
+import { useEventBus } from '@vueuse/core'
+
+const applicationModule = import.meta.env.VITE_APPLICATION_MODULE
+// const emit = defineEmits(['workflowComplete'])
+const compInst = ref()
+const compRef = ref()
+const showComp = ref(false)
+const taskId = ref('')
+const taskOperationShow = ref(true)
+onMounted(() => {
+  //@ts-ignore
+  window.$wujie?.bus.$off(applicationModule + 'WorkflowTodoBus')
+  //@ts-ignore
+  window.$wujie?.bus.$on(applicationModule + 'WorkflowTodoBus', async (params: IParameter[]) => {
+    initTodoDialog(params)
+  })
+})
+onUnmounted(() => {
+  //@ts-ignore
+  window.$wujie?.bus.$off(applicationModule + 'WorkflowTodoBus')
+})
+//待办展现逻辑
+const initTodoDialog = async (params: IParameter[]) => {
+  showComp.value = false
+  let linkModelPath = params?.find((x: IParameter) => x.code === 'nodeTag')?.value
+  //去除应用前缀
+  if (linkModelPath.indexOf(':') > -1) {
+    linkModelPath = linkModelPath.split(':')[1]
+  }
+  if (!linkModelPath) {
+    ElMessage.warning('未设置流程前端组件')
+    return
+  }
+  if (linkModelPath) {
+    if (linkModelPath.indexOf('/') > -1) {
+      //组件
+      showComp.value = true
+      const comp = modules[linkModelPath]
+      const d: any = await comp()
+      compInst.value = d.default
+      taskOperationShow.value = false
+      nextTick(() => {
+        taskOperationShow.value = true
+        if (compRef.value?.initByWorkflow) {
+          taskId.value = params?.find((x: IParameter) => x.code === 'taskId')?.value
+          const wParam = {
+            businessId: params?.find((x: IParameter) => x.code === 'businessId')?.value,
+            taskId: taskId.value,
+            nodeTag: params?.find((x: IParameter) => x.code === 'nodeTag')?.value,
+            nodeParam: params?.find((x: IParameter) => x.code === 'nodeParam')?.value,
+            taskName: params?.find((x: IParameter) => x.code === 'taskName')?.value,
+            taskTitle: params?.find((x: IParameter) => x.code === 'taskTitle')?.value,
+            workflowVersion:params?.find((x: IParameter) => x.code === 'workflowVersion')?.value,
+          }
+          compRef.value?.initByWorkflow(wParam)
+        }
+      })
+    } else {
+      //菜单
+      const menuCode = params?.find((x: IParameter) => x.code === 'menuCode')?.value
+      const bus = useEventBus<IParameter[]>((menuCode ?? linkModelPath) + '_message')
+      bus.emit(params)
+    }
+  }
+}
+</script>
+<style scoped lang="scss"></style>

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

@@ -1,159 +1,159 @@
-<!--创建人 xux-->
-<!--说明: 加、减签-->
-<!--创建时间: 2025/1/10 上午10:20-->
-<!--修改时间: 2025/1/10 上午10:20-->
-<template>
-  <el-dialog v-model="dialogVisible" :title="title" append-to-body width="400">
-    <el-form v-loading="loading" labelPosition="top" size="default" :style="{ width: '100%' }">
-      <el-form-item label="任务名">
-        <span>{{ data?.taskName }}({{ data?.procName }})</span>
-      </el-form-item>
-      <el-form-item label="审批人" :required="true">
-        <el-checkbox-group
-          v-if="data?.candidate && data?.candidate.length > 0"
-          v-model="data.assignee"
-        >
-          <el-checkbox
-            :disabled="disableFunc(user.id!)"
-            v-for="user in data?.candidate"
-            :key="user.id"
-            :label="user.userName"
-            :value="user.id"
-          />
-          <el-icon-btn
-            v-if="dialogType === 'addMulti'"
-            style="margin-left: 15px"
-            model-value="adtec-plus"
-            tip="新增审批人"
-            @click="handleAdd"
-          ></el-icon-btn>
-        </el-checkbox-group>
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="save" :loading="loading">确定</el-button>
-      </div>
-    </template>
-  </el-dialog>
-  <user-select
-    view-type="dialog"
-    v-model="openUserSelect"
-    title="选择审批人员"
-    :multiple="true"
-    @success="handleRoleUserSet"
-    @cancel="openUserSelect = false"
-  ></user-select>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue'
-import workflowInstApi from '../../../api/workflow/workflowInstApi'
-import type { IWfTaskUsersVo } from '../../../interface/workflow/IWfTaskUsersVo'
-import { ElMessage } from 'element-plus'
-import { userInfoStore } from '../../../stores/userInfoStore'
-import type { ISysUserInfo } from '../../../interface/ISysUserInfo'
-import frameworkUtils from '../../../utils/FrameworkUtils.ts'
-const userInfo = userInfoStore()
-const data = ref<IWfTaskUsersVo>({
-  assignee: [],
-})
-const dialogVisible = ref(false)
-const loading = ref(false)
-const title = ref('??')
-const dialogType = ref('')
-const defaultAssignee = ref<string[]>([])
-const open = async (taskId: string, type: string) => {
-  try {
-    data.value = {
-      assignee: [],
-    }
-    dialogType.value = type
-    if (type === 'addMulti') {
-      title.value = '加签'
-    } else if (type === 'minusMulti') {
-      title.value = '减签'
-    } else {
-      return
-    }
-    dialogVisible.value = true
-    loading.value = true
-    data.value = { ...(await workflowInstApi.getTaskCandidate(taskId)), assignee: [] }
-    //设置当前的审批人
-    defaultAssignee.value = data.value.candidate?.map((e:ISysUserInfo) => e.id!) || []
-    data.value.assignee = [...defaultAssignee.value]
-  } catch (err: any) {
-    frameworkUtils.messageError(err)
-  } finally {
-    loading.value = false
-  }
-}
-const openUserSelect = ref(false)
-//加签新增审批人
-const handleRoleUserSet = async (users: ISysUserInfo[]) => {
-  if (users && users.length > 0) {
-    try {
-      for (const user of users) {
-        //判断是否已存在
-        if (data.value.candidate?.some((e:ISysUserInfo) => e.id === user.id)) {
-          continue
-        }
-        data.value.candidate?.push(user)
-        data.value.assignee?.push(user.id!)
-      }
-    } catch (err: any) {
-      frameworkUtils.messageError(err)
-    }
-  } else {
-    ElMessage.warning('请选择审批人员')
-  }
-  openUserSelect.value = false
-}
-const handleAdd = () => {
-  openUserSelect.value = true
-}
-const disableFunc = (val: string) => {
-  if (dialogType.value === 'addMulti') {
-    return defaultAssignee.value.includes(val)
-  } else if (dialogType.value === 'minusMulti') {
-    return userInfo.getUserInfo.id === val
-  } else {
-    return false
-  }
-}
-const save = async () => {
-  if (data.value.candidate?.length == 0 || data.value.assignee.length == 0) {
-    ElMessage.warning('请指定执行人！')
-    return
-  }
-  //加签逻辑判断
-  if (dialogType.value === 'addMulti') {
-    if (data.value.assignee.length <= defaultAssignee.value.length) {
-      ElMessage.warning('加签必须选择非原审批人！')
-      return
-    }
-  } else if (dialogType.value === 'minusMulti') {
-    //减签逻辑判断
-    if (data.value.assignee.length >= defaultAssignee.value.length) {
-      ElMessage.warning('减签必须取消选中原审批人！')
-      return
-    }
-  }
-  try {
-    loading.value = true
-    data.value.type = dialogType.value
-    await workflowInstApi.addOrMinusAssignee(data.value)
-    ElMessage.success('操作成功')
-    dialogVisible.value = false
-  } catch (err: any) {
-    frameworkUtils.messageError(err)
-  } finally {
-    loading.value = false
-  }
-}
-
-defineExpose({
-  open,
-})
-</script>
-<style scoped lang="scss"></style>
+<!--创建人 xux-->
+<!--说明: 加、减签-->
+<!--创建时间: 2025/1/10 上午10:20-->
+<!--修改时间: 2025/1/10 上午10:20-->
+<template>
+  <el-dialog v-model="dialogVisible" :title="title" append-to-body width="400">
+    <el-form v-loading="loading" labelPosition="top" size="default" :style="{ width: '100%' }">
+      <el-form-item label="任务名">
+        <span>{{ data?.taskName }}({{ data?.procName }})</span>
+      </el-form-item>
+      <el-form-item label="审批人" :required="true">
+        <el-checkbox-group
+          v-if="data?.candidate && data?.candidate.length > 0"
+          v-model="data.assignee"
+        >
+          <el-checkbox
+            :disabled="disableFunc(user.id!)"
+            v-for="user in data?.candidate"
+            :key="user.id"
+            :label="user.userName"
+            :value="user.id"
+          />
+          <el-icon-btn
+            v-if="dialogType === 'addMulti'"
+            style="margin-left: 15px"
+            model-value="adtec-plus"
+            tip="新增审批人"
+            @click="handleAdd"
+          ></el-icon-btn>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="save" :loading="loading">确定</el-button>
+      </div>
+    </template>
+  </el-dialog>
+  <user-select
+    view-type="dialog"
+    v-model="openUserSelect"
+    title="选择审批人员"
+    :multiple="true"
+    @success="handleRoleUserSet"
+    @cancel="openUserSelect = false"
+  ></user-select>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import workflowInstApi from '../../../api/workflow/workflowInstApi'
+import type { IWfTaskUsersVo } from '../../../interface/workflow/IWfTaskUsersVo'
+import { ElMessage } from 'element-plus'
+import { userInfoStore } from '../../../stores/userInfoStore'
+import type { ISysUserInfo } from '../../../interface/ISysUserInfo'
+import frameworkUtils from '../../../utils/FrameworkUtils.ts'
+const userInfo = userInfoStore()
+const data = ref<IWfTaskUsersVo>({
+  assignee: [],
+})
+const dialogVisible = ref(false)
+const loading = ref(false)
+const title = ref('??')
+const dialogType = ref('')
+const defaultAssignee = ref<string[]>([])
+const open = async (taskId: string, type: string) => {
+  try {
+    data.value = {
+      assignee: [],
+    }
+    dialogType.value = type
+    if (type === 'addMulti') {
+      title.value = '加签'
+    } else if (type === 'minusMulti') {
+      title.value = '减签'
+    } else {
+      return
+    }
+    dialogVisible.value = true
+    loading.value = true
+    data.value = { ...(await workflowInstApi.getTaskCandidate(taskId)), assignee: [] }
+    //设置当前的审批人
+    defaultAssignee.value = data.value.candidate?.map((e:ISysUserInfo) => e.id!) || []
+    data.value.assignee = [...defaultAssignee.value]
+  } catch (err: any) {
+    frameworkUtils.messageError(err)
+  } finally {
+    loading.value = false
+  }
+}
+const openUserSelect = ref(false)
+//加签新增审批人
+const handleRoleUserSet = async (users: ISysUserInfo[]) => {
+  if (users && users.length > 0) {
+    try {
+      for (const user of users) {
+        //判断是否已存在
+        if (data.value.candidate?.some((e:ISysUserInfo) => e.id === user.id)) {
+          continue
+        }
+        data.value.candidate?.push(user)
+        data.value.assignee?.push(user.id!)
+      }
+    } catch (err: any) {
+      frameworkUtils.messageError(err)
+    }
+  } else {
+    ElMessage.warning('请选择审批人员')
+  }
+  openUserSelect.value = false
+}
+const handleAdd = () => {
+  openUserSelect.value = true
+}
+const disableFunc = (val: string) => {
+  if (dialogType.value === 'addMulti') {
+    return defaultAssignee.value.includes(val)
+  } else if (dialogType.value === 'minusMulti') {
+    return userInfo.getUserInfo.id === val
+  } else {
+    return false
+  }
+}
+const save = async () => {
+  if (data.value.candidate?.length == 0 || data.value.assignee.length == 0) {
+    ElMessage.warning('请指定执行人！')
+    return
+  }
+  //加签逻辑判断
+  if (dialogType.value === 'addMulti') {
+    if (data.value.assignee.length <= defaultAssignee.value.length) {
+      ElMessage.warning('加签必须选择非原审批人！')
+      return
+    }
+  } else if (dialogType.value === 'minusMulti') {
+    //减签逻辑判断
+    if (data.value.assignee.length >= defaultAssignee.value.length) {
+      ElMessage.warning('减签必须取消选中原审批人！')
+      return
+    }
+  }
+  try {
+    loading.value = true
+    data.value.type = dialogType.value
+    await workflowInstApi.addOrMinusAssignee(data.value)
+    ElMessage.success('操作成功')
+    dialogVisible.value = false
+  } catch (err: any) {
+    frameworkUtils.messageError(err)
+  } finally {
+    loading.value = false
+  }
+}
+
+defineExpose({
+  open,
+})
+</script>
+<style scoped lang="scss"></style>