From 049d0c1132e5cbe2dfb32a554f6e1957fd835915 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 18 Jul 2024 14:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=80=E6=9C=AF=E7=9B=91?=
=?UTF-8?q?=E7=9D=A3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 1 -
src/components/table/header/index.vue | 2 +-
src/utils/request.ts | 1 +
.../panorama/components/details/point.vue | 6 +-
.../panorama/components/details/stand.vue | 6 +-
.../electricalEnergy/components1/online.vue | 4 +-
.../components/undocumented/detail.vue | 68 +++-
.../detail/ProcessInstanceTaskList.vue | 2 +-
.../bpm/processInstance/detail/index.vue | 5 +
src/views/system/bpm/task/alarmTask/index.vue | 292 ++++++++++++++++++
src/views/system/bpm/task/index.vue | 4 +
11 files changed, 373 insertions(+), 18 deletions(-)
create mode 100644 src/views/system/bpm/task/alarmTask/index.vue
diff --git a/index.html b/index.html
index 531c3132..eca0104e 100644
--- a/index.html
+++ b/index.html
@@ -17,7 +17,6 @@
-
diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index 2a5e63e8..e36f2de2 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -169,7 +169,7 @@ const setInterval = (val: any) => {
datePickerRef.value.setInterval(val)
}
-defineExpose({ onComSearch, areaRef, setDatePicker, setInterval, datePickerRef })
+defineExpose({ onComSearch, areaRef, setDatePicker, setInterval, datePickerRef, showSelectChange})
diff --git a/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue b/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue
index 3997e045..6dc575b2 100644
--- a/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue
+++ b/src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue
@@ -49,7 +49,7 @@
:icon="View"
style="margin-left: 10px;"
@click='handleFormDetail(item)'
- v-if="item.formId && item.status!=3"
+ v-if="item.formId "
>
查看表单
diff --git a/src/views/system/bpm/processInstance/detail/index.vue b/src/views/system/bpm/processInstance/detail/index.vue
index a3be0aad..169d6d6d 100644
--- a/src/views/system/bpm/processInstance/detail/index.vue
+++ b/src/views/system/bpm/processInstance/detail/index.vue
@@ -251,6 +251,11 @@ const handleAudit = async (task, pass) => {
tab.value = '审批记录'
ElMessage.success('审批通过成功')
} else {
+ const formCreateApi = approveFormFApis.value[index]
+ if (formCreateApi) {
+ await formCreateApi.validate()
+ data.variables = approveForms.value[index].value
+ }
await rejectTask(data)
tab.value = '审批记录'
ElMessage.success('审批不通过成功')
diff --git a/src/views/system/bpm/task/alarmTask/index.vue b/src/views/system/bpm/task/alarmTask/index.vue
new file mode 100644
index 00000000..c2dfc7c5
--- /dev/null
+++ b/src/views/system/bpm/task/alarmTask/index.vue
@@ -0,0 +1,292 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/bpm/task/index.vue b/src/views/system/bpm/task/index.vue
index cd9a0b2d..92d57bbb 100644
--- a/src/views/system/bpm/task/index.vue
+++ b/src/views/system/bpm/task/index.vue
@@ -10,6 +10,9 @@
+
+
+
@@ -19,6 +22,7 @@ import { ref } from 'vue'
import TodoTask from './todo/index.vue'
import DoneTask from './done/index.vue'
import MyInstance from './myInstance/index.vue'
+import AlarmTask from './alarmTask/index.vue'
import { mainHeight } from '@/utils/layout'
defineOptions({