diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 0113419..24ee479 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -26,6 +26,13 @@ export const agreeTask = (data) => {
data: data
});
};
+export const rejectTask = (data) => {
+ return request({
+ url: `/workflow/mosr/process/task/reject`,
+ method: "post",
+ data: data
+ });
+};
export const addRequirement = (data) => {
return request({
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index b5119c3..0c54103 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -44,7 +44,7 @@
-
+
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index e6153d3..eb0781f 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -60,16 +60,16 @@
- 驳回
+ 驳回
同意
@@ -79,7 +79,7 @@
import OperationRender from '@/views/workflow/common/OperationRender.vue'
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
import {useProcessStore} from '@/stores/processStore.js';
-import {getInfo, agreeTask} from "@/api/project-demand/index.js";
+import {getInfo, agreeTask, rejectTask} from "@/api/project-demand/index.js";
const route = useRoute()
const form = ref();
@@ -130,6 +130,15 @@ const handleSubmit = () => {
console.log(res)
})
}
+const handleReject = () => {
+ let approve = {
+ taskId: processInstanceData.value.taskId,
+ auditOpinion : auditOpinion.value,
+ }
+ rejectTask(approve).then(res => {
+ console.log(res)
+ })
+}
const init = async () => {
getInfo(route.query.id).then(res => {
diff --git a/src/views/workflow/common/ProcessDiagramViewer.vue b/src/views/workflow/common/ProcessDiagramViewer.vue
index 1050a29..595e0c3 100644
--- a/src/views/workflow/common/ProcessDiagramViewer.vue
+++ b/src/views/workflow/common/ProcessDiagramViewer.vue
@@ -9,7 +9,7 @@
@@ -20,6 +20,12 @@ import ProcessTree from '@/views/workflow/process/ProcessTree.vue'
const processTreePreview = ref()
const scale = ref(100)
+const props = defineProps({
+ mode: {
+ type: String,
+ default: 'preview'
+ }
+})
nextTick(()=>{
processTreePreview.value.init()
diff --git a/src/views/workflow/process/common/AvatarEllipsis.vue b/src/views/workflow/process/common/AvatarEllipsis.vue
index 883f400..2665f58 100644
--- a/src/views/workflow/process/common/AvatarEllipsis.vue
+++ b/src/views/workflow/process/common/AvatarEllipsis.vue
@@ -38,6 +38,10 @@ const props = defineProps({
userInfo: {
type: Array,
default: []
+ },
+ mode: {
+ type: String,
+ default: 'design'
}
})
diff --git a/src/views/workflow/process/nodes/Node.vue b/src/views/workflow/process/nodes/Node.vue
index b02ee1e..36acd65 100644
--- a/src/views/workflow/process/nodes/Node.vue
+++ b/src/views/workflow/process/nodes/Node.vue
@@ -17,24 +17,28 @@
{{ placeholder }}
-
- {{ item.name }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
{{ placeholder }}
-
+