流转记录扩展修改

src/api/bpm/task/index.ts

@@ -66,7 +66,7 @@ export const rejectTask = async (data: any) => {
 
 export const getTaskListByProcessInstanceId = async (processInstanceId: string) => {
   return await request.get({
-    url: '/bpm/task/list-by-process-instance-id?processInstanceId=' + processInstanceId
+    url: '/bpm/task/list-by-process-instance-id2?processInstanceId=' + processInstanceId
   })
 }
 

src/api/bpm/taskextendrecord/index.ts

@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+// BPM 流转记录扩展 VO
+export interface TaskExtendRecordVO {
+  id: number // 编号
+  taskId: string // 任务id
+  taskName: string // 任务名称
+  startTime: Date // 开始时间
+  endTime: Date // 结束时间
+  userId: string // 用户id
+  userName: string // 用户名称
+  reason: string // 意见
+  durationInMillis: number // 持续时间
+  workTimeInMillis: number // 工作时间
+  processInstanceId: string // 流程实例id
+  field1: string // 备用字段1
+  field2: string // 备用字段2
+  field3: string // 备用字段3
+  status: number // 审批状态
+}
+
+// BPM 流转记录扩展 API
+export const TaskExtendRecordApi = {
+  // 查询BPM 流转记录扩展分页
+  getTaskExtendRecordPage: async (params: any) => {
+    return await request.get({ url: `/bpm/task-extend-record/page`, params })
+  },
+
+  // 查询BPM 流转记录扩展详情
+  getTaskExtendRecord: async (id: number) => {
+    return await request.get({ url: `/bpm/task-extend-record/get?id=` + id })
+  },
+
+  // 新增BPM 流转记录扩展
+  createTaskExtendRecord: async (data: TaskExtendRecordVO) => {
+    return await request.post({ url: `/bpm/task-extend-record/create`, data })
+  },
+
+  // 修改BPM 流转记录扩展
+  updateTaskExtendRecord: async (data: TaskExtendRecordVO) => {
+    return await request.put({ url: `/bpm/task-extend-record/update`, data })
+  },
+
+  // 删除BPM 流转记录扩展
+  deleteTaskExtendRecord: async (id: number) => {
+    return await request.delete({ url: `/bpm/task-extend-record/delete?id=` + id })
+  },
+
+  // 导出BPM 流转记录扩展 Excel
+  exportTaskExtendRecord: async (params) => {
+    return await request.download({ url: `/bpm/task-extend-record/export-excel`, params })
+  }
+}

src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTaskCustomConfig.vue

@@ -51,7 +51,7 @@
       </el-select>
     </el-form-item>
 
-    <el-divider content-position="left">相邻节点审批人相同</el-divider>
+    <el-divider content-position="left">审批人与提交人为同一人时</el-divider>
     <el-radio-group v-model="assignStartUserHandlerType" @change="updateAssignStartUserHandlerType" >
       <div class="flex-col">
         <div v-for="(item, index) in ASSIGN_START_USER_HANDLER_TYPES" :key="index">

src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue

@@ -107,15 +107,6 @@
           <template #title><Icon icon="ep:chat-dot-round" />意见</template>
           <el-form-item label="默认意见">
             <el-input v-model="DefaultOpinion" type="textarea" placeholder="请输入默认意见"  @input="updateOpinion"  @blur="updateOpinion" />
-<!--            <el-radio-group v-model="DefaultOpinion"  @change="updateOpinion">-->
-<!--              <el-radio-->
-<!--                  v-for="dict in getIntDictOptions(DICT_TYPE.BPM_TASK_FORM_APPROVE_REJECT_TYPE)"-->
-<!--                  :key="dict.value"-->
-<!--                  :value="dict.value"-->
-<!--              >-->
-<!--                {{ dict.label }}-->
-<!--              </el-radio>-->
-<!--            </el-radio-group>-->
           </el-form-item>
             <el-form-item label="意见">
 <!--              <el-radio-group v-model="attachType"  @change="updateElementAttachType">-->
@@ -130,7 +121,7 @@
             </el-form-item>
         </el-collapse-item>
         <el-collapse-item title="操作按钮" name="sub1" >
-          <template #title><Icon icon="ep:edit" />操作按钮</template>
+          <template #title><Icon icon="fa-solid:edit" />操作按钮</template>
           <div class="button-setting-pane"  >
             <div class="button-setting-title">
               <div class="button-title-label">操作按钮</div>

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

@@ -300,7 +300,7 @@
             <el-input
                 clearable
                 style="width: 100%"
-                placeholder="请选择转办人员"  disabled
+                placeholder="请选择委托人员"  disabled
             >
               <template #prepend>
                 <!-- 显示已选用户的标签 -->
@@ -321,6 +321,8 @@
                   />
                 </div>
               </template>
+              {{delegateForm.delegateUserId}}
+              {{selectedDelegateUsers}}
               <template #suffix >
                 <el-button @click="openDelegateSelect()" style="width: 50px"  size="default" type="text">
                   <el-icon style="margin-left: 45px" :size="20">
@@ -778,8 +780,12 @@ const transferFormRule = reactive<FormRules<typeof transferForm>>({
 })
 
 // 委派表单
+interface DelegateForm {
+  delegateUserId?: number;  // 使用 `number` 或 `undefined`
+  reason: string;
+}
 const delegateFormRef = ref<FormInstance>()
-const delegateForm = reactive({
+const delegateForm = reactive<DelegateForm>({
   delegateUserId: undefined,
   reason: ''
 })
@@ -940,7 +946,8 @@ const handleUserSelectConfirm = (_, users: UserVO[]) => {
   }
   if (currentSelectType.value === 'delegate') {
     selectedDelegateUsers.value = users
-    transferForm.delegateUserId = users[0].id
+    delegateForm.delegateUserId = users[0].id
+
   }
   if (currentSelectType.value === 'addsign') {
     selectedAddSignUsers.value = users
@@ -998,6 +1005,7 @@ const openPopover = async (type: string) => {
   if (type === 'return') {
     // 获取退回节点
     returnList.value = await TaskApi.getTaskListByReturn(runningTask.value.id)
+    console.log(returnList.value)
     if (returnList.value.length === 0) {
       message.warning('当前没有可退回的节点')
       return
@@ -1329,9 +1337,12 @@ const loadTodoTask = async(task: any) => {
 
   } else {
     approveForm.value = {} // 占位，避免为空
-    const defaultopinionpinion = await  TaskApi.getTaskConfigFromBpmn( task.id ,"DefaultOpinion")
+    if( task ) {
+      const defaultopinionpinion = await  TaskApi.getTaskConfigFromBpmn( task.id ,"defaultOpinion")
+      //console.log(defaultopinionpinion,"defaultopinionpinion")
       approveReasonForm.reason =defaultopinionpinion
     }
+  }
 }
 
 /** 校验流程表单 */

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

@@ -279,7 +279,6 @@ const getApprovalDetail = async () => {
     //console.log(data.activityNodes,"data.activityNodes")
     //console.log(data.todoTask,"data.todoTask")
     // 获取待办任务显示操作按钮
-    data.todoTask.reason = "同一"
     operationButtonRef.value?.loadTodoTask(data.todoTask)
     //console.log(data.todoTask,"data.todoTask")
   }catch (error) {

src/views/bpm/taskextendrecord/TaskExtendRecordForm.vue

@@ -0,0 +1,173 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="任务id" prop="taskId">
+        <el-input v-model="formData.taskId" placeholder="请输入任务id" />
+      </el-form-item>
+      <el-form-item label="任务名称" prop="taskName">
+        <el-input v-model="formData.taskName" placeholder="请输入任务名称" />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime">
+        <el-date-picker
+          v-model="formData.startTime"
+          type="datetime"
+          value-format="x"
+          placeholder="选择开始时间"
+        />
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endTime">
+        <el-date-picker
+          v-model="formData.endTime"
+          type="datetime"
+          value-format="x"
+          placeholder="选择结束时间"
+        />
+      </el-form-item>
+      <el-form-item label="用户id" prop="userId">
+        <el-input v-model="formData.userId" placeholder="请输入用户id" />
+      </el-form-item>
+      <el-form-item label="用户名称" prop="userName">
+        <el-input v-model="formData.userName" placeholder="请输入用户名称" />
+      </el-form-item>
+      <el-form-item label="意见" prop="reason">
+        <el-input v-model="formData.reason" placeholder="请输入意见" />
+      </el-form-item>
+      <el-form-item label="持续时间" prop="duration">
+        <el-input v-model="formData.duration" placeholder="请输入持续时间" />
+      </el-form-item>
+      <el-form-item label="工作时间" prop="workTime">
+        <el-input v-model="formData.workTime" placeholder="请输入工作时间" />
+      </el-form-item>
+      <el-form-item label="流程实例id" prop="processInstanceId">
+        <el-input v-model="formData.processInstanceId" placeholder="请输入流程实例id" />
+      </el-form-item>
+      <el-form-item label="备用字段1" prop="field1">
+        <el-input v-model="formData.field1" placeholder="请输入备用字段1" />
+      </el-form-item>
+      <el-form-item label="备用字段2" prop="field2">
+        <el-input v-model="formData.field2" placeholder="请输入备用字段2" />
+      </el-form-item>
+      <el-form-item label="备用字段3" prop="field3">
+        <el-input v-model="formData.field3" placeholder="请输入备用字段3" />
+      </el-form-item>
+      <el-form-item label="审批状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio label="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { TaskExtendRecordApi, TaskExtendRecordVO } from '@/api/bpm/taskextendrecord'
+
+/** BPM 流转记录扩展 表单 */
+defineOptions({ name: 'TaskExtendRecordForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  taskId: undefined,
+  taskName: undefined,
+  startTime: undefined,
+  endTime: undefined,
+  userId: undefined,
+  userName: undefined,
+  reason: undefined,
+  duration: undefined,
+  workTime: undefined,
+  processInstanceId: undefined,
+  field1: undefined,
+  field2: undefined,
+  field3: undefined,
+  status: undefined
+})
+const formRules = reactive({
+  startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
+  endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
+  reason: [{ required: true, message: '意见不能为空', trigger: 'blur' }],
+  duration: [{ required: true, message: '持续时间不能为空', trigger: 'blur' }],
+  workTime: [{ required: true, message: '工作时间不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await TaskExtendRecordApi.getTaskExtendRecord(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as TaskExtendRecordVO
+    if (formType.value === 'create') {
+      await TaskExtendRecordApi.createTaskExtendRecord(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await TaskExtendRecordApi.updateTaskExtendRecord(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    taskId: undefined,
+    taskName: undefined,
+    startTime: undefined,
+    endTime: undefined,
+    userId: undefined,
+    userName: undefined,
+    reason: undefined,
+    duration: undefined,
+    workTime: undefined,
+    processInstanceId: undefined,
+    field1: undefined,
+    field2: undefined,
+    field3: undefined,
+    status: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/bpm/taskextendrecord/index.vue

@@ -0,0 +1,274 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="任务id" prop="taskId">
+        <el-input
+          v-model="queryParams.taskId"
+          placeholder="请输入任务id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="任务名称" prop="taskName">
+        <el-input
+          v-model="queryParams.taskName"
+          placeholder="请输入任务名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime">
+        <el-date-picker
+          v-model="queryParams.startTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endTime">
+        <el-date-picker
+          v-model="queryParams.endTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="用户id" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="用户名称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+
+      <el-form-item label="流程实例id" prop="processInstanceId">
+        <el-input
+          v-model="queryParams.processInstanceId"
+          placeholder="请输入流程实例id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['bpm:task-extend-record:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['bpm:task-extend-record:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="任务id" align="center" prop="taskId" />
+      <el-table-column label="任务名称" align="center" prop="taskName" />
+      <el-table-column
+        label="开始时间"
+        align="center"
+        prop="startTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="结束时间"
+        align="center"
+        prop="endTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="用户名称" align="center" prop="userName" />
+<!--      <el-table-column label="意见" align="center" prop="reason" />-->
+<!--      <el-table-column label="持续时间" align="center" prop="durationInMillis" />-->
+<!--      <el-table-column label="工作时间" align="center" prop="workTimeInMillis" />-->
+      <el-table-column label="流程实例id" align="center" prop="processInstanceId" />
+<!--      <el-table-column label="备用字段1" align="center" prop="field1" />-->
+<!--      <el-table-column label="备用字段2" align="center" prop="field2" />-->
+<!--      <el-table-column label="备用字段3" align="center" prop="field3" />-->
+      <el-table-column label="审批状态" align="center" prop="status" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['bpm:task-extend-record:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['bpm:task-extend-record:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <TaskExtendRecordForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { TaskExtendRecordApi, TaskExtendRecordVO } from '@/api/bpm/taskextendrecord'
+import TaskExtendRecordForm from './TaskExtendRecordForm.vue'
+
+/** BPM 流转记录扩展 列表 */
+defineOptions({ name: 'TaskExtendRecord' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<TaskExtendRecordVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  taskId: undefined,
+  taskName: undefined,
+  startTime: [],
+  endTime: [],
+  userId: undefined,
+  userName: undefined,
+  reason: undefined,
+  duration: undefined,
+  workTime: undefined,
+  processInstanceId: undefined,
+  field1: undefined,
+  field2: undefined,
+  field3: undefined,
+  status: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await TaskExtendRecordApi.getTaskExtendRecordPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await TaskExtendRecordApi.deleteTaskExtendRecord(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TaskExtendRecordApi.exportTaskExtendRecord(queryParams)
+    download.excel(data, 'BPM 流转记录扩展.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>