adtec-core-package 1.2.4 → 1.2.6

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

@@ -1,226 +1,226 @@
-<!--创建人 xux-->
-<!--说明: ProcessInstanceStep-->
-<!--创建时间: 2024/11/20 上午10:49-->
-<!--修改时间: 2024/11/20 上午10:49-->
-<script setup lang="ts">
-import workbenchInstApi from '../../../api/workflow/workflowInstApi'
-import { ElMessage } from 'element-plus'
-import { ref } from 'vue'
-import type { IWfProcessInstVo, IWfTaskVo } from '../../../interface/workflow/IWfTaskVo'
-import ElUploads from '../../../components/upload/ElUploads.vue'
-import type { ISysUploadFiles } from '../../../interface/ISysUploadFiles'
-import documentApi from '../../../api/DocumentApi'
-import frameworkUtils from '../../../utils/FrameworkUtils.ts'
-const props = withDefaults(
-  defineProps<{
-    procInstId: string
-  }>(),
-  {
-    procInstId: '',
-  },
-)
-const loading = ref<boolean>(false)
-const wfProcessInstVo = ref<IWfProcessInstVo>()
-interface IWfTaskGroup {
-  taskName: string
-  taskDefKey: string
-  parentExecutionId: string
-  createTime: string
-  finishTime: string
-  tasks: IWfTaskVo[]
-}
-const taskGroup = ref<IWfTaskGroup[]>()
-const taskFiles = ref<ISysUploadFiles[]>([])
-const init = async (procInstId: string) => {
-  if (!procInstId) return
-  try {
-    loading.value = true
-    wfProcessInstVo.value = await workbenchInstApi.getProcessTaskList(procInstId)
-    taskGroup.value = []
-    if (wfProcessInstVo.value?.hisTasks?.length) {
-      setTaskGroup(wfProcessInstVo.value.hisTasks || [])
-      if (wfProcessInstVo.value.hisTasks.length > 0) {
-        await documentApi
-          .getUpLoadFilesByBussinessIds(wfProcessInstVo.value.hisTasks.map((item) => item.taskId))
-          .then((res) => {
-            taskFiles.value = res
-          })
-          .catch((err) => {
-            frameworkUtils.messageError(err)
-          })
-      }
-    }
-    if (wfProcessInstVo.value?.activeTasks?.length) {
-      setTaskGroup(wfProcessInstVo.value.activeTasks || [])
-    }
-  } catch (err: any) {
-    taskGroup.value = []
-    frameworkUtils.messageError(err)
-  } finally {
-    loading.value = false
-  }
-}
-const setTaskGroup = (tasks: IWfTaskVo[]) => {
-  taskGroup.value = taskGroup.value || []
-  for (const hisTask of tasks) {
-    const exist = taskGroup.value.find(
-      (x) =>
-        x.taskDefKey === hisTask.taskDefKey && x.parentExecutionId === hisTask.parentExecutionId,
-    )
-    if (exist) {
-      if (hisTask.finishTime && hisTask.finishTime > exist.finishTime) {
-        exist.finishTime = hisTask.finishTime
-      }
-      if (hisTask.createTime && hisTask.createTime < exist.createTime) {
-        exist.createTime = hisTask.createTime
-      }
-      if (!hisTask.finishTime) {
-        const eTask = exist.tasks.find((x) => !x.finishTime)
-        if (eTask) {
-          eTask.assigneeName += '/' + hisTask.assigneeName
-        } else {
-          exist.tasks.push(hisTask)
-        }
-      } else {
-        exist.tasks.push(hisTask)
-      }
-    } else {
-      taskGroup.value.push({
-        taskName: hisTask.taskName || '',
-        taskDefKey: hisTask.taskDefKey || '',
-        parentExecutionId: hisTask.parentExecutionId || '',
-        finishTime: hisTask.finishTime || '',
-        createTime: hisTask.createTime || '',
-        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',
-      )
-      if (n1 == 0) {
-        return a.createTime.localeCompare(b.createTime)
-      }
-      return n1
-    })
-  }
-}
-const getStatus = (task: IWfTaskVo) => {
-  if (!task.finishTime) {
-    if (task.operations && task.operations === 'assignee') {
-      return '待指定审批人'
-    }
-    return '待办'
-  } else {
-    if (task.taskLocalVars && task.taskLocalVars.firstTask) {
-      return '已提交'
-    }
-    if (task.commentList && task.commentList.length > 0) {
-      return ['待办', '已办', '退回', '驳回', '委派', '转办', '终止', '撤回'][
-        Number(task.commentList[task.commentList.length - 1].type)
-      ]
-    }
-    return '已办'
-  }
-}
-defineExpose({
-  init,
-})
-</script>
-
-<template>
-  <el-flex justify="space-around" align="center" v-loading="loading" width="100%">
-    <el-steps direction="vertical" align-center :space="160">
-      <el-step
-        v-for="item in taskGroup"
-        :key="item.parentExecutionId"
-        :status="item.tasks.find((x) => !x.finishTime) ? 'finish' : 'success'"
-      >
-        <!--          <template #icon>-->
-        <!--            <flow-icon :name="getIcon(item.tasks)" :size="20" />-->
-        <!--          </template>-->
-        <template #title>
-          <span style="display: block">{{ item.taskName }}</span>
-        </template>
-        <template #description>
-          <el-flex
-            :vertical="false"
-            style="max-height: 300px; max-width: 690px; min-width: 150px; min-height: 60px"
-            justify="flex-start"
-          >
-            <el-flex
-              :vertical="true"
-              v-for="task in item.tasks"
-              :key="task.taskId"
-              width="170px"
-              style="
-                margin-bottom: 5px;
-                padding: 5px;
-                margin-right: 5px;
-                border-radius: 8px;
-                background: #f8f8f8;
-              "
-            >
-              <el-flex height="30px" align="center" justify="space-between">
-                <el-tooltip
-                  v-if="task.assigneeName"
-                  :content="task.assigneeName"
-                  placement="top"
-                  effect="light"
-                >
-                  <span class="ellipsis" style="font-size: 14px">{{ task.assigneeName }}</span>
-                </el-tooltip>
-                <el-tag size="small" :type="task.finishTime ? 'success' : 'primary'">{{
-                  getStatus(task)
-                }}</el-tag>
-              </el-flex>
-              <el-tooltip
-                v-if="task.comment"
-                :content="task.comment"
-                placement="top"
-                effect="light"
-              >
-                <span class="ellipsis">{{ task.comment }}</span>
-              </el-tooltip>
-              <el-flex v-if="taskFiles.some((x) => x.businessId === task.taskId)" width="160px">
-                <!--                <span style="font-size: 14px">附件：</span>-->
-                <el-uploads
-                  :is-edlt="false"
-                  :vertical="true"
-                  :businessId="task.taskId"
-                  :upload-files-list="taskFiles.filter((x) => x.businessId === task.taskId)"
-                ></el-uploads>
-              </el-flex>
-
-              <span style="display: block; color: #909399" v-if="task.comment">{{
-                task.finishTime
-              }}</span>
-            </el-flex>
-          </el-flex>
-        </template>
-      </el-step>
-    </el-steps>
-  </el-flex>
-</template>
-
-<style scoped lang="scss">
-.ellipsis {
-  display: inline-block; /* 或 block */
-  max-width: 100%; /* 设置宽度 */
-  overflow: hidden; /* 隐藏超出的内容 */
-  white-space: nowrap; /* 强制不换行 */
-  text-overflow: ellipsis; /* 超出显示省略号 */
-  min-height: 20px;
-  font-size: 14px;
-}
-
-:deep .el-step__line {
-  background-color: transparent;
-  border: 1.5px solid;
-}
-:deep .el-step__description {
-  padding: 0;
-}
-</style>
+<!--创建人 xux-->
+<!--说明: ProcessInstanceStep-->
+<!--创建时间: 2024/11/20 上午10:49-->
+<!--修改时间: 2024/11/20 上午10:49-->
+<script setup lang="ts">
+import workbenchInstApi from '../../../api/workflow/workflowInstApi'
+import { ElMessage } from 'element-plus'
+import { ref } from 'vue'
+import type { IWfProcessInstVo, IWfTaskVo } from '../../../interface/workflow/IWfTaskVo'
+import ElUploads from '../../../components/upload/ElUploads.vue'
+import type { ISysUploadFiles } from '../../../interface/ISysUploadFiles'
+import documentApi from '../../../api/DocumentApi'
+import frameworkUtils from '../../../utils/FrameworkUtils.ts'
+const props = withDefaults(
+  defineProps<{
+    procInstId: string
+  }>(),
+  {
+    procInstId: '',
+  },
+)
+const loading = ref<boolean>(false)
+const wfProcessInstVo = ref<IWfProcessInstVo>()
+interface IWfTaskGroup {
+  taskName: string
+  taskDefKey: string
+  parentExecutionId: string
+  createTime: string
+  finishTime: string
+  tasks: IWfTaskVo[]
+}
+const taskGroup = ref<IWfTaskGroup[]>()
+const taskFiles = ref<ISysUploadFiles[]>([])
+const init = async (procInstId: string) => {
+  if (!procInstId) return
+  try {
+    loading.value = true
+    wfProcessInstVo.value = await workbenchInstApi.getProcessTaskList(procInstId)
+    taskGroup.value = []
+    if (wfProcessInstVo.value?.hisTasks?.length) {
+      setTaskGroup(wfProcessInstVo.value.hisTasks || [])
+      if (wfProcessInstVo.value.hisTasks.length > 0) {
+        await documentApi
+          .getUpLoadFilesByBussinessIds(wfProcessInstVo.value.hisTasks.map((item) => item.taskId))
+          .then((res) => {
+            taskFiles.value = res
+          })
+          .catch((err) => {
+            frameworkUtils.messageError(err)
+          })
+      }
+    }
+    if (wfProcessInstVo.value?.activeTasks?.length) {
+      setTaskGroup(wfProcessInstVo.value.activeTasks || [])
+    }
+  } catch (err: any) {
+    taskGroup.value = []
+    frameworkUtils.messageError(err)
+  } finally {
+    loading.value = false
+  }
+}
+const setTaskGroup = (tasks: IWfTaskVo[]) => {
+  taskGroup.value = taskGroup.value || []
+  for (const hisTask of tasks) {
+    const exist = taskGroup.value.find(
+      (x) =>
+        x.taskDefKey === hisTask.taskDefKey && x.parentExecutionId === hisTask.parentExecutionId,
+    )
+    if (exist) {
+      if (hisTask.finishTime && hisTask.finishTime > exist.finishTime) {
+        exist.finishTime = hisTask.finishTime
+      }
+      if (hisTask.createTime && hisTask.createTime < exist.createTime) {
+        exist.createTime = hisTask.createTime
+      }
+      if (!hisTask.finishTime) {
+        const eTask = exist.tasks.find((x) => !x.finishTime)
+        if (eTask) {
+          eTask.assigneeName += '/' + hisTask.assigneeName
+        } else {
+          exist.tasks.push(hisTask)
+        }
+      } else {
+        exist.tasks.push(hisTask)
+      }
+    } else {
+      taskGroup.value.push({
+        taskName: hisTask.taskName || '',
+        taskDefKey: hisTask.taskDefKey || '',
+        parentExecutionId: hisTask.parentExecutionId || '',
+        finishTime: hisTask.finishTime || '',
+        createTime: hisTask.createTime || '',
+        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',
+      )
+      if (n1 == 0) {
+        return a.createTime.localeCompare(b.createTime)
+      }
+      return n1
+    })
+  }
+}
+const getStatus = (task: IWfTaskVo) => {
+  if (!task.finishTime) {
+    if (task.operations && task.operations === 'assignee') {
+      return '待指定审批人'
+    }
+    return '待办'
+  } else {
+    if (task.taskLocalVars && task.taskLocalVars.firstTask) {
+      return '已提交'
+    }
+    if (task.commentList && task.commentList.length > 0) {
+      return ['待办', '已办', '退回', '驳回', '委派', '转办', '终止', '撤回'][
+        Number(task.commentList[task.commentList.length - 1].type)
+      ]
+    }
+    return '已办'
+  }
+}
+defineExpose({
+  init,
+})
+</script>
+
+<template>
+  <el-flex justify="space-around" align="center" v-loading="loading" width="100%">
+    <el-steps direction="vertical" align-center :space="160">
+      <el-step
+        v-for="item in taskGroup"
+        :key="item.parentExecutionId"
+        :status="item.tasks.find((x) => !x.finishTime) ? 'finish' : 'success'"
+      >
+        <!--          <template #icon>-->
+        <!--            <flow-icon :name="getIcon(item.tasks)" :size="20" />-->
+        <!--          </template>-->
+        <template #title>
+          <span style="display: block">{{ item.taskName }}</span>
+        </template>
+        <template #description>
+          <el-flex
+            :vertical="false"
+            style="max-height: 300px; max-width: 690px; min-width: 150px; min-height: 60px"
+            justify="flex-start"
+          >
+            <el-flex
+              :vertical="true"
+              v-for="task in item.tasks"
+              :key="task.taskId"
+              width="170px"
+              style="
+                margin-bottom: 5px;
+                padding: 5px;
+                margin-right: 5px;
+                border-radius: 8px;
+                background: #f8f8f8;
+              "
+            >
+              <el-flex height="30px" align="center" justify="space-between">
+                <el-tooltip
+                  v-if="task.assigneeName"
+                  :content="task.assigneeName"
+                  placement="top"
+                  effect="light"
+                >
+                  <span class="ellipsis" style="font-size: 14px">{{ task.assigneeName }}</span>
+                </el-tooltip>
+                <el-tag size="small" :type="task.finishTime ? 'success' : 'primary'">{{
+                  getStatus(task)
+                }}</el-tag>
+              </el-flex>
+              <el-tooltip
+                v-if="task.comment"
+                :content="task.comment"
+                placement="top"
+                effect="light"
+              >
+                <span class="ellipsis">{{ task.comment }}</span>
+              </el-tooltip>
+              <el-flex v-if="taskFiles.some((x) => x.businessId === task.taskId)" width="160px">
+                <!--                <span style="font-size: 14px">附件：</span>-->
+                <el-uploads
+                  :is-edlt="false"
+                  :vertical="true"
+                  :businessId="task.taskId"
+                  :upload-files-list="taskFiles.filter((x) => x.businessId === task.taskId)"
+                ></el-uploads>
+              </el-flex>
+
+              <span style="display: block; color: #909399" v-if="task.comment">{{
+                task.finishTime
+              }}</span>
+            </el-flex>
+          </el-flex>
+        </template>
+      </el-step>
+    </el-steps>
+  </el-flex>
+</template>
+
+<style scoped lang="scss">
+.ellipsis {
+  display: inline-block; /* 或 block */
+  max-width: 100%; /* 设置宽度 */
+  overflow: hidden; /* 隐藏超出的内容 */
+  white-space: nowrap; /* 强制不换行 */
+  text-overflow: ellipsis; /* 超出显示省略号 */
+  min-height: 20px;
+  font-size: 14px;
+}
+
+:deep .el-step__line {
+  background-color: transparent;
+  border: 1.5px solid;
+}
+:deep .el-step__description {
+  padding: 0;
+}
+</style>

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

@@ -1,109 +1,109 @@
-<!--创建人 xux-->
-<!--说明: SelectAssigneeDialog-->
-<!--创建时间: 2024/11/14 下午5:56-->
-<!--修改时间: 2024/11/14 下午5:56-->
-<template>
-  <el-dialog v-model="dialogVisible" title="指定执行人" append-to-body width="450">
-    <el-flex v-loading="loading" :vertical="true">
-      <el-form
-        v-for="(data, index) of datas"
-        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
-              style="width: 80px"
-              v-for="user in data?.candidate"
-              :key="user.id"
-              :label="user.userName"
-              :value="user.id"
-            />
-          </el-checkbox-group>
-        </el-form-item>
-        <el-divider v-if="index != datas?.length - 1"></el-divider>
-      </el-form>
-    </el-flex>
-    <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>
-</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 frameworkUtils from '../../../utils/FrameworkUtils.ts'
-const emit = defineEmits(['success'])
-const datas = ref<IWfTaskUsersVo[]>([])
-const dialogVisible = ref(false)
-const loading = ref(false)
-const open = async (taskId: string) => {
-  try {
-    datas.value = [
-      {
-        assignee: [],
-      },
-    ]
-    dialogVisible.value = true
-    loading.value = true
-    const taskUsers = await workflowInstApi.getTaskCandidateList(taskId)
-    if (taskUsers?.length > 0) {
-      for (let taskUser of taskUsers) {
-        taskUser.assignee = []
-      }
-      datas.value = taskUsers
-    } else {
-      ElMessage.warning('无候选人数据')
-    }
-  } catch (err: any) {
-    frameworkUtils.messageError(err)
-  } finally {
-    loading.value = false
-  }
-}
-const save = async () => {
-  for (let data of datas.value) {
-    if (data.candidate?.length == 0 || data.assignee.length == 0) {
-      ElMessage.warning('请指定执行人！')
-      return
-    }
-  }
-  try {
-    loading.value = true
-    await workflowInstApi.setAssigneeList(datas.value)
-    ElMessage.success('操作成功')
-    emit('success', '')
-    dialogVisible.value = false
-  } catch (err: any) {
-    frameworkUtils.messageError(err)
-  } finally {
-    loading.value = false
-  }
-}
-
-defineExpose({
-  open,
-})
-</script>
-<style scoped lang="scss">
-:deep {
-  .el-divider--horizontal {
-    margin: 10px 0;
-  }
-  .el-checkbox {
-    margin-right: 10px;
-  }
-}
-</style>
+<!--创建人 xux-->
+<!--说明: SelectAssigneeDialog-->
+<!--创建时间: 2024/11/14 下午5:56-->
+<!--修改时间: 2024/11/14 下午5:56-->
+<template>
+  <el-dialog v-model="dialogVisible" title="指定执行人" append-to-body width="450">
+    <el-flex v-loading="loading" :vertical="true">
+      <el-form
+        v-for="(data, index) of datas"
+        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
+              style="width: 80px"
+              v-for="user in data?.candidate"
+              :key="user.id"
+              :label="user.userName"
+              :value="user.id"
+            />
+          </el-checkbox-group>
+        </el-form-item>
+        <el-divider v-if="index != datas?.length - 1"></el-divider>
+      </el-form>
+    </el-flex>
+    <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>
+</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 frameworkUtils from '../../../utils/FrameworkUtils.ts'
+const emit = defineEmits(['success'])
+const datas = ref<IWfTaskUsersVo[]>([])
+const dialogVisible = ref(false)
+const loading = ref(false)
+const open = async (taskId: string) => {
+  try {
+    datas.value = [
+      {
+        assignee: [],
+      },
+    ]
+    dialogVisible.value = true
+    loading.value = true
+    const taskUsers = await workflowInstApi.getTaskCandidateList(taskId)
+    if (taskUsers?.length > 0) {
+      for (let taskUser of taskUsers) {
+        taskUser.assignee = []
+      }
+      datas.value = taskUsers
+    } else {
+      ElMessage.warning('无候选人数据')
+    }
+  } catch (err: any) {
+    frameworkUtils.messageError(err)
+  } finally {
+    loading.value = false
+  }
+}
+const save = async () => {
+  for (let data of datas.value) {
+    if (data.candidate?.length == 0 || data.assignee.length == 0) {
+      ElMessage.warning('请指定执行人！')
+      return
+    }
+  }
+  try {
+    loading.value = true
+    await workflowInstApi.setAssigneeList(datas.value)
+    ElMessage.success('操作成功')
+    emit('success', '')
+    dialogVisible.value = false
+  } catch (err: any) {
+    frameworkUtils.messageError(err)
+  } finally {
+    loading.value = false
+  }
+}
+
+defineExpose({
+  open,
+})
+</script>
+<style scoped lang="scss">
+:deep {
+  .el-divider--horizontal {
+    margin: 10px 0;
+  }
+  .el-checkbox {
+    margin-right: 10px;
+  }
+}
+</style>