Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

src/api/bpm/processInstance/index.ts

@@ -20,6 +20,17 @@ export type ProcessInstanceVO = {
   endTime: string
 }
 
+export type ProcessInstanceCCVO = {
+  type: number,
+  taskName: string,
+  taskKey: string,
+  processInstanceName: string,
+  processInstanceKey: string,
+  startUserId: string,
+  options:string [],
+  reason: string
+}
+
 export const getMyProcessInstancePage = async (params) => {
   return await request.get({ url: '/bpm/process-instance/my-page', params })
 }
@@ -39,3 +50,21 @@ export const cancelProcessInstance = async (id: number, reason: string) => {
 export const getProcessInstance = async (id: number) => {
   return await request.get({ url: '/bpm/process-instance/get?id=' + id })
 }
+
+/**
+ * 抄送
+ * @param data 抄送数据
+ * @returns 是否抄送成功
+ */
+export const createProcessInstanceCC = async (data) => {
+  return await request.post({ url: '/bpm/process-instance/cc/create', data: data })
+}
+
+/**
+ * 抄送列表
+ * @param params 
+ * @returns 
+ */
+export const getProcessInstanceCCPage = async (params) => {
+  return await request.get({ url: '/bpm/process-instance/cc/my-page', params })
+}

src/views/bpm/model/ModelForm.vue

@@ -96,17 +96,17 @@
         </el-form-item>
         <el-form-item
           v-if="formData.formType === 20"
-          label="表单查看路由"
+          label="表单查看地址"
           prop="formCustomViewPath"
         >
           <el-input
             v-model="formData.formCustomViewPath"
-            placeholder="请输入表单查看路由"
+            placeholder="请输入表单查看的组件地址"
             style="width: 330px"
           />
           <el-tooltip
             class="item"
-            content="自定义表单的查看路径，使用 Vue 的路由地址，例如说：bpm/oa/leave/view"
+            content="自定义表单的查看组件地址，使用 Vue 的组件地址，例如说：bpm/oa/leave/detail"
             effect="light"
             placement="top"
           >

src/views/bpm/processInstance/detail/TaskCCDialogForm.vue

@@ -0,0 +1,242 @@
+<template>
+  <Dialog v-model="dialogVisible" title="修改任务规则" width="600">
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
+      <el-form-item label="任务名称" prop="taskName">
+        <el-input v-model="formData.taskName" disabled placeholder="请输入任务名称" />
+      </el-form-item>
+      <el-form-item label="任务标识" prop="taskKey">
+        <el-input v-model="formData.taskKey" disabled placeholder="请输入任务标识" />
+      </el-form-item>
+      <el-form-item label="流程名称" prop="processInstanceName">
+        <el-input v-model="formData.processInstanceName" disabled placeholder="请输入流程名称" />
+      </el-form-item>
+      <el-form-item label="流程标识" prop="processInstanceKey">
+        <el-input v-model="formData.processInstanceKey" disabled placeholder="请输入流程标识" />
+      </el-form-item>
+
+      <el-form-item label="规则类型" prop="type">
+        <el-select v-model="formData.type" clearable style="width: 100%">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.BPM_TASK_ASSIGN_RULE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="formData.type === 10" label="指定角色" prop="roleIds">
+        <el-select v-model="formData.roleIds" clearable multiple style="width: 100%">
+          <el-option
+            v-for="item in roleOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="formData.type === 20 || formData.type === 21"
+        label="指定部门"
+        prop="deptIds"
+        span="24"
+      >
+        <el-tree-select
+          ref="treeRef"
+          v-model="formData.deptIds"
+          :data="deptTreeOptions"
+          :props="defaultProps"
+          empty-text="加载中，请稍后"
+          multiple
+          node-key="id"
+          show-checkbox
+        />
+      </el-form-item>
+      <el-form-item v-if="formData.type === 22" label="指定岗位" prop="postIds" span="24">
+        <el-select v-model="formData.postIds" clearable multiple style="width: 100%">
+          <el-option
+            v-for="item in postOptions"
+            :key="parseInt(item.id)"
+            :label="item.name"
+            :value="parseInt(item.id)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="formData.type === 30 || formData.type === 31 || formData.type === 32"
+        label="指定用户"
+        prop="userIds"
+        span="24"
+      >
+        <el-select v-model="formData.userIds" clearable multiple style="width: 100%">
+          <el-option
+            v-for="item in userOptions"
+            :key="parseInt(item.id)"
+            :label="item.nickname"
+            :value="parseInt(item.id)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="formData.type === 40" label="指定用户组" prop="userGroupIds">
+        <el-select v-model="formData.userGroupIds" clearable multiple style="width: 100%">
+          <el-option
+            v-for="item in userGroupOptions"
+            :key="parseInt(item.id)"
+            :label="item.name"
+            :value="parseInt(item.id)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="formData.type === 50" label="指定脚本" prop="scripts">
+        <el-select v-model="formData.scripts" clearable multiple style="width: 100%">
+          <el-option
+            v-for="dict in taskAssignScriptDictDatas"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="抄送原因" prop="reason">
+        <el-input v-model="formData.reason" placeholder="请输入抄送原因" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <!-- 操作按钮 -->
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { defaultProps, handleTree } from '@/utils/tree'
+import * as ProcessInstanceApi from '@/api/bpm/processInstance'
+import * as RoleApi from '@/api/system/role'
+import * as DeptApi from '@/api/system/dept'
+import * as PostApi from '@/api/system/post'
+import * as UserApi from '@/api/system/user'
+import * as UserGroupApi from '@/api/bpm/userGroup'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  type: Number(undefined),
+  taskName: '',
+  taskKey: '',
+  processInstanceName: '',
+  processInstanceKey: '',
+  startUserId: '',
+  options: [],
+  roleIds: [],
+  deptIds: [],
+  postIds: [],
+  userIds: [],
+  userGroupIds: [],
+  scripts: [],
+  reason: ''
+})
+const formRules = reactive({
+  type: [{ required: true, message: '规则类型不能为空', trigger: 'change' }],
+  roleIds: [{ required: true, message: '指定角色不能为空', trigger: 'change' }],
+  deptIds: [{ required: true, message: '指定部门不能为空', trigger: 'change' }],
+  postIds: [{ required: true, message: '指定岗位不能为空', trigger: 'change' }],
+  userIds: [{ required: true, message: '指定用户不能为空', trigger: 'change' }],
+  userGroupIds: [{ required: true, message: '指定用户组不能为空', trigger: 'change' }],
+  scripts: [{ required: true, message: '指定脚本不能为空', trigger: 'change' }],
+  reason: [{ required: true, message: '抄送原因不能为空', trigger: 'change' }]
+})
+const formRef = ref() // 表单 Ref
+const roleOptions = ref<RoleApi.RoleVO[]>([]) // 角色列表
+const deptOptions = ref<DeptApi.DeptVO[]>([]) // 部门列表
+const deptTreeOptions = ref() // 部门树
+const postOptions = ref<PostApi.PostVO[]>([]) // 岗位列表
+const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
+const userGroupOptions = ref<UserGroupApi.UserGroupVO[]>([]) // 用户组列表
+const taskAssignScriptDictDatas = getIntDictOptions(DICT_TYPE.BPM_TASK_ASSIGN_SCRIPT)
+
+/** 打开弹窗 */
+const open = async (row) => {
+  // 1. 先重置表单
+  resetForm()
+  // 2. 再设置表单
+  if (row != null) {
+    formData.value.type = undefined as unknown as number
+    formData.value.taskName = row.name
+    formData.value.taskKey = row.id
+    formData.value.processInstanceName = row.processInstance.name
+    formData.value.processInstanceKey = row.processInstance.id
+    formData.value.startUserId = row.processInstance.startUserId
+  }
+  // 打开弹窗
+  dialogVisible.value = true
+
+  // 获得角色列表
+  roleOptions.value = await RoleApi.getSimpleRoleList()
+  // 获得部门列表
+  deptOptions.value = await DeptApi.getSimpleDeptList()
+  deptTreeOptions.value = handleTree(deptOptions.value, 'id')
+  // 获得岗位列表
+  postOptions.value = await PostApi.getSimplePostList()
+  // 获得用户列表
+  userOptions.value = await UserApi.getSimpleUserList()
+  // 获得用户组列表
+  userGroupOptions.value = await UserGroupApi.getSimpleUserGroupList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  // 构建表单
+  const form = {
+    ...formData.value
+  }
+  // 将 roleIds 等选项赋值到 options 中
+  if (form.type === 10) {
+    form.options = form.roleIds
+  } else if (form.type === 20 || form.type === 21) {
+    form.options = form.deptIds
+  } else if (form.type === 22) {
+    form.options = form.postIds
+  } else if (form.type === 30 || form.type === 31 || form.type === 32) {
+    form.options = form.userIds
+  } else if (form.type === 40) {
+    form.options = form.userGroupIds
+  } else if (form.type === 50) {
+    form.options = form.scripts
+  }
+  form.roleIds = undefined
+  form.deptIds = undefined
+  form.postIds = undefined
+  form.userIds = undefined
+  form.userGroupIds = undefined
+  form.scripts = undefined
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = form as unknown as ProcessInstanceApi.ProcessInstanceCCVO
+    await ProcessInstanceApi.createProcessInstanceCC(data)
+    console.log(data)
+    message.success(t('common.createSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formRef.value?.resetFields()
+}
+</script>

src/views/bpm/task/cc/index.vue

@@ -0,0 +1,134 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form ref="queryFormRef" :inline="true" class="-mb-15px" label-width="68px">
+      <el-form-item label="流程名称" prop="name">
+        <el-input
+          v-model="queryParams.processInstanceName"
+          class="!w-240px"
+          clearable
+          placeholder="请输入流程名称"
+        />
+      </el-form-item>
+      <el-form-item label="所属流程" prop="processDefinitionId">
+        <el-input
+          v-model="queryParams.processInstanceId"
+          placeholder="请输入流程定义的编号"
+          clearable
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="抄送时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column align="center" label="所属流程" prop="processInstanceId" width="300px" />
+      <el-table-column align="center" label="流程名称" prop="processInstanceName" />
+      <el-table-column align="center" label="任务名称" prop="taskName" />
+      <el-table-column align="center" label="流程发起人" prop="startUserNickname" />
+      <el-table-column align="center" label="抄送发起人" prop="creatorNickname" />
+      <el-table-column align="center" label="抄送原因" prop="reason" />
+      <el-table-column
+        align="center"
+        label="抄送时间"
+        prop="createTime"
+        width="180"
+        :formatter="dateFormatter"
+      />
+      <el-table-column align="center" label="操作">
+        <template #default="scope">
+          <el-button link type="primary" @click="handleAudit(scope.row)">跳转待办</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+<script lang="ts" setup>
+import { dateFormatter } from '@/utils/formatTime'
+import * as ProcessInstanceApi from '@/api/bpm/processInstance'
+
+defineOptions({ name: 'BpmCCProcessInstance' })
+
+const { push } = useRouter() // 路由
+
+const loading = ref(false) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  processInstanceId: '',
+  processInstanceName: '',
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询任务列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ProcessInstanceApi.getProcessInstanceCCPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 处理审批按钮 */
+const handleAudit = (row) => {
+  push({
+    name: 'BpmProcessInstanceDetail',
+    query: {
+      id: row.processInstanceId
+    }
+  })
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/bpm/task/todo/index.vue

@@ -64,6 +64,7 @@
       <el-table-column align="center" label="操作">
         <template #default="scope">
           <el-button link type="primary" @click="handleAudit(scope.row)">审批进度</el-button>
+          <el-button link type="primary" @click="handleCC(scope.row)">抄送</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -74,12 +75,14 @@
       :total="total"
       @pagination="getList"
     />
+    <TaskCCDialogForm  ref="taskCCDialogForm"/>
   </ContentWrap>
 </template>
 
 <script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import * as TaskApi from '@/api/bpm/task'
+import TaskCCDialogForm from '../../processInstance/detail/TaskCCDialogForm.vue'
 
 defineOptions({ name: 'BpmDoneTask' })
 
@@ -130,6 +133,12 @@ const handleAudit = (row) => {
   })
 }
 
+const taskCCDialogForm = ref()
+/** 处理抄送按钮 */
+const handleCC = (row) => {
+  taskCCDialogForm.value.open(row)
+}
+
 /** 初始化 **/
 onMounted(() => {
   getList()