diff --git a/src/views/worksheet/components/PhotoWall.vue b/src/views/worksheet/components/PictureWall.vue similarity index 100% rename from src/views/worksheet/components/PhotoWall.vue rename to src/views/worksheet/components/PictureWall.vue diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index 0737451..6072447 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -320,7 +320,7 @@ function reject(idOrDesc: string, backId: string, isOther: boolean) { doAudit(param) } -function approvalHandler(items?: any) { +function detailApprovalHandler(items?: any){ let cloneItem: any if (batch.value) { processItems = selectItems.value @@ -371,6 +371,56 @@ function approvalHandler(items?: any) { onNegativeClick: () => { }, }) } +function approvalHandler(items?: any) { + let cloneItem: any + if (batch.value) { + processItems = selectItems.value + } + else if (overTask.value) { + cloneItem = clone(overTask.value) + processItems = [cloneItem] + } + // 任务包图片 => 点击 => 通过/不通过按钮 + if (items !== undefined && !(items instanceof PointerEvent)) + processItems = [items] + + const msg = validate(processItems) + + if (msg !== null) { + message.error(msg) + return + } + + const list: any = [] + processItems.forEach((item) => { + list.push({ + formId: item.id, + taskId: item.taskId, + taskName: item.fromTaskName, + }) + }) + + const param = { + result: true, + comment: '', + disposeType: '', + disposeTypeId: '', + failCauseId: '', + failCauseName: '', + flowTaskInfoList: list, + } + + dialog.info({ + title: '确认提示', + content: '确认给该任务审批为【通过】吗?', + positiveText: '确定', + negativeText: '取消', + onPositiveClick: () => { + doAudit(param) + }, + onNegativeClick: () => { }, + }) +} function doAudit(param: any) { audit(param).then((res) => { @@ -489,7 +539,7 @@ function reloadList() {
- +