diff --git a/src/views/worksheet/aside/ListItem.vue b/src/views/worksheet/aside/ListItem.vue
index 10dac90..aec4360 100644
--- a/src/views/worksheet/aside/ListItem.vue
+++ b/src/views/worksheet/aside/ListItem.vue
@@ -63,7 +63,7 @@ onMounted(async () => {
提交时间:{{ format(listItem.createdate, "yyyy-MM-dd HH:mm:ss") }}
- 生成时间:{{ format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}
+ 生成时间:{{ listItem.createTime && format(listItem.createTime, "yyyy-MM-dd HH:mm:ss") }}
{{ item.name }}:{{ listItem[item.id] }}
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 14cae00..f506e49 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -269,7 +269,10 @@ function immersionHandler() {
}
function showAction() {
- const item = taskDetailInfo.value;
+ const item = taskDetailInfo.value;
+ if (item.states === 2 || item.states === 3) {
+ return
+ }
if (batch.value === false) overTask.value = item;
}
@@ -309,12 +312,7 @@ function approvalHandler(items?: any) {
processItems = selectItems.value
}
else if (overTask.value) {
- // 主图点击 => 点击 => 通过/不通过按钮
cloneItem = clone(overTask.value)
- // 接口问题,暂时先这样处理
- // if (!cloneItem.taskId) {
- // cloneItem.taskId = "taskIdtaskIdtaskIdtaskIdtaskId"
- // }
processItems = [cloneItem]
}
// 任务包图片 => 点击 => 通过/不通过按钮
@@ -328,31 +326,37 @@ function approvalHandler(items?: any) {
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: () => {
- approval()
+ doAudit(param)
},
onNegativeClick: () => { },
})
}
-function approval() {
- const formIds: string[] = processItems.map(item => item.id)
- const taskIds: string[] = processItems.map(item => item.taskId)
- const tasknames: string[] = processItems.map(item => item.taskname)
- const param: ApprovalParam = {
- formid: formIds,
- taskId: taskIds,
- approvd: true,
- taskComment: 'approval',
- taskname: tasknames,
- }
- doAudit(param)
-}
function doAudit(param: any) {
audit(param).then((res) => {
const { code } = res
@@ -428,8 +432,8 @@ function reloadList() {