geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/dev' into dev-sugx20250509

Browse Source 
# Conflicts:
#	.env.development
#	.env.production
#	src/utils/env.ts
#	src/views/secondDev/LoginForm.vue
This commit is contained in:
suguangxu
2025-06-06 15:20:51 +08:00
parent 090457b5e7 792b78df1d
commit 1f7e0e6763
38 changed files with 683 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/views/form/template/index.vue
View File

@ -8,7 +8,6 @@
:clickRowToExpand="true"
:treeData="treeData"
:fieldNames="fieldNames"
@row-dbClick="dbClickRow"
:row-selection="rowSelection"
>
<template #title="item">
@ -202,6 +201,7 @@
import { InputParamItem } from '/@/components/ApiConfig/src/interface';
import { getDraftInfo } from '/@/api/workflow/process';
import FlowRecord from '/@/views/workflow/task/components/flow/FlowRecord.vue';
import {de} from "@fullcalendar/core/internal-common";
interface SearchDate {
fieldName: string;
format: string;
@ -578,26 +578,23 @@
}
function handleView(record: Recordable) {
if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
const { processId, taskIds, schemaId } = record.workflowData;
const { processId, taskIds, schemaId } = record.workflowData || {};
if (taskIds && taskIds.length) {
router.push({
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
query: {
taskId: taskIds[0],
rtId: currentRoute.value.query.rtId
}
});
} else if (record.workflowData?.schemaId && !record.workflowData.taskIds) {
const { processId, schemaId } = record.workflowData;
} else if (schemaId && !taskIds && processId) {
router.push({
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
path: '/flow/' + schemaId + '/' + processId + '/approveFlow',
query: {
readonly: 1,
taskId: '',
rtId: currentRoute.value.query.rtId
}
});
} else {
}else {
const info = {
id: record[pkField.value],
releaseId: menuId.value,
@ -758,6 +755,7 @@
}
}
async function handleLaunchProcess(record: Recordable) {
debugger
if (record.workflowData) {
if (record.workflowData.draftId) {
let res = await getDraftInfo(record.workflowData.draftId);
@ -783,10 +781,14 @@
}
}
function handleApproveProcess(record: Recordable) {
visibleApproveProcessRef.value = true;
schemaIdRef.value = record.workflowData.schemaId;
processIdRef.value = record.workflowData.processId;
taskIdRef.value = record.workflowData.taskIds[0];
const { processId, taskIds, schemaId } = record.workflowData;
router.push({
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
query: {
taskId: taskIds[0],
rtId: currentRoute.value.query.rtId
}
});
}
function handleCloseLaunch() {
visibleLaunchProcessRef.value = false;
@ -948,35 +950,6 @@
}
});
}
function dbClickRow(record) {
if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
const { processId, taskIds, schemaId } = record.workflowData;
router.push({
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
query: {
taskId: taskIds[0],
rtId: currentRoute.value.query.rtId
}
});
} else if (record.workflowData?.schemaId && !record.workflowData.taskIds) {
const { processId, schemaId } = record.workflowData;
router.push({
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
query: {
readonly: 1,
taskId: '',
rtId: currentRoute.value.query.rtId
}
});
} else {
router.push({
path: '/form/infoTaskManageItem/' + record.id + '/viewForm',
query: {
formPath: 'infoManage/infoTaskManageItem'
}
});
}
}
const rowSelection: TableProps['rowSelection'] = {
onChange: (selectedRowKeys: string[], selectedRows: DataType[]) => {