update 统一业务id参数
This commit is contained in:
parent
4097fe1d72
commit
f3abcd1442
@ -31,9 +31,9 @@ export const pageByFinish = (query: FlowInstanceQuery): AxiosPromise<FlowInstanc
|
|||||||
/**
|
/**
|
||||||
* 通过业务id获取历史流程图
|
* 通过业务id获取历史流程图
|
||||||
*/
|
*/
|
||||||
export const flowImage = (businessKey: string | number) => {
|
export const flowImage = (businessId: string | number) => {
|
||||||
return request({
|
return request({
|
||||||
url: `/workflow/instance/flowImage/${businessKey}` + '?t' + Math.random(),
|
url: `/workflow/instance/flowImage/${businessId}` + '?t' + Math.random(),
|
||||||
method: 'get'
|
method: 'get'
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -7,7 +7,7 @@ export default {
|
|||||||
proxy.$router.push({
|
proxy.$router.push({
|
||||||
path: routerJumpVo.formPath,
|
path: routerJumpVo.formPath,
|
||||||
query: {
|
query: {
|
||||||
id: routerJumpVo.businessKey,
|
id: routerJumpVo.businessId,
|
||||||
type: routerJumpVo.type,
|
type: routerJumpVo.type,
|
||||||
taskId: routerJumpVo.taskId
|
taskId: routerJumpVo.taskId
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
export interface RouterJumpVo {
|
export interface RouterJumpVo {
|
||||||
businessKey: string;
|
businessId: string;
|
||||||
taskId: string | number;
|
taskId: string | number;
|
||||||
type: string;
|
type: string;
|
||||||
formCustom: string;
|
formCustom: string;
|
||||||
@ -7,7 +7,7 @@ export interface RouterJumpVo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface StartProcessBo {
|
export interface StartProcessBo {
|
||||||
businessKey: string | number;
|
businessId: string | number;
|
||||||
flowCode: string;
|
flowCode: string;
|
||||||
variables: any;
|
variables: any;
|
||||||
}
|
}
|
||||||
|
@ -76,12 +76,12 @@ const tabActiveName = ref('bpmn');
|
|||||||
const imgUrl = ref('');
|
const imgUrl = ref('');
|
||||||
|
|
||||||
//初始化查询审批记录
|
//初始化查询审批记录
|
||||||
const init = async (businessKey: string | number) => {
|
const init = async (businessId: string | number) => {
|
||||||
visible.value = true;
|
visible.value = true;
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
tabActiveName.value = 'bpmn';
|
tabActiveName.value = 'bpmn';
|
||||||
historyList.value = [];
|
historyList.value = [];
|
||||||
flowImage(businessKey).then((resp) => {
|
flowImage(businessId).then((resp) => {
|
||||||
if (resp.data) {
|
if (resp.data) {
|
||||||
historyList.value = resp.data.list;
|
historyList.value = resp.data.list;
|
||||||
imgUrl.value = 'data:image/gif;base64,' + resp.data.image;
|
imgUrl.value = 'data:image/gif;base64,' + resp.data.image;
|
||||||
|
@ -128,7 +128,7 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
|
|||||||
const leaveFormRef = ref<ElFormInstance>();
|
const leaveFormRef = ref<ElFormInstance>();
|
||||||
|
|
||||||
const submitFormData = ref<StartProcessBo>({
|
const submitFormData = ref<StartProcessBo>({
|
||||||
businessKey: '',
|
businessId: '',
|
||||||
flowCode: '',
|
flowCode: '',
|
||||||
variables: {}
|
variables: {}
|
||||||
});
|
});
|
||||||
@ -245,7 +245,7 @@ const submitFlow = async () => {
|
|||||||
const handleStartWorkFlow = async (data: LeaveVO) => {
|
const handleStartWorkFlow = async (data: LeaveVO) => {
|
||||||
try {
|
try {
|
||||||
submitFormData.value.flowCode = flowCode.value;
|
submitFormData.value.flowCode = flowCode.value;
|
||||||
submitFormData.value.businessKey = data.id;
|
submitFormData.value.businessId = data.id;
|
||||||
//流程变量
|
//流程变量
|
||||||
taskVariables.value = {
|
taskVariables.value = {
|
||||||
leaveDays: data.leaveDays,
|
leaveDays: data.leaveDays,
|
||||||
|
@ -369,7 +369,7 @@ const cancelPopover = async (index: any) => {
|
|||||||
/** 查看按钮操作 */
|
/** 查看按钮操作 */
|
||||||
const handleView = (row) => {
|
const handleView = (row) => {
|
||||||
const routerJumpVo = reactive<RouterJumpVo>({
|
const routerJumpVo = reactive<RouterJumpVo>({
|
||||||
businessKey: row.businessId,
|
businessId: row.businessId,
|
||||||
taskId: row.id,
|
taskId: row.id,
|
||||||
type: 'view',
|
type: 'view',
|
||||||
formCustom: row.formCustom,
|
formCustom: row.formCustom,
|
||||||
|
@ -231,7 +231,7 @@ const submitCallback = async (data) => {
|
|||||||
/** 查看按钮操作 */
|
/** 查看按钮操作 */
|
||||||
const handleView = (row) => {
|
const handleView = (row) => {
|
||||||
const routerJumpVo = reactive<RouterJumpVo>({
|
const routerJumpVo = reactive<RouterJumpVo>({
|
||||||
businessKey: row.businessId,
|
businessId: row.businessId,
|
||||||
taskId: row.id,
|
taskId: row.id,
|
||||||
type: 'view',
|
type: 'view',
|
||||||
formCustom: row.formCustom,
|
formCustom: row.formCustom,
|
||||||
|
@ -243,7 +243,7 @@ const handleCancelProcessApply = async (businessId: string) => {
|
|||||||
//办理
|
//办理
|
||||||
const handleOpen = async (row, type) => {
|
const handleOpen = async (row, type) => {
|
||||||
const routerJumpVo = reactive<RouterJumpVo>({
|
const routerJumpVo = reactive<RouterJumpVo>({
|
||||||
businessKey: row.businessId,
|
businessId: row.businessId,
|
||||||
taskId: row.id,
|
taskId: row.id,
|
||||||
type: type,
|
type: type,
|
||||||
formCustom: row.formCustom,
|
formCustom: row.formCustom,
|
||||||
|
@ -120,7 +120,7 @@ const getTaskCopyList = () => {
|
|||||||
/** 查看按钮操作 */
|
/** 查看按钮操作 */
|
||||||
const handleView = (row) => {
|
const handleView = (row) => {
|
||||||
const routerJumpVo = reactive<RouterJumpVo>({
|
const routerJumpVo = reactive<RouterJumpVo>({
|
||||||
businessKey: row.businessId,
|
businessId: row.businessId,
|
||||||
taskId: row.id,
|
taskId: row.id,
|
||||||
type: 'view',
|
type: 'view',
|
||||||
formCustom: row.formCustom,
|
formCustom: row.formCustom,
|
||||||
|
@ -152,7 +152,7 @@ const getFinishList = () => {
|
|||||||
/** 查看按钮操作 */
|
/** 查看按钮操作 */
|
||||||
const handleView = (row: FlowTaskVO) => {
|
const handleView = (row: FlowTaskVO) => {
|
||||||
const routerJumpVo = reactive<RouterJumpVo>({
|
const routerJumpVo = reactive<RouterJumpVo>({
|
||||||
businessKey: row.businessId,
|
businessId: row.businessId,
|
||||||
taskId: row.id,
|
taskId: row.id,
|
||||||
type: 'view',
|
type: 'view',
|
||||||
formCustom: row.formCustom,
|
formCustom: row.formCustom,
|
||||||
|
@ -154,7 +154,7 @@ const getWaitingList = () => {
|
|||||||
//办理
|
//办理
|
||||||
const handleOpen = async (row: FlowTaskVO) => {
|
const handleOpen = async (row: FlowTaskVO) => {
|
||||||
const routerJumpVo = reactive<RouterJumpVo>({
|
const routerJumpVo = reactive<RouterJumpVo>({
|
||||||
businessKey: row.businessId,
|
businessId: row.businessId,
|
||||||
taskId: row.id,
|
taskId: row.id,
|
||||||
type: 'approval',
|
type: 'approval',
|
||||||
formCustom: row.formCustom,
|
formCustom: row.formCustom,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user