diff --git a/src/api/actHiTaskinst/index.ts b/src/api/actHiTaskinst/index.ts new file mode 100644 index 0000000..8c0131c --- /dev/null +++ b/src/api/actHiTaskinst/index.ts @@ -0,0 +1,87 @@ +import { ActHiTaskinstPageModel, ActHiTaskinstPageParams, ActHiTaskinstPageResult } from './model/ActHiTaskinstModel'; +import { defHttp } from '/@/utils/http/axios'; +import { ErrorMessageMode } from '/#/axios'; + +enum Api { + Page = '/dev/actHiTaskinst/page', + List = '/dev/actHiTaskinst/list', + Info = '/dev/actHiTaskinst/info', + ActHiTaskinst = '/dev/actHiTaskinst', + + +} + +/** + * @description: 查询ActHiTaskinst分页列表 + */ +export async function getActHiTaskinstPage(params: ActHiTaskinstPageParams, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Page, + params, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 获取ActHiTaskinst信息 + */ +export async function getActHiTaskinst(id: String, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Info, + params: { id }, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 新增ActHiTaskinst + */ +export async function addActHiTaskinst(actHiTaskinst: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.ActHiTaskinst, + params: actHiTaskinst, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 更新ActHiTaskinst + */ +export async function updateActHiTaskinst(actHiTaskinst: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.put( + { + url: Api.ActHiTaskinst, + params: actHiTaskinst, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 删除ActHiTaskinst(批量删除) + */ +export async function deleteActHiTaskinst(ids: string[], mode: ErrorMessageMode = 'modal') { + return defHttp.delete( + { + url: Api.ActHiTaskinst, + data: ids, + }, + { + errorMessageMode: mode, + }, + ); +} \ No newline at end of file diff --git a/src/api/actHiTaskinst/model/ActHiTaskinstModel.ts b/src/api/actHiTaskinst/model/ActHiTaskinstModel.ts new file mode 100644 index 0000000..fd340e1 --- /dev/null +++ b/src/api/actHiTaskinst/model/ActHiTaskinstModel.ts @@ -0,0 +1,54 @@ +import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; + +/** + * @description: ActHiTaskinst分页参数 模型 + */ +export interface ActHiTaskinstPageParams extends BasicPageParams { + id: string; + + taskDefKey: string; + + procDefKey: string; + + procDefId: string; + + rootProcInstId: string; + + procInstId: string; + + executionId: string; + + actInstId: string; + + name: string; +} + +/** + * @description: ActHiTaskinst分页返回值模型 + */ +export interface ActHiTaskinstPageModel { + id: string; + + taskDefKey: string; + + procDefKey: string; + + procDefId: string; + + rootProcInstId: string; + + procInstId: string; + + executionId: string; + + actInstId: string; + + name: string; +} + +0; + +/** + * @description: ActHiTaskinst分页返回值结构 + */ +export type ActHiTaskinstPageResult = BasicFetchResult; \ No newline at end of file diff --git a/src/api/auditOpt/auditRecord/index.ts b/src/api/auditOpt/auditRecord/index.ts new file mode 100644 index 0000000..86b9999 --- /dev/null +++ b/src/api/auditOpt/auditRecord/index.ts @@ -0,0 +1,154 @@ +import { XjrWorkflowApproveRecordPageModel, XjrWorkflowApproveRecordPageParams, XjrWorkflowApproveRecordPageResult } from './model/AuditRecordModel'; +import { defHttp } from '/@/utils/http/axios'; +import { ErrorMessageMode } from '/#/axios'; + +enum Api { + Page = '/auditOpt/auditRecord/page', + List = '/auditOpt/auditRecord/list', + Info = '/auditOpt/auditRecord/info', + XjrWorkflowApproveRecord = '/auditOpt/auditRecord', + GetApproveRecord = '/workflow/adminOperation/getAllApproveRecord', + DelApproveRecord = '/auditOpt/auditRecord', + AddApproveRcord = '/workflow/adminOperation/addApproveRecord', + UpdateApproveRcord = '/workflow/adminOperation/updateApproveRecord', +} + +/** + * @description: 查询XjrWorkflowApproveRecord分页列表 + */ +export async function getXjrWorkflowApproveRecordPage(params: XjrWorkflowApproveRecordPageParams, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Page, + params, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 获取XjrWorkflowApproveRecord信息 + */ +export async function getXjrWorkflowApproveRecord(id: String, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Info, + params: { id }, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 新增XjrWorkflowApproveRecord + */ +export async function addXjrWorkflowApproveRecord(xjrWorkflowApproveRecord: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.XjrWorkflowApproveRecord, + params: xjrWorkflowApproveRecord, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 更新XjrWorkflowApproveRecord + */ +export async function updateXjrWorkflowApproveRecord(xjrWorkflowApproveRecord: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.put( + { + url: Api.XjrWorkflowApproveRecord, + params: xjrWorkflowApproveRecord, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 删除XjrWorkflowApproveRecord(批量删除) + */ +export async function deleteXjrWorkflowApproveRecord(ids: string[], mode: ErrorMessageMode = 'modal') { + return defHttp.delete( + { + url: Api.XjrWorkflowApproveRecord, + data: ids, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 获取所有审批意见 + */ +export async function getAllApproveRecord( + params: any, + mode: ErrorMessageMode = 'modal', +) { + return defHttp.get( + { + url: Api.GetApproveRecord, + params, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 删除审批意见 + */ +export async function deleteApproveRecord(params:any, mode: ErrorMessageMode = 'modal') { + return defHttp.delete( + { + url: Api.DelApproveRecord, + params, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 新增审批意见 + */ + +export async function addApproveRecord(params:any, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.AddApproveRcord, + params , + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 新增审批意见 + */ + +export async function updateApproveRecord(params:any, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.UpdateApproveRcord, + params , + }, + { + errorMessageMode: mode, + }, + ); +} \ No newline at end of file diff --git a/src/api/auditOpt/auditRecord/model/auditRecordModel.ts b/src/api/auditOpt/auditRecord/model/auditRecordModel.ts new file mode 100644 index 0000000..6560489 --- /dev/null +++ b/src/api/auditOpt/auditRecord/model/auditRecordModel.ts @@ -0,0 +1,77 @@ +import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; + +/** + * @description: XjrWorkflowApproveRecord分页参数 模型 + */ +export interface XjrWorkflowApproveRecordPageParams extends BasicPageParams { + taskName: string; + + approveTimeStart: string; + approveTimeEnd: string; + + approveUserId: string; + + approveComment: string; +} + +/** + * @description: XjrWorkflowApproveRecord分页返回值模型 + */ +export interface XjrWorkflowApproveRecordPageModel { + id: string; + + taskName: string; + + approveUserId: string; + + approveTime: string; + + approveComment: string; +} + +/** + * @description: XjrWorkflowApproveRecord表类型 + */ +export interface XjrWorkflowApproveRecordModel { + id: number; + + schemaId: number; + + processId: string; + + taskId: string; + + taskDefinitionKey: string; + + taskName: string; + + approveType: number; + + approveResult: string; + + approveComment: string; + + approveUserId: number; + + approveTime: string; + + approveStamp: number; + + serialNumber: number; + + currentProgress: number; + + startUserId: number; + + approveUserPostId: number; + + tenantId: number; + + deleteMark: number; +} + +/** + * @description: XjrWorkflowApproveRecord分页返回值结构 + */ +export type XjrWorkflowApproveRecordPageResult = + BasicFetchResult; \ No newline at end of file diff --git a/src/api/formChange/changeLogDetail/index.ts b/src/api/formChange/changeLogDetail/index.ts new file mode 100644 index 0000000..1c0cfaa --- /dev/null +++ b/src/api/formChange/changeLogDetail/index.ts @@ -0,0 +1,117 @@ +import {FormChangeRecordItemPageModel, FormChangeRecordItemPageParams, FormChangeRecordItemPageResult} from './model/ChangeLogDetailModel'; +import {defHttp} from '/@/utils/http/axios'; +import {ErrorMessageMode} from '/#/axios'; + +enum Api { + Page = '/formChange/changeLogDetail/page', + List = '/formChange/changeLogDetail/list', + Info = '/formChange/changeLogDetail/info', + FormChangeRecordItem = '/formChange/changeLogDetail', + getRecordDetail = '/formChange/changeLogDetail/queryByRecordId' +} + +/** + * @description: 查询FormChangeRecordItem分页列表 + */ +export async function getFormChangeRecordItemPage(params: FormChangeRecordItemPageParams, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Page, + params, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 获取FormChangeRecordItem信息 + */ +export async function getFormChangeRecordItem(id: String, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Info, + params: {id}, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 新增FormChangeRecordItem + */ +export async function addFormChangeRecordItem(formChangeRecordItem: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.FormChangeRecordItem, + params: formChangeRecordItem, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 更新FormChangeRecordItem + */ +export async function updateFormChangeRecordItem(formChangeRecordItem: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.put( + { + url: Api.FormChangeRecordItem, + params: formChangeRecordItem, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 删除FormChangeRecordItem(批量删除) + */ +export async function deleteFormChangeRecordItem(ids: string[], mode: ErrorMessageMode = 'modal') { + return defHttp.delete( + { + url: Api.FormChangeRecordItem, + data: ids, + }, + { + errorMessageMode: mode, + }, + ); +} + + +/** + * @description: 查询FormChangeRecordItem分页列表 + */ +export async function getRecordDetail(params: any, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.getRecordDetail, + params, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 查询FormChangeRecordItem分页列表 + */ +export async function getFormChangeRecordItemList(params: any, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Page, + params, + }, + { + errorMessageMode: mode, + }, + ); +} \ No newline at end of file diff --git a/src/api/formChange/changeLogDetail/model/ChangeLogDetailModel.ts b/src/api/formChange/changeLogDetail/model/ChangeLogDetailModel.ts new file mode 100644 index 0000000..6f2f7b4 --- /dev/null +++ b/src/api/formChange/changeLogDetail/model/ChangeLogDetailModel.ts @@ -0,0 +1,97 @@ +import {BasicPageParams, BasicFetchResult} from '/@/api/model/baseModel'; + +/** + * @description: FormChangeRecordItem分页参数 模型 + */ +export interface FormChangeRecordItemPageParams extends BasicPageParams { + operationId: string; + + formType: string; + + formCode: string; + + dataId: string; + + fieldCode: string; + + fieldName: string; + + fieldType: string; + + oldValue: string; + + newValue: string; + + changeType: string; +} + +/** + * @description: FormChangeRecordItem分页返回值模型 + */ +export interface FormChangeRecordItemPageModel { + id: string; + + operationId: string; + + formType: string; + + formCode: string; + + dataId: string; + + fieldCode: string; + + fieldName: string; + + fieldType: string; + + oldValue: string; + + newValue: string; + + changeType: string; +} + +/** + * @description: FormChangeRecordItem表类型 + */ +export interface FormChangeRecordItemModel { + id: number; + + operationId: number; + + formType: string; + + formCode: string; + + dataId: number; + + fieldCode: string; + + fieldName: string; + + fieldType: string; + + oldValue: string; + + newValue: string; + + changeType: string; + + createUserId: number; + + createDate: string; + + modifyUserId: number; + + modifyDate: string; + + deleteMark: number; + + enabledMark: number; +} + +/** + * @description: FormChangeRecordItem分页返回值结构 + */ +export type FormChangeRecordItemPageResult = BasicFetchResult; diff --git a/src/api/formChange/formChangeLog/index.ts b/src/api/formChange/formChangeLog/index.ts new file mode 100644 index 0000000..f25425a --- /dev/null +++ b/src/api/formChange/formChangeLog/index.ts @@ -0,0 +1,102 @@ +import {FormChangeRecordPageModel, FormChangeRecordPageParams, FormChangeRecordPageResult} from './model/FormChangeLogModel'; +import {defHttp} from '/@/utils/http/axios'; +import {ErrorMessageMode} from '/#/axios'; + +enum Api { + Page = '/formChange/formChangeLog/page', + List = '/formChange/formChangeLog/list', + Info = '/formChange/formChangeLog/info', + FormChangeRecord = '/formChange/formChangeLog', + getRecordList = '/formChange/formChangeLog/queryRecord', + +} + +/** + * @description: 查询FormChangeRecord分页列表 + */ +export async function getFormChangeRecordPage(params: FormChangeRecordPageParams, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Page, + params, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 获取FormChangeRecord信息 + */ +export async function getFormChangeRecord(id: String, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Info, + params: {id}, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 新增FormChangeRecord + */ +export async function addFormChangeRecord(formChangeRecord: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.FormChangeRecord, + params: formChangeRecord, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 更新FormChangeRecord + */ +export async function updateFormChangeRecord(formChangeRecord: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.put( + { + url: Api.FormChangeRecord, + params: formChangeRecord, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 删除FormChangeRecord(批量删除) + */ +export async function deleteFormChangeRecord(ids: string[], mode: ErrorMessageMode = 'modal') { + return defHttp.delete( + { + url: Api.FormChangeRecord, + data: ids, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 获取变更数据列表 + */ +export async function getRecordList(params: any, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.getRecordList, + params, + }, + { + errorMessageMode: mode, + }, + ); +} \ No newline at end of file diff --git a/src/api/formChange/formChangeLog/model/FormChangeLogModel.ts b/src/api/formChange/formChangeLog/model/FormChangeLogModel.ts new file mode 100644 index 0000000..8d079dc --- /dev/null +++ b/src/api/formChange/formChangeLog/model/FormChangeLogModel.ts @@ -0,0 +1,48 @@ +import {BasicPageParams, BasicFetchResult} from '/@/api/model/baseModel'; + +/** + * @description: FormChangeRecord分页参数 模型 + */ +export interface FormChangeRecordPageParams extends BasicPageParams { + formId: string; + + formDataId: string; + + ipAddress: string; + + changeReason: string; + + version: string; + + createUserName : string; + + createDate: string; +} + +/** + * @description: FormChangeRecord分页返回值模型 + */ +export interface FormChangeRecordPageModel { + id: string; + + formId: string; + + formDataId: string; + + ipAddress: string; + + changeReason: string; + + version: string; + + createUserName : string; + + createDate: string; +} + +0; + +/** + * @description: FormChangeRecord分页返回值结构 + */ +export type FormChangeRecordPageResult = BasicFetchResult; diff --git a/src/api/workflow/adminOperation.ts b/src/api/workflow/adminOperation.ts new file mode 100644 index 0000000..0759630 --- /dev/null +++ b/src/api/workflow/adminOperation.ts @@ -0,0 +1,100 @@ +import { defHttp } from '/@/utils/http/axios'; + +import { ErrorMessageMode } from '/#/axios'; + +enum Api { + UpdatedWorkFlow = '/workflow/adminOperation/updateFormVariables', + GetProcessNode = '/workflow/execute/getAllTaskNodes', + ChangeProcessNode = '/workflow/adminOperation/processDesignatedNode', + setSign='/workflow/adminOperation/set-sign', + setAssignee = '/workflow/adminOperation/set-assignee', +} +/** + * @description: 更新流程变量 + */ + +export async function updateWorkflow(params:any, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.UpdatedWorkFlow, + params, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 获取该流程下所有用户节点 + */ +export async function getProcessUserNodes( + params: any, + mode: ErrorMessageMode = 'modal', +) { + return defHttp.post( + { + url: Api.GetProcessNode, + params, + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 流程流转 + */ + +export async function SetChangeProcessNode(params:any, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.ChangeProcessNode, + params , + }, + { + errorMessageMode: mode, + }, + ); +} + +/** + * @description: 加签减签 + */ + +export async function postSetSign( + schemaId: string, + taskId: string, + userIds: Array, + addUserIds: Array, + subUserIds: Array, + mode: ErrorMessageMode = 'modal', +) { + return defHttp.post( + { + url: Api.setSign, + params: { schemaId, taskId, userIds, addUserIds, subUserIds}, + }, + { + errorMessageMode: mode, + }, + ); +} + + +/** + * @description: 修改审批人 + */ + +export async function postSetAssignee(params:any, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.setAssignee, + params , + }, + { + errorMessageMode: mode, + }, + ); +} \ No newline at end of file diff --git a/src/components/SecondDev/OpinionDialogSelected.vue b/src/components/SecondDev/OpinionDialogSelected.vue new file mode 100644 index 0000000..d2152f7 --- /dev/null +++ b/src/components/SecondDev/OpinionDialogSelected.vue @@ -0,0 +1,387 @@ + + + + + diff --git a/src/components/SystemForm/src/Form.vue b/src/components/SystemForm/src/Form.vue index 002738b..4b27e9b 100644 --- a/src/components/SystemForm/src/Form.vue +++ b/src/components/SystemForm/src/Form.vue @@ -210,6 +210,22 @@ } return saveValId; } + + async function setDisabledForm(isDisabled) { + return SystemFormRef.value.setDisabledForm(isDisabled); + } + + async function handleDelete(id) { + let ret; + try { + ret = await SystemFormRef.value.handleDelete(id); + } catch (e) { + message.error('表单未配置删除'); + return null; + } + return ret; +} + defineExpose({ workflowSubmit, getRowKey, @@ -217,6 +233,8 @@ getUploadComponentIds, setFieldsValue, getIsOldSystem, + setDisabledForm, + handleDelete }); diff --git a/src/views/actHiTaskinst/components/ActhitaskinstModal.vue b/src/views/actHiTaskinst/components/ActhitaskinstModal.vue new file mode 100644 index 0000000..168dd47 --- /dev/null +++ b/src/views/actHiTaskinst/components/ActhitaskinstModal.vue @@ -0,0 +1,110 @@ + + \ No newline at end of file diff --git a/src/views/actHiTaskinst/components/CustomDevForm.vue b/src/views/actHiTaskinst/components/CustomDevForm.vue new file mode 100644 index 0000000..d823b8f --- /dev/null +++ b/src/views/actHiTaskinst/components/CustomDevForm.vue @@ -0,0 +1,491 @@ + + + diff --git a/src/views/actHiTaskinst/components/Form.vue b/src/views/actHiTaskinst/components/Form.vue new file mode 100644 index 0000000..7b922b4 --- /dev/null +++ b/src/views/actHiTaskinst/components/Form.vue @@ -0,0 +1,188 @@ + + \ No newline at end of file diff --git a/src/views/actHiTaskinst/components/config.ts b/src/views/actHiTaskinst/components/config.ts new file mode 100644 index 0000000..7bcae06 --- /dev/null +++ b/src/views/actHiTaskinst/components/config.ts @@ -0,0 +1,612 @@ +import { FormProps, FormSchema } from '/@/components/Form'; +import { BasicColumn } from '/@/components/Table'; + +export const searchFormSchema: FormSchema[] = [ + { + field: 'id', + label: 'id', + component: 'Input', + }, + { + field: 'taskDefKey', + label: '节点名称', + component: 'Input', + }, + { + field: 'procDefKey', + label: '流程名称', + component: 'Input', + }, + { + field: 'procDefId', + label: '流程默认id', + component: 'Input', + }, + { + field: 'rootProcInstId', + label: '根节点实例id', + component: 'Input', + }, + { + field: 'procInstId', + label: '流程实例id', + component: 'Input', + }, + { + field: 'executionId', + label: '执行节点id', + component: 'Input', + }, + { + field: 'actInstId', + label: '节点实例id', + component: 'Input', + }, + { + field: 'name', + label: '节点名称', + component: 'Input', + }, +]; + +export const columns: BasicColumn[] = [ + { + dataIndex: 'id', + title: 'id', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'taskDefKey', + title: '节点名称', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'procDefKey', + title: '流程名称', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'procDefId', + title: '流程默认id', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'rootProcInstId', + title: '根节点实例id', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'procInstId', + title: '流程实例id', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'executionId', + title: '执行节点id', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'actInstId', + title: '节点实例id', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'name', + title: '节点名称', + componentType: 'input', + align: 'left', + + sorter: true, + }, +]; +//表单事件 +export const formEventConfigs = { + 0: [ + { + type: 'circle', + color: '#2774ff', + text: '开始节点', + icon: '#icon-kaishi', + bgcColor: '#D8E5FF', + isUserDefined: false, + isClick: true, + }, + { + color: '#F6AB01', + icon: '#icon-chushihua', + text: '初始化表单', + bgcColor: '#f9f5ea', + isUserDefined: false, + nodeInfo: { processEvent: [] }, + isClick: false, + }, + ], + 1: [ + { + color: '#B36EDB', + icon: '#icon-shujufenxi', + text: '获取表单数据', + detail: '(新增无此操作)', + bgcColor: '#F8F2FC', + isUserDefined: false, + nodeInfo: { processEvent: [] }, + isClick: false, + }, + ], + 2: [ + { + color: '#F8625C', + icon: '#icon-jiazai', + text: '加载表单', + bgcColor: '#FFF1F1', + isUserDefined: false, + nodeInfo: { processEvent: [] }, + isClick: false, + }, + ], + 3: [ + { + color: '#6C6AE0', + icon: '#icon-jsontijiao', + text: '提交表单', + bgcColor: '#F5F4FF', + isUserDefined: false, + nodeInfo: { processEvent: [] }, + isClick: false, + }, + ], + 4: [ + { + type: 'circle', + color: '#F8625C', + text: '结束节点', + icon: '#icon-jieshuzhiliao', + bgcColor: '#FFD6D6', + isLast: true, + isUserDefined: false, + isClick: false, + }, + ], +}; +export const formProps: FormProps = { + labelCol: { span: 3, offset: 0 }, + labelAlign: 'right', + layout: 'horizontal', + size: 'default', + schemas: [ + { + key: 'e21c39e056964ba1af0207c8dfa7b54b', + field: 'id', + label: 'id', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入id', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: false, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: 'a7f8acb0021c4df09452039b01ec313d', + field: 'taskDefKey', + label: '节点名称', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入节点名称', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: false, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: '7107f6f6ef594c6687b9087e7f823c4d', + field: 'procDefKey', + label: '流程名称', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入流程名称', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: false, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: '76db839377a7417f87d9d7540dd1f5f4', + field: 'procDefId', + label: '流程默认id', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入流程默认id', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: false, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: '11acfec9f51b4a45a390840acd00b077', + field: 'rootProcInstId', + label: '根节点实例id', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入根节点实例id', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: false, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: '31d294d5c7c845f88d1176ab5a4913e0', + field: 'procInstId', + label: '流程实例id', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入流程实例id', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: false, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: 'f58327d6d3b04aad93eb415b3b8bfc60', + field: 'executionId', + label: '执行节点id', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入执行节点id', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: false, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: 'c88aeae388c4488aa459e023cd1a35e8', + field: 'actInstId', + label: '节点实例id', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入节点实例id', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: false, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: 'e444605174364af2b10897b2987d2dec', + field: 'name', + label: '节点名称', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入节点名称', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: false, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: 'e111605174364af2b10897b2987d2dec', + field: 'taskId', + label: '任务id', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入节点名称', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: false, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: 'e444555174364af2b10897b2987d2dec', + field: 'taskName', + label: '任务名称', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入节点名称', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: false, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: 'c33aeae997a4488aa459e023ae1a21e8', + field: 'assigneeName', + label: '审核人', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: false, + respNewRow: false, + placeholder: '请输入节点名称', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: false, + scan: false, + style: { width: '100%' }, + }, + }, + ], + showActionButtonGroup: false, + buttonLocation: 'center', + actionColOptions: { span: 24 }, + showResetButton: false, + showSubmitButton: false, + hiddenComponent: [], +}; \ No newline at end of file diff --git a/src/views/actHiTaskinst/components/workflowPermission.ts b/src/views/actHiTaskinst/components/workflowPermission.ts new file mode 100644 index 0000000..5f23f2c --- /dev/null +++ b/src/views/actHiTaskinst/components/workflowPermission.ts @@ -0,0 +1,137 @@ +export const permissionList = [ + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: 'id', + fieldId: 'id', + isSubTable: false, + showChildren: true, + type: 'input', + key: 'e21c39e056964ba1af0207c8dfa7b54b', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '节点名称', + fieldId: 'taskDefKey', + isSubTable: false, + showChildren: true, + type: 'input', + key: 'a7f8acb0021c4df09452039b01ec313d', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '流程名称', + fieldId: 'procDefKey', + isSubTable: false, + showChildren: true, + type: 'input', + key: '7107f6f6ef594c6687b9087e7f823c4d', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '流程默认id', + fieldId: 'procDefId', + isSubTable: false, + showChildren: true, + type: 'input', + key: '76db839377a7417f87d9d7540dd1f5f4', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '根节点实例id', + fieldId: 'rootProcInstId', + isSubTable: false, + showChildren: true, + type: 'input', + key: '11acfec9f51b4a45a390840acd00b077', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '流程实例id', + fieldId: 'procInstId', + isSubTable: false, + showChildren: true, + type: 'input', + key: '31d294d5c7c845f88d1176ab5a4913e0', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '执行节点id', + fieldId: 'executionId', + isSubTable: false, + showChildren: true, + type: 'input', + key: 'f58327d6d3b04aad93eb415b3b8bfc60', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '节点实例id', + fieldId: 'actInstId', + isSubTable: false, + showChildren: true, + type: 'input', + key: 'c88aeae388c4488aa459e023cd1a35e8', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '节点名称', + fieldId: 'name', + isSubTable: false, + showChildren: true, + type: 'input', + key: 'e444605174364af2b10897b2987d2dec', + children: [], + }, +]; \ No newline at end of file diff --git a/src/views/actHiTaskinst/index.vue b/src/views/actHiTaskinst/index.vue new file mode 100644 index 0000000..432e1f7 --- /dev/null +++ b/src/views/actHiTaskinst/index.vue @@ -0,0 +1,328 @@ + + + \ No newline at end of file diff --git a/src/views/auditOpt/auditRecord/components/Form.vue b/src/views/auditOpt/auditRecord/components/Form.vue new file mode 100644 index 0000000..a5e384d --- /dev/null +++ b/src/views/auditOpt/auditRecord/components/Form.vue @@ -0,0 +1,206 @@ + + \ No newline at end of file diff --git a/src/views/auditOpt/auditRecord/components/auditRecordModal.vue b/src/views/auditOpt/auditRecord/components/auditRecordModal.vue new file mode 100644 index 0000000..168dd47 --- /dev/null +++ b/src/views/auditOpt/auditRecord/components/auditRecordModal.vue @@ -0,0 +1,110 @@ + + \ No newline at end of file diff --git a/src/views/auditOpt/auditRecord/components/config.ts b/src/views/auditOpt/auditRecord/components/config.ts new file mode 100644 index 0000000..c3233af --- /dev/null +++ b/src/views/auditOpt/auditRecord/components/config.ts @@ -0,0 +1,282 @@ +import { FormProps, FormSchema } from '/@/components/Form'; +import { BasicColumn } from '/@/components/Table'; + +export const searchFormSchema: FormSchema[] = [ + { + field: 'taskName', + label: '节点名称', + component: 'Input', + }, + { + field: 'approveTime', + label: '审批时间', + component: 'RangePicker', + componentProps: { + format: 'YYYY-MM-DD HH:mm:ss', + style: { width: '100%' }, + getPopupContainer: () => document.body, + }, + }, + + // { + // field: 'approveUserId', + // label: '审批用户id', + // component: 'Input', + // }, + // { + // field: 'approveComment', + // label: '审批意见', + // component: 'Input', + // }, +]; + +export const columns: BasicColumn[] = [ + { + dataIndex: 'taskName', + title: '节点名称', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + // { + // dataIndex: 'approveUserId', + // title: '审批用户id', + // componentType: 'input', + // align: 'left', + + // sorter: true, + // }, + + { + dataIndex: 'approveUserName', + title: '审批用户', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'approveComment', + title: '审批意见', + componentType: 'textarea', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'approveTime', + title: '审批时间', + componentType: 'date', + align: 'left', + + sorter: true, + }, + + +]; +//表单事件 +export const formEventConfigs = { + 0: [ + { + type: 'circle', + color: '#2774ff', + text: '开始节点', + icon: '#icon-kaishi', + bgcColor: '#D8E5FF', + isUserDefined: false, + }, + { + color: '#F6AB01', + icon: '#icon-chushihua', + text: '初始化表单', + bgcColor: '#f9f5ea', + isUserDefined: false, + nodeInfo: { processEvent: [] }, + }, + ], + 1: [ + { + color: '#B36EDB', + icon: '#icon-shujufenxi', + text: '获取表单数据', + detail: '(新增无此操作)', + bgcColor: '#F8F2FC', + isUserDefined: false, + nodeInfo: { processEvent: [] }, + }, + ], + 2: [ + { + color: '#F8625C', + icon: '#icon-jiazai', + text: '加载表单', + bgcColor: '#FFF1F1', + isUserDefined: false, + nodeInfo: { processEvent: [] }, + }, + ], + 3: [ + { + color: '#6C6AE0', + icon: '#icon-jsontijiao', + text: '提交表单', + bgcColor: '#F5F4FF', + isUserDefined: false, + nodeInfo: { processEvent: [] }, + }, + ], + 4: [ + { + type: 'circle', + color: '#F8625C', + text: '结束节点', + icon: '#icon-jieshuzhiliao', + bgcColor: '#FFD6D6', + isLast: true, + isUserDefined: false, + }, + ], +}; +export const formProps: FormProps = { + labelCol: { span: 3, offset: 0 }, + labelAlign: 'right', + layout: 'horizontal', + size: 'default', + schemas: [ + { + key: 'd3792e446e3449fda47a82706b6427bd', + field: 'taskName', + label: '节点名称', + type: 'select', + component: 'Select', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入节点名称', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: false, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + respBreakLine: false, + style: { width: '100%' }, + }, + }, + { + key: 'b225f99234434d1d8c76bc72ba944267', + field: 'approveUserId', + label: '审批用户id', + type: 'input', + component: 'Input', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入审批用户id', + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: false, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: { width: '100%' }, + }, + }, + { + key: '04e6cbe34eed4220bf7123c74181a505', + field: 'approveTime', + label: '审批时间', + type: 'date', + component: 'DatePicker', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + span: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + defaultValue: '', + width: '100%', + placeholder: '请选择审批时间', + format: 'YYYY-MM-DD HH:mm:ss', + showLabel: true, + allowClear: true, + disabled: false, + required: false, + isShow: true, + rules: [], + events: {}, + style: { width: '100%' }, + }, + }, + { + key: '49afa528cd3b422395a9ac5e4b363a99', + field: 'approveComment', + label: '审批意见', + type: 'textarea', + component: 'InputTextArea', + colProps: { span: 24 }, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: true, + placeholder: '请输入审批意见', + rows: 4, + autoSize: false, + showCount: false, + disabled: false, + showLabel: true, + allowClear: false, + required: false, + isShow: true, + rules: [], + events: {}, + style: { width: '100%' }, + }, + }, + ], + showActionButtonGroup: false, + buttonLocation: 'center', + actionColOptions: { span: 24 }, + showResetButton: false, + showSubmitButton: false, + hiddenComponent: [], +}; \ No newline at end of file diff --git a/src/views/auditOpt/auditRecord/components/workflowPermission.ts b/src/views/auditOpt/auditRecord/components/workflowPermission.ts new file mode 100644 index 0000000..de4b613 --- /dev/null +++ b/src/views/auditOpt/auditRecord/components/workflowPermission.ts @@ -0,0 +1,62 @@ +export const permissionList = [ + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '节点名称', + fieldId: 'taskName', + isSubTable: false, + showChildren: true, + type: 'input', + key: 'd3792e446e3449fda47a82706b6427bd', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '审批用户id', + fieldId: 'approveUserId', + isSubTable: false, + showChildren: true, + type: 'input', + key: 'b225f99234434d1d8c76bc72ba944267', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '审批时间', + fieldId: 'approveTime', + isSubTable: false, + showChildren: true, + type: 'date', + key: '04e6cbe34eed4220bf7123c74181a505', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '审批意见', + fieldId: 'approveComment', + isSubTable: false, + showChildren: true, + type: 'textarea', + key: '49afa528cd3b422395a9ac5e4b363a99', + children: [], + }, +]; \ No newline at end of file diff --git a/src/views/auditOpt/auditRecord/index.vue b/src/views/auditOpt/auditRecord/index.vue new file mode 100644 index 0000000..6a7166c --- /dev/null +++ b/src/views/auditOpt/auditRecord/index.vue @@ -0,0 +1,397 @@ + + + \ No newline at end of file diff --git a/src/views/formChange/changeLogDetail/components/ChangeRowDetailModal.vue b/src/views/formChange/changeLogDetail/components/ChangeRowDetailModal.vue new file mode 100644 index 0000000..1baa289 --- /dev/null +++ b/src/views/formChange/changeLogDetail/components/ChangeRowDetailModal.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/src/views/formChange/changeLogDetail/components/ChangelogdetailModal.vue b/src/views/formChange/changeLogDetail/components/ChangelogdetailModal.vue new file mode 100644 index 0000000..3e37588 --- /dev/null +++ b/src/views/formChange/changeLogDetail/components/ChangelogdetailModal.vue @@ -0,0 +1,110 @@ + + + diff --git a/src/views/formChange/changeLogDetail/components/CustomDevForm.vue b/src/views/formChange/changeLogDetail/components/CustomDevForm.vue new file mode 100644 index 0000000..1f5e151 --- /dev/null +++ b/src/views/formChange/changeLogDetail/components/CustomDevForm.vue @@ -0,0 +1,169 @@ + + + + diff --git a/src/views/formChange/changeLogDetail/components/Form.vue b/src/views/formChange/changeLogDetail/components/Form.vue new file mode 100644 index 0000000..66c4ad3 --- /dev/null +++ b/src/views/formChange/changeLogDetail/components/Form.vue @@ -0,0 +1,185 @@ + + diff --git a/src/views/formChange/changeLogDetail/components/config.ts b/src/views/formChange/changeLogDetail/components/config.ts new file mode 100644 index 0000000..43737df --- /dev/null +++ b/src/views/formChange/changeLogDetail/components/config.ts @@ -0,0 +1,564 @@ +import {FormProps, FormSchema} from '/@/components/Form'; +import {BasicColumn} from '/@/components/Table'; + +export const searchFormSchema: FormSchema[] = [ + { + field: 'operationId', + label: '主表id', + component: 'Input', + }, + { + field: 'formType', + label: '表单类型', + component: 'Input', + }, + { + field: 'formCode', + label: '表单编码', + component: 'Input', + }, + { + field: 'dataId', + label: '主表或子表的id', + component: 'Input', + }, + { + field: 'fieldCode', + label: '变更字段编码', + component: 'Input', + }, + { + field: 'fieldName', + label: '变更字段名', + component: 'Input', + }, + { + field: 'fieldType', + label: '变更字段类型', + component: 'Input', + }, + { + field: 'oldValue', + label: '变更前的值', + component: 'Input', + }, + { + field: 'newValue', + label: '变更后的值', + component: 'Input', + }, + { + field: 'changeType', + label: '变更类型', + component: 'Input', + }, +]; + +export const columns: BasicColumn[] = [ + { + dataIndex: 'operationId', + title: '主表id', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'formType', + title: '表单类型', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'formCode', + title: '表单编码', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'dataId', + title: '主表或子表的id', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'fieldCode', + title: '变更字段编码', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'fieldName', + title: '变更字段名', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'fieldType', + title: '变更字段类型', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'oldValue', + title: '变更前的值', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'newValue', + title: '变更后的值', + componentType: 'input', + align: 'left', + + sorter: true, + }, + + { + dataIndex: 'changeType', + title: '变更类型', + componentType: 'input', + align: 'left', + + sorter: true, + }, +]; +//表单事件 +export const formEventConfigs = { + 0: [ + { + type: 'circle', + color: '#2774ff', + text: '开始节点', + icon: '#icon-kaishi', + bgcColor: '#D8E5FF', + isUserDefined: false, + }, + { + color: '#F6AB01', + icon: '#icon-chushihua', + text: '初始化表单', + bgcColor: '#f9f5ea', + isUserDefined: false, + nodeInfo: {processEvent: []}, + }, + ], + 1: [ + { + color: '#B36EDB', + icon: '#icon-shujufenxi', + text: '获取表单数据', + detail: '(新增无此操作)', + bgcColor: '#F8F2FC', + isUserDefined: false, + nodeInfo: {processEvent: []}, + }, + ], + 2: [ + { + color: '#F8625C', + icon: '#icon-jiazai', + text: '加载表单', + bgcColor: '#FFF1F1', + isUserDefined: false, + nodeInfo: {processEvent: []}, + }, + ], + 3: [ + { + color: '#6C6AE0', + icon: '#icon-jsontijiao', + text: '提交表单', + bgcColor: '#F5F4FF', + isUserDefined: false, + nodeInfo: {processEvent: []}, + }, + ], + 4: [ + { + type: 'circle', + color: '#F8625C', + text: '结束节点', + icon: '#icon-jieshuzhiliao', + bgcColor: '#FFD6D6', + isLast: true, + isUserDefined: false, + }, + ], +}; +export const formProps: FormProps = { + labelCol: {span: 3, offset: 0}, + labelAlign: 'right', + layout: 'horizontal', + size: 'default', + schemas: [ + { + key: '1f7a5fa213f549748f3d00e177d86b1b', + field: 'operationId', + label: '主表id', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入主表id', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: '524a5c581073419d8e8daff9e461695a', + field: 'formType', + label: '表单类型', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入表单类型', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: 'd74b7a7bede24820a6c85677a6cdb5fe', + field: 'formCode', + label: '表单编码', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入表单编码', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: '3d499852001044c0a6230e5ce18532d2', + field: 'dataId', + label: '主表或子表的id', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入主表或子表的id', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: '32b4ed61b5504f74943ead2cdc770baf', + field: 'fieldCode', + label: '变更字段编码', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入变更字段编码', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: 'f08ff059b6db43608e6ecf5f195f92bb', + field: 'fieldName', + label: '变更字段名', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入变更字段名', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: '4f11bf8e79484cc7a694b52c9524c371', + field: 'fieldType', + label: '变更字段类型', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入变更字段类型', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: '5aa4b801a16d41e88b8ef61a0a93f2f7', + field: 'oldValue', + label: '变更前的值', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入变更前的值', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: '870896f3810543bc83a1510ff141bfb8', + field: 'newValue', + label: '变更后的值', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入变更后的值', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: '52ef4d91155f4666b697b5aab1adb2c7', + field: 'changeType', + label: '变更类型', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入变更类型', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: true, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + ], + showActionButtonGroup: false, + buttonLocation: 'center', + actionColOptions: {span: 24}, + showResetButton: false, + showSubmitButton: false, + hiddenComponent: [], +}; diff --git a/src/views/formChange/changeLogDetail/components/workflowPermission.ts b/src/views/formChange/changeLogDetail/components/workflowPermission.ts new file mode 100644 index 0000000..a215cd8 --- /dev/null +++ b/src/views/formChange/changeLogDetail/components/workflowPermission.ts @@ -0,0 +1,152 @@ +export const permissionList = [ + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '主表id', + fieldId: 'operationId', + isSubTable: false, + showChildren: true, + type: 'input', + key: '1f7a5fa213f549748f3d00e177d86b1b', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '表单类型', + fieldId: 'formType', + isSubTable: false, + showChildren: true, + type: 'input', + key: '524a5c581073419d8e8daff9e461695a', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '表单编码', + fieldId: 'formCode', + isSubTable: false, + showChildren: true, + type: 'input', + key: 'd74b7a7bede24820a6c85677a6cdb5fe', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '主表或子表的id', + fieldId: 'dataId', + isSubTable: false, + showChildren: true, + type: 'input', + key: '3d499852001044c0a6230e5ce18532d2', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '变更字段编码', + fieldId: 'fieldCode', + isSubTable: false, + showChildren: true, + type: 'input', + key: '32b4ed61b5504f74943ead2cdc770baf', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '变更字段名', + fieldId: 'fieldName', + isSubTable: false, + showChildren: true, + type: 'input', + key: 'f08ff059b6db43608e6ecf5f195f92bb', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '变更字段类型', + fieldId: 'fieldType', + isSubTable: false, + showChildren: true, + type: 'input', + key: '4f11bf8e79484cc7a694b52c9524c371', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '变更前的值', + fieldId: 'oldValue', + isSubTable: false, + showChildren: true, + type: 'input', + key: '5aa4b801a16d41e88b8ef61a0a93f2f7', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '变更后的值', + fieldId: 'newValue', + isSubTable: false, + showChildren: true, + type: 'input', + key: '870896f3810543bc83a1510ff141bfb8', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '变更类型', + fieldId: 'changeType', + isSubTable: false, + showChildren: true, + type: 'input', + key: '52ef4d91155f4666b697b5aab1adb2c7', + children: [], + }, +]; diff --git a/src/views/formChange/changeLogDetail/index.vue b/src/views/formChange/changeLogDetail/index.vue new file mode 100644 index 0000000..641ef01 --- /dev/null +++ b/src/views/formChange/changeLogDetail/index.vue @@ -0,0 +1,339 @@ + + + + diff --git a/src/views/formChange/formChangeLog/components/CustomDevForm.vue b/src/views/formChange/formChangeLog/components/CustomDevForm.vue new file mode 100644 index 0000000..c532451 --- /dev/null +++ b/src/views/formChange/formChangeLog/components/CustomDevForm.vue @@ -0,0 +1,134 @@ + + + + diff --git a/src/views/formChange/formChangeLog/components/Form.vue b/src/views/formChange/formChangeLog/components/Form.vue new file mode 100644 index 0000000..285ae66 --- /dev/null +++ b/src/views/formChange/formChangeLog/components/Form.vue @@ -0,0 +1,186 @@ + + diff --git a/src/views/formChange/formChangeLog/components/FormchangelogModal.vue b/src/views/formChange/formChangeLog/components/FormchangelogModal.vue new file mode 100644 index 0000000..51e13c3 --- /dev/null +++ b/src/views/formChange/formChangeLog/components/FormchangelogModal.vue @@ -0,0 +1,111 @@ + + diff --git a/src/views/formChange/formChangeLog/components/config.ts b/src/views/formChange/formChangeLog/components/config.ts new file mode 100644 index 0000000..e3740c8 --- /dev/null +++ b/src/views/formChange/formChangeLog/components/config.ts @@ -0,0 +1,315 @@ +import {FormProps, FormSchema} from '/@/components/Form'; +import {BasicColumn} from '/@/components/Table'; + +export const searchFormSchema: FormSchema[] = [ + { + field: 'formId', + label: '业务表单id', + component: 'Input', + }, + { + field: 'formDataId', + label: '关联的业务数据id', + component: 'Input', + }, + { + field: 'ipAddress', + label: '变更人的ip地址', + component: 'Input', + }, + { + field: 'changeReason', + label: '变更原因', + component: 'Input', + }, + { + field: 'version', + label: '变更版本号', + component: 'Input', + }, +]; + +export const columns: BasicColumn[] = [ + { + dataIndex: 'createUserName', + title: '变更人', + componentType: 'input', + align: 'left', + sorter: true, + }, + { + dataIndex: 'createDate', + title: '变更时间', + componentType: 'input', + align: 'left', + sorter: true, + }, + { + dataIndex: 'ipAddress', + title: '变更人的ip地址', + componentType: 'input', + align: 'left', + sorter: true, + }, + { + dataIndex: 'changeReason', + title: '变更原因', + componentType: 'input', + align: 'left', + sorter: true, + }, + { + dataIndex: 'version', + title: '变更版本号', + componentType: 'input', + align: 'left', + sorter: true, + }, +]; +//表单事件 +export const formEventConfigs = { + 0: [ + { + type: 'circle', + color: '#2774ff', + text: '开始节点', + icon: '#icon-kaishi', + bgcColor: '#D8E5FF', + isUserDefined: false, + }, + { + color: '#F6AB01', + icon: '#icon-chushihua', + text: '初始化表单', + bgcColor: '#f9f5ea', + isUserDefined: false, + nodeInfo: {processEvent: []}, + }, + ], + 1: [ + { + color: '#B36EDB', + icon: '#icon-shujufenxi', + text: '获取表单数据', + detail: '(新增无此操作)', + bgcColor: '#F8F2FC', + isUserDefined: false, + nodeInfo: {processEvent: []}, + }, + ], + 2: [ + { + color: '#F8625C', + icon: '#icon-jiazai', + text: '加载表单', + bgcColor: '#FFF1F1', + isUserDefined: false, + nodeInfo: {processEvent: []}, + }, + ], + 3: [ + { + color: '#6C6AE0', + icon: '#icon-jsontijiao', + text: '提交表单', + bgcColor: '#F5F4FF', + isUserDefined: false, + nodeInfo: {processEvent: []}, + }, + ], + 4: [ + { + type: 'circle', + color: '#F8625C', + text: '结束节点', + icon: '#icon-jieshuzhiliao', + bgcColor: '#FFD6D6', + isLast: true, + isUserDefined: false, + }, + ], +}; +export const formProps: FormProps = { + labelCol: {span: 3, offset: 0}, + labelAlign: 'right', + layout: 'horizontal', + size: 'default', + schemas: [ + { + key: '2b23009bb6be47d9bd60ffa7b928e3d3', + field: 'formId', + label: '业务表单id', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入业务表单id', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: false, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: 'ae02eb3114b24e0184df37f394394f2b', + field: 'formDataId', + label: '关联的业务数据id', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入关联的业务数据id', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: false, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: 'd6f4b7d9678a4e968a3107a5c610e48f', + field: 'ipAddress', + label: '变更人的ip地址', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入变更人的ip地址', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: false, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: '6305f47c32214c14b60efac51758e47c', + field: 'changeReason', + label: '变更原因', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入变更原因', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: false, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + { + key: '6ea6d70beac740dfb44e5b4dae8a5f92', + field: 'version', + label: '变更版本号', + type: 'input', + component: 'Input', + colProps: {span: 24}, + defaultValue: '', + componentProps: { + width: '100%', + span: '', + defaultValue: '', + labelWidthMode: 'fix', + labelFixWidth: 120, + responsive: true, + respNewRow: false, + placeholder: '请输入变更版本号', + maxlength: null, + prefix: '', + suffix: '', + addonBefore: '', + addonAfter: '', + disabled: false, + allowClear: false, + showLabel: true, + required: false, + rules: [], + events: {}, + isSave: false, + isShow: true, + scan: false, + style: {width: '100%'}, + }, + }, + ], + showActionButtonGroup: false, + buttonLocation: 'center', + actionColOptions: {span: 24}, + showResetButton: false, + showSubmitButton: false, + hiddenComponent: [], +}; diff --git a/src/views/formChange/formChangeLog/components/workflowPermission.ts b/src/views/formChange/formChangeLog/components/workflowPermission.ts new file mode 100644 index 0000000..3f0e790 --- /dev/null +++ b/src/views/formChange/formChangeLog/components/workflowPermission.ts @@ -0,0 +1,77 @@ +export const permissionList = [ + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '业务表单id', + fieldId: 'formId', + isSubTable: false, + showChildren: true, + type: 'input', + key: '2b23009bb6be47d9bd60ffa7b928e3d3', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '关联的业务数据id', + fieldId: 'formDataId', + isSubTable: false, + showChildren: true, + type: 'input', + key: 'ae02eb3114b24e0184df37f394394f2b', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '变更人的ip地址', + fieldId: 'ipAddress', + isSubTable: false, + showChildren: true, + type: 'input', + key: 'd6f4b7d9678a4e968a3107a5c610e48f', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '变更原因', + fieldId: 'changeReason', + isSubTable: false, + showChildren: true, + type: 'input', + key: '6305f47c32214c14b60efac51758e47c', + children: [], + }, + { + required: true, + view: true, + edit: true, + disabled: false, + isSaveTable: false, + tableName: '', + fieldName: '变更版本号', + fieldId: 'version', + isSubTable: false, + showChildren: true, + type: 'input', + key: '6ea6d70beac740dfb44e5b4dae8a5f92', + children: [], + }, +]; diff --git a/src/views/formChange/formChangeLog/index.vue b/src/views/formChange/formChangeLog/index.vue new file mode 100644 index 0000000..fd711e2 --- /dev/null +++ b/src/views/formChange/formChangeLog/index.vue @@ -0,0 +1,335 @@ + + + + diff --git a/src/views/secondDev/approveFlowPage.vue b/src/views/secondDev/approveFlowPage.vue index 0c54c0f..9b91881 100644 --- a/src/views/secondDev/approveFlowPage.vue +++ b/src/views/secondDev/approveFlowPage.vue @@ -1,4 +1,5 @@ diff --git a/src/views/workflow/task/components/flow/AddOrSubtractWork.vue b/src/views/workflow/task/components/flow/AddOrSubtractWork.vue new file mode 100644 index 0000000..23759e2 --- /dev/null +++ b/src/views/workflow/task/components/flow/AddOrSubtractWork.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/workflow/task/components/flow/ApproveProcessMonitorUser.vue b/src/views/workflow/task/components/flow/ApproveProcessMonitorUser.vue index a184ab1..769ff77 100644 --- a/src/views/workflow/task/components/flow/ApproveProcessMonitorUser.vue +++ b/src/views/workflow/task/components/flow/ApproveProcessMonitorUser.vue @@ -1,26 +1,15 @@ diff --git a/src/views/workflow/task/components/flow/FlowPanel.vue b/src/views/workflow/task/components/flow/FlowPanel.vue index a13b7c4..051ccdb 100644 --- a/src/views/workflow/task/components/flow/FlowPanel.vue +++ b/src/views/workflow/task/components/flow/FlowPanel.vue @@ -2,7 +2,9 @@ - - + + + + + + + | undefined; processId: string | undefined; predecessorTasks: Array | undefined; + currentTaskAssignees: any; + currentTaskAssigneeNames: string; + currentTaskInfo: any; + schemaId: string; + formDataId: number; + formInfos: Array; }>(), { xml: '', @@ -44,6 +60,14 @@ predecessorTasks: () => { return []; }, + currentTaskAssigneeNames: '无', + currentTaskAssignees: {}, + currentTaskInfo: {}, + schemaId: '', + formDataId: 0, + formInfos: () => { + return []; + } }, ); diff --git a/src/views/workflow/task/components/flow/FormInformation.vue b/src/views/workflow/task/components/flow/FormInformation.vue index 9b29162..e45f1c8 100644 --- a/src/views/workflow/task/components/flow/FormInformation.vue +++ b/src/views/workflow/task/components/flow/FormInformation.vue @@ -28,6 +28,16 @@
+
+
+ 取消 + 保存 + 编辑 + 删除 +
+
+
+
| undefined; opinionsComponents?: Array | undefined; formAssignmentData?: null | Recordable; + processId: string; }>(), { disabled: false, formInfos: () => { return []; }, + processId: '' }, ); @@ -142,10 +156,12 @@ isOldSystem?: boolean; }>; formEventConfigs: FormEventColumnConfig[]; + modes: string[]; } = reactive({ formModels: [], configs: [], formEventConfigs: [], + modes: [] }); onMounted(async () => { for await (let element of props.formInfos) { @@ -160,6 +176,8 @@ } } forms.formModels.push(formModels); + // 默认赋值view + forms.modes.push('view'); // 系统表单 if (element.formType == FormType.SYSTEM) { forms.configs.push({ @@ -304,27 +322,32 @@ } return formModes; } - async function getFormModels(saveRowKey) { + async function getFormModels(saveRowKey,isOnlyActive) { let formModes = {}; - - for (let index = 0; index < forms.configs.length; index++) { - const ele = forms.configs[index]; - if (ele.formType == FormType.SYSTEM) { - let values = await itemRefs.value[index].workflowSubmit(saveRowKey); - formModes[ele.formKey] = values; - } else { - formModes[ele.formKey] = ele.formModel; - } + for (let index = 0; index < forms.configs.length; index++) { + if (isOnlyActive && index != activeIndex.value) { + continue; } + const ele = forms.configs[index]; + if (ele.formType == FormType.SYSTEM) { + let values = await itemRefs.value[index].workflowSubmit(saveRowKey); + formModes[ele.formKey] = values; + } else { + formModes[ele.formKey] = ele.formModel; + } + } - // forms.configs.forEach((ele) => { - // formModes[ele.formKey] = ele.formModel; - // }); - forms.formEventConfigs.forEach(async (ele, i) => { - //此组件 获取数据 就是为了提交表单 所以 表单提交数据 事件 就此处执行 - await submitFormEvent(ele, forms.configs[i]?.formModel); - }); - return formModes; + // forms.configs.forEach((ele) => { + // formModes[ele.formKey] = ele.formModel; + // }); + forms.formEventConfigs.forEach(async (ele, i) => { + if (isOnlyActive && i != activeIndex.value) { + return true; + } + //此组件 获取数据 就是为了提交表单 所以 表单提交数据 事件 就此处执行 + await submitFormEvent(ele, forms.configs[i]?.formModel); + }); + return formModes; } function getSystemType() { let system = {}; @@ -359,6 +382,34 @@ resize.releaseCapture && resize.releaseCapture(); }; } + + function handleCancel() { + itemRefs.value[activeIndex.value].setDisabledForm(true); + forms.modes[activeIndex.value] = 'view'; + itemRefs.value[activeIndex.value].setFieldsValue(forms.formModels[activeIndex.value]); +} +async function handleDelete() { + let formVal = await itemRefs.value[activeIndex.value].getFieldsValue(); + await itemRefs.value[activeIndex.value].handleDelete(formVal.id) +} + +async function handleSave() { + const params = await getFormModels(true, true); + const code = await updateWorkflow({ 'variables': params, 'processInstanceId': props.processId }) + if (code) { + message.success(t('保存成功')); + } else { + message.success(t('保存失败,请稍后再试')); + } + itemRefs.value[activeIndex.value].setDisabledForm(true); + forms.modes[activeIndex.value] = 'view'; +} + +function handleEdit() { + itemRefs.value[activeIndex.value].setDisabledForm(false); + forms.modes[activeIndex.value] = 'edit'; +} + defineExpose({ validateForm, getFormModels, @@ -366,6 +417,10 @@ setFormData, getUploadComponentIds, getSystemType, + handleEdit, + handleSave, + handleCancel, + handleDelete }); diff --git a/src/views/workflow/task/components/flow/LookTask.vue b/src/views/workflow/task/components/flow/LookTask.vue index f82e29c..b38ecd7 100644 --- a/src/views/workflow/task/components/flow/LookTask.vue +++ b/src/views/workflow/task/components/flow/LookTask.vue @@ -13,6 +13,7 @@ :opinions="data.opinions" :formInfos="data.formInfos" :disabled="true" + :processId="props.processId" /> diff --git a/src/views/workflow/task/components/flow/ProcessInformation.vue b/src/views/workflow/task/components/flow/ProcessInformation.vue index 1c0082d..dfe0897 100644 --- a/src/views/workflow/task/components/flow/ProcessInformation.vue +++ b/src/views/workflow/task/components/flow/ProcessInformation.vue @@ -1,164 +1,201 @@ diff --git a/src/views/workflow/task/components/flow/SelectApproveUser.vue b/src/views/workflow/task/components/flow/SelectApproveUser.vue index 7b0a801..cab755f 100644 --- a/src/views/workflow/task/components/flow/SelectApproveUser.vue +++ b/src/views/workflow/task/components/flow/SelectApproveUser.vue @@ -1,46 +1,28 @@