From 26481b68e855acf23151dccbc6e87ce75572a971 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 09:05:01 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/worksheet/content/Content.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 14cae00..7cfe6f4 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -428,8 +428,8 @@ function reloadList() {
From de6505bfb9dc826bdc8abe50767666639f2eb74f Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 09:07:53 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E4=B8=BB=E5=9B=BE=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E4=B8=BA=E9=80=9A=E8=BF=87=E6=88=96=E4=B8=8D=E9=80=9A?=
=?UTF-8?q?=E8=BF=87=E5=90=8E=EF=BC=8C=E7=A6=81=E6=AD=A2=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/worksheet/content/Content.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 7cfe6f4..e6b6f41 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;
}
From 55533ff3f98c5c2754d57a71889dadf757dad35d Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 12:34:53 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E7=94=9F=E6=88=90=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E7=A9=BA=E5=80=BC=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/worksheet/aside/ListItem.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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] }}
From de6e957668dda1fce0fc0f05bd11e0cd940a3e54 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 30 Mar 2024 13:45:45 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/worksheet/content/Content.vue | 39 +++++++++++++------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index e6b6f41..f506e49 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -312,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]
}
// 任务包图片 => 点击 => 通过/不通过按钮
@@ -331,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
- 
+