wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-17 10:36:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：同步2.0版本

Browse Source
This commit is contained in:
Jerry
2021-10-20 12:11:51 +08:00
parent 50807a7a7e
commit abbbd90690
54 changed files with 4443 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
orange-demo-flowable/orange-demo-flowable-web/src/api/FlowController/FlowOperationController.js
View File

@@ -15,10 +15,6 @@ export default class FlowOperationController {
}
return sender.doUrl(url, 'post', params, axiosOption, httpOption);
}
// 撤销工单
static cancelWorkOrder (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/cancelWorkOrder', 'post', params, axiosOption, httpOption);
}
// 提交用户任务数据
static submitUserTask (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOnlineOperation/submitUserTask', 'post', params, axiosOption, httpOption);
@@ -35,6 +31,10 @@ export default class FlowOperationController {
static listFlowEntryForm (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOnlineOperation/listFlowEntryForm', 'get', params, axiosOption, httpOption);
}
// 撤销工单
static cancelWorkOrder (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/cancelWorkOrder', 'post', params, axiosOption, httpOption);
}
// 多实例加签
static submitConsign (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/submitConsign', 'post', params, axiosOption, httpOption);
@@ -51,47 +51,47 @@ export default class FlowOperationController {
static startOnly (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/startOnly', 'post', params, axiosOption, httpOption);
}
// 获得流程定义初始化用户任务信息 *
// 获得流程定义初始化用户任务信息
static viewInitialTaskInfo (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/viewInitialTaskInfo', 'get', params, axiosOption, httpOption);
}
// 获取待办任务信息 *
// 获取待办任务信息
static viewRuntimeTaskInfo (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/viewRuntimeTaskInfo', 'get', params, axiosOption, httpOption);
}
// 获取流程实例审批历史 *
// 获取流程实例审批历史
static listFlowTaskComment (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/listFlowTaskComment', 'get', params, axiosOption, httpOption);
}
// 获取历史任务信息 *
// 获取历史任务信息
static viewInitialHistoricTaskInfo (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/viewInitialHistoricTaskInfo', 'get', params, axiosOption, httpOption);
}
// 获取所有待办任务 *
// 获取所有待办任务
static listRuntimeTask (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/listRuntimeTask', 'post', params, axiosOption, httpOption);
}
// 获得流程实例审批路径 *
// 获得流程实例审批路径
static viewHighlightFlowData (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/viewHighlightFlowData', 'get', params, axiosOption, httpOption);
}
// 获得流程实例的配置XML *
// 获得流程实例的配置XML
static viewProcessBpmn (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/viewProcessBpmn', 'get', params, axiosOption, httpOption);
}
// 获得所有历史流程实例 *
// 获得所有历史流程实例
static listAllHistoricProcessInstance (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/listAllHistoricProcessInstance', 'post', params, axiosOption, httpOption);
}
// 获得当前用户历史流程实例 *
// 获得当前用户历史流程实例
static listHistoricProcessInstance (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/listHistoricProcessInstance', 'post', params, axiosOption, httpOption);
}
// 终止流程 *
// 终止流程
static stopProcessInstance (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/stopProcessInstance', 'post', params, axiosOption, httpOption);
}
// 删除流程实例 *
// 删除流程实例
static deleteProcessInstance (sender, params, axiosOption, httpOption) {
return sender.doUrl('/admin/flow/flowOperation/deleteProcessInstance', 'post', params, axiosOption, httpOption);
}

8
orange-demo-flowable/orange-demo-flowable-web/src/utils/index.js
View File

@@ -136,8 +136,12 @@ export function objectToQueryString (params) {
return null;
} else {
return Object.keys(params).map((key) => {
return `${key}=${params[key]}`;
}).join('&');
if (params[key] !== undefined) {
return `${key}=${params[key]}`;
} else {
return undefined;
}
}).filter(item => item != null).join('&');
}
}
/**

2
orange-demo-flowable/orange-demo-flowable-web/src/views/onlineForm/formOnlinePage/index.vue
View File

@@ -94,7 +94,7 @@ export default {
},
isInit: false
},
pageListWidget: new TableWidget(this.loadOnlinePageData, this.loadOnlinePageVerify, false, false)
pageListWidget: new TableWidget(this.loadOnlinePageData, this.loadOnlinePageVerify, true, false)
}
},
methods: {

4
orange-demo-flowable/orange-demo-flowable-web/src/views/onlineForm/formOnlinePage/onlinePageSetting.vue
View File

@@ -856,8 +856,8 @@ export default {
tableName: relation.slaveTable.tableName,
tableId: relation.slaveTableId,
relationType: relation.relationType,
masterColumnName: relation.masterColumn.columnName,
slaveColumnName: relation.slaveColumn.columnName,
masterColumnName: (relation.masterColumn || {}).columnName || '未知字段',
slaveColumnName: (relation.slaveColumn || {}).columnName || '未知字段',
cascadeDelete: relation.cascadeDelete,
leftJoin: relation.leftJoin,
tag: relation