diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-refresh.svg b/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000..af71d10
--- /dev/null
+++ b/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-refresh.svg b/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000..af71d10
--- /dev/null
+++ b/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-search.svg b/src/assets/icons/icon-search.svg
new file mode 100644
index 0000000..f34257f
--- /dev/null
+++ b/src/assets/icons/icon-search.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-refresh.svg b/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000..af71d10
--- /dev/null
+++ b/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-search.svg b/src/assets/icons/icon-search.svg
new file mode 100644
index 0000000..f34257f
--- /dev/null
+++ b/src/assets/icons/icon-search.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-xyh.svg b/src/assets/icons/icon-xyh.svg
new file mode 100644
index 0000000..60c2e31
--- /dev/null
+++ b/src/assets/icons/icon-xyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-refresh.svg b/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000..af71d10
--- /dev/null
+++ b/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-search.svg b/src/assets/icons/icon-search.svg
new file mode 100644
index 0000000..f34257f
--- /dev/null
+++ b/src/assets/icons/icon-search.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-xyh.svg b/src/assets/icons/icon-xyh.svg
new file mode 100644
index 0000000..60c2e31
--- /dev/null
+++ b/src/assets/icons/icon-xyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/images/workFlowImg/add.png b/src/assets/images/workFlowImg/add.png
new file mode 100644
index 0000000..d626ac3
--- /dev/null
+++ b/src/assets/images/workFlowImg/add.png
Binary files differ
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-refresh.svg b/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000..af71d10
--- /dev/null
+++ b/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-search.svg b/src/assets/icons/icon-search.svg
new file mode 100644
index 0000000..f34257f
--- /dev/null
+++ b/src/assets/icons/icon-search.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-xyh.svg b/src/assets/icons/icon-xyh.svg
new file mode 100644
index 0000000..60c2e31
--- /dev/null
+++ b/src/assets/icons/icon-xyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/images/workFlowImg/add.png b/src/assets/images/workFlowImg/add.png
new file mode 100644
index 0000000..d626ac3
--- /dev/null
+++ b/src/assets/images/workFlowImg/add.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approval.png b/src/assets/images/workFlowImg/approval.png
new file mode 100644
index 0000000..479fceb
--- /dev/null
+++ b/src/assets/images/workFlowImg/approval.png
Binary files differ
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-refresh.svg b/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000..af71d10
--- /dev/null
+++ b/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-search.svg b/src/assets/icons/icon-search.svg
new file mode 100644
index 0000000..f34257f
--- /dev/null
+++ b/src/assets/icons/icon-search.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-xyh.svg b/src/assets/icons/icon-xyh.svg
new file mode 100644
index 0000000..60c2e31
--- /dev/null
+++ b/src/assets/icons/icon-xyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/images/workFlowImg/add.png b/src/assets/images/workFlowImg/add.png
new file mode 100644
index 0000000..d626ac3
--- /dev/null
+++ b/src/assets/images/workFlowImg/add.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approval.png b/src/assets/images/workFlowImg/approval.png
new file mode 100644
index 0000000..479fceb
--- /dev/null
+++ b/src/assets/images/workFlowImg/approval.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approvalPerson.png b/src/assets/images/workFlowImg/approvalPerson.png
new file mode 100644
index 0000000..e934468
--- /dev/null
+++ b/src/assets/images/workFlowImg/approvalPerson.png
Binary files differ
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-refresh.svg b/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000..af71d10
--- /dev/null
+++ b/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-search.svg b/src/assets/icons/icon-search.svg
new file mode 100644
index 0000000..f34257f
--- /dev/null
+++ b/src/assets/icons/icon-search.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-xyh.svg b/src/assets/icons/icon-xyh.svg
new file mode 100644
index 0000000..60c2e31
--- /dev/null
+++ b/src/assets/icons/icon-xyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/images/workFlowImg/add.png b/src/assets/images/workFlowImg/add.png
new file mode 100644
index 0000000..d626ac3
--- /dev/null
+++ b/src/assets/images/workFlowImg/add.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approval.png b/src/assets/images/workFlowImg/approval.png
new file mode 100644
index 0000000..479fceb
--- /dev/null
+++ b/src/assets/images/workFlowImg/approval.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approvalPerson.png b/src/assets/images/workFlowImg/approvalPerson.png
new file mode 100644
index 0000000..e934468
--- /dev/null
+++ b/src/assets/images/workFlowImg/approvalPerson.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/condition-new.png b/src/assets/images/workFlowImg/condition-new.png
new file mode 100644
index 0000000..42c2275
--- /dev/null
+++ b/src/assets/images/workFlowImg/condition-new.png
Binary files differ
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-refresh.svg b/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000..af71d10
--- /dev/null
+++ b/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-search.svg b/src/assets/icons/icon-search.svg
new file mode 100644
index 0000000..f34257f
--- /dev/null
+++ b/src/assets/icons/icon-search.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-xyh.svg b/src/assets/icons/icon-xyh.svg
new file mode 100644
index 0000000..60c2e31
--- /dev/null
+++ b/src/assets/icons/icon-xyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/images/workFlowImg/add.png b/src/assets/images/workFlowImg/add.png
new file mode 100644
index 0000000..d626ac3
--- /dev/null
+++ b/src/assets/images/workFlowImg/add.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approval.png b/src/assets/images/workFlowImg/approval.png
new file mode 100644
index 0000000..479fceb
--- /dev/null
+++ b/src/assets/images/workFlowImg/approval.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approvalPerson.png b/src/assets/images/workFlowImg/approvalPerson.png
new file mode 100644
index 0000000..e934468
--- /dev/null
+++ b/src/assets/images/workFlowImg/approvalPerson.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/condition-new.png b/src/assets/images/workFlowImg/condition-new.png
new file mode 100644
index 0000000..42c2275
--- /dev/null
+++ b/src/assets/images/workFlowImg/condition-new.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/condition.png b/src/assets/images/workFlowImg/condition.png
new file mode 100644
index 0000000..92c6e6d
--- /dev/null
+++ b/src/assets/images/workFlowImg/condition.png
Binary files differ
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-refresh.svg b/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000..af71d10
--- /dev/null
+++ b/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-search.svg b/src/assets/icons/icon-search.svg
new file mode 100644
index 0000000..f34257f
--- /dev/null
+++ b/src/assets/icons/icon-search.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-xyh.svg b/src/assets/icons/icon-xyh.svg
new file mode 100644
index 0000000..60c2e31
--- /dev/null
+++ b/src/assets/icons/icon-xyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/images/workFlowImg/add.png b/src/assets/images/workFlowImg/add.png
new file mode 100644
index 0000000..d626ac3
--- /dev/null
+++ b/src/assets/images/workFlowImg/add.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approval.png b/src/assets/images/workFlowImg/approval.png
new file mode 100644
index 0000000..479fceb
--- /dev/null
+++ b/src/assets/images/workFlowImg/approval.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approvalPerson.png b/src/assets/images/workFlowImg/approvalPerson.png
new file mode 100644
index 0000000..e934468
--- /dev/null
+++ b/src/assets/images/workFlowImg/approvalPerson.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/condition-new.png b/src/assets/images/workFlowImg/condition-new.png
new file mode 100644
index 0000000..42c2275
--- /dev/null
+++ b/src/assets/images/workFlowImg/condition-new.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/condition.png b/src/assets/images/workFlowImg/condition.png
new file mode 100644
index 0000000..92c6e6d
--- /dev/null
+++ b/src/assets/images/workFlowImg/condition.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/csr.png b/src/assets/images/workFlowImg/csr.png
new file mode 100644
index 0000000..23521a1
--- /dev/null
+++ b/src/assets/images/workFlowImg/csr.png
Binary files differ
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-refresh.svg b/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000..af71d10
--- /dev/null
+++ b/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-search.svg b/src/assets/icons/icon-search.svg
new file mode 100644
index 0000000..f34257f
--- /dev/null
+++ b/src/assets/icons/icon-search.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-xyh.svg b/src/assets/icons/icon-xyh.svg
new file mode 100644
index 0000000..60c2e31
--- /dev/null
+++ b/src/assets/icons/icon-xyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/images/workFlowImg/add.png b/src/assets/images/workFlowImg/add.png
new file mode 100644
index 0000000..d626ac3
--- /dev/null
+++ b/src/assets/images/workFlowImg/add.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approval.png b/src/assets/images/workFlowImg/approval.png
new file mode 100644
index 0000000..479fceb
--- /dev/null
+++ b/src/assets/images/workFlowImg/approval.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approvalPerson.png b/src/assets/images/workFlowImg/approvalPerson.png
new file mode 100644
index 0000000..e934468
--- /dev/null
+++ b/src/assets/images/workFlowImg/approvalPerson.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/condition-new.png b/src/assets/images/workFlowImg/condition-new.png
new file mode 100644
index 0000000..42c2275
--- /dev/null
+++ b/src/assets/images/workFlowImg/condition-new.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/condition.png b/src/assets/images/workFlowImg/condition.png
new file mode 100644
index 0000000..92c6e6d
--- /dev/null
+++ b/src/assets/images/workFlowImg/condition.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/csr.png b/src/assets/images/workFlowImg/csr.png
new file mode 100644
index 0000000..23521a1
--- /dev/null
+++ b/src/assets/images/workFlowImg/csr.png
Binary files differ
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index aad4174..07962fd 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -11,7 +11,7 @@
const props = defineProps({
directorMaxLevel: {
type: Number,
- default: 0,
+ default: 6,
},
})
const emits = defineEmits(['update:nodeConfig'])
@@ -65,6 +65,17 @@
approverRoleVisible.value = true
checkedRoleList.value = approverConfig.value.nodeUserList
}
+// // 选择好成员
+// const sureApprover = (data: IEmployees) => {
+// approverConfig.value.nodeUserList = data
+// approverVisible.value = false
+// }
+// // 选择好角色
+// const sureRoleApprover = (data: IroleInfo) => {
+// approverConfig.value.nodeUserList = data
+// approverRoleVisible.value = false
+// }
+
// 选择好成员
const sureApprover = (data: IEmployees[]) => {
data.forEach((user: IEmployees) => {
@@ -84,6 +95,7 @@
// approverConfig.value.nodeUserList = data
approverRoleVisible.value = false
}
+
// 点击确定,保存审批设置
const saveApprover = () => {
window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
@@ -205,6 +217,16 @@
noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
}
})
+const directorLevelList = ref([]) // 连续多级主管选择框数组,过滤直接主管
+watch(() => props.directorMaxLevel, (newValue) => {
+ if (newValue) {
+ for (let i = 1; i <= newValue; i++) {
+ if (i > 1) {
+ directorLevelList.value.push(i)
+ }
+ }
+ }
+}, { immediate: true })
@@ -301,7 +323,7 @@
:label="item === 1 ? '最高层级主管' : `第${item}层级主管`"
/> -->
+
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-refresh.svg b/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000..af71d10
--- /dev/null
+++ b/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-search.svg b/src/assets/icons/icon-search.svg
new file mode 100644
index 0000000..f34257f
--- /dev/null
+++ b/src/assets/icons/icon-search.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-xyh.svg b/src/assets/icons/icon-xyh.svg
new file mode 100644
index 0000000..60c2e31
--- /dev/null
+++ b/src/assets/icons/icon-xyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/images/workFlowImg/add.png b/src/assets/images/workFlowImg/add.png
new file mode 100644
index 0000000..d626ac3
--- /dev/null
+++ b/src/assets/images/workFlowImg/add.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approval.png b/src/assets/images/workFlowImg/approval.png
new file mode 100644
index 0000000..479fceb
--- /dev/null
+++ b/src/assets/images/workFlowImg/approval.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approvalPerson.png b/src/assets/images/workFlowImg/approvalPerson.png
new file mode 100644
index 0000000..e934468
--- /dev/null
+++ b/src/assets/images/workFlowImg/approvalPerson.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/condition-new.png b/src/assets/images/workFlowImg/condition-new.png
new file mode 100644
index 0000000..42c2275
--- /dev/null
+++ b/src/assets/images/workFlowImg/condition-new.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/condition.png b/src/assets/images/workFlowImg/condition.png
new file mode 100644
index 0000000..92c6e6d
--- /dev/null
+++ b/src/assets/images/workFlowImg/condition.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/csr.png b/src/assets/images/workFlowImg/csr.png
new file mode 100644
index 0000000..23521a1
--- /dev/null
+++ b/src/assets/images/workFlowImg/csr.png
Binary files differ
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index aad4174..07962fd 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -11,7 +11,7 @@
const props = defineProps({
directorMaxLevel: {
type: Number,
- default: 0,
+ default: 6,
},
})
const emits = defineEmits(['update:nodeConfig'])
@@ -65,6 +65,17 @@
approverRoleVisible.value = true
checkedRoleList.value = approverConfig.value.nodeUserList
}
+// // 选择好成员
+// const sureApprover = (data: IEmployees) => {
+// approverConfig.value.nodeUserList = data
+// approverVisible.value = false
+// }
+// // 选择好角色
+// const sureRoleApprover = (data: IroleInfo) => {
+// approverConfig.value.nodeUserList = data
+// approverRoleVisible.value = false
+// }
+
// 选择好成员
const sureApprover = (data: IEmployees[]) => {
data.forEach((user: IEmployees) => {
@@ -84,6 +95,7 @@
// approverConfig.value.nodeUserList = data
approverRoleVisible.value = false
}
+
// 点击确定,保存审批设置
const saveApprover = () => {
window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
@@ -205,6 +217,16 @@
noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
}
})
+const directorLevelList = ref([]) // 连续多级主管选择框数组,过滤直接主管
+watch(() => props.directorMaxLevel, (newValue) => {
+ if (newValue) {
+ for (let i = 1; i <= newValue; i++) {
+ if (i > 1) {
+ directorLevelList.value.push(i)
+ }
+ }
+ }
+}, { immediate: true })
@@ -301,7 +323,7 @@
:label="item === 1 ? '最高层级主管' : `第${item}层级主管`"
/> -->
+
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e7b4b8f..3f84680 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -4,6 +4,11 @@
import { id } from 'element-plus/es/locale'
import $func from '@/plugins/preload'
import useWorkFlowStore from '@/store/modules/workFlow'
+
+const props = defineProps({
+ pageType: String, // 页面类型
+})
+
const workFlowStore = useWorkFlowStore() // store
const conditionVisible = ref(false) // 控制选择条件对话框显隐
const conditionsConfig = ref({ // 多个条件数据配置
@@ -17,9 +22,9 @@
const conditionRoleVisible = ref(false) // 条件选择角色对话框显隐
const conditionPersonVisible = ref(false) // 条件选择人员对话框显隐
const conditionDeptVisible = ref(false) // 条件选择部门对话框显隐
-const selectConditionTypeFront = ref('1') // 选择条件类型,1人员、2角色、3部门
+const selectConditionTypeFront = ref('') // 选择条件类型,1人员、2角色、3部门
const { setCondition, setConditionsConfig } = workFlowStore
-
+const originalType = ref('') // 记录原始的类型
// 关闭条件抽屉
const closeDrawer = () => {
setCondition(false)
@@ -42,9 +47,11 @@
watch(() => workFlowStore.conditionsConfigValue, (val) => {
conditionsConfig.value = val.value
PriorityLevel.value = val.priorityLevel
- conditionConfig.value = val.priorityLevel
- ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
- : { nodeUserList: [], conditionList: [] }
+ conditionConfig.value = val.priorityLevel ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1] : { nodeUserList: [], conditionList: [] }
+ if (conditionConfig.value.nodeUserList.length) {
+ selectConditionTypeFront.value = `${conditionConfig.value.nodeUserList[0].type}`
+ originalType.value = `${conditionConfig.value.nodeUserList[0].type}`
+ }
})
// 点击添加条件,弹出条件选择框
@@ -156,10 +163,17 @@
function clickfq(conditionList: any, param: any, columnId: number | string) {
$func.toChecked(conditionList, param, columnId)
}
-// 条件变化清空列表
+// onUpdated(() => { // 首次不监听
+// // 条件变化清空列表
+// watch(() => selectConditionTypeFront.value, (newValue) => {
+// conditionConfig.value.nodeUserList = []
+// })
+// })
watch(() => selectConditionTypeFront.value, (newValue) => {
- conditionConfig.value.nodeUserList = []
-}, { immediate: true })
+ if (originalType.value !== selectConditionTypeFront.value) {
+ conditionConfig.value.nodeUserList = []
+ }
+})
diff --git a/src/assets/icons/icon-differ.svg b/src/assets/icons/icon-differ.svg
new file mode 100644
index 0000000..7d71c43
--- /dev/null
+++ b/src/assets/icons/icon-differ.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-dyh.svg b/src/assets/icons/icon-dyh.svg
new file mode 100644
index 0000000..005bd8e
--- /dev/null
+++ b/src/assets/icons/icon-dyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-init.svg b/src/assets/icons/icon-init.svg
new file mode 100644
index 0000000..b073cdf
--- /dev/null
+++ b/src/assets/icons/icon-init.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-refresh.svg b/src/assets/icons/icon-refresh.svg
new file mode 100644
index 0000000..af71d10
--- /dev/null
+++ b/src/assets/icons/icon-refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/icon-search.svg b/src/assets/icons/icon-search.svg
new file mode 100644
index 0000000..f34257f
--- /dev/null
+++ b/src/assets/icons/icon-search.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-xyh.svg b/src/assets/icons/icon-xyh.svg
new file mode 100644
index 0000000..60c2e31
--- /dev/null
+++ b/src/assets/icons/icon-xyh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/images/workFlowImg/add.png b/src/assets/images/workFlowImg/add.png
new file mode 100644
index 0000000..d626ac3
--- /dev/null
+++ b/src/assets/images/workFlowImg/add.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approval.png b/src/assets/images/workFlowImg/approval.png
new file mode 100644
index 0000000..479fceb
--- /dev/null
+++ b/src/assets/images/workFlowImg/approval.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/approvalPerson.png b/src/assets/images/workFlowImg/approvalPerson.png
new file mode 100644
index 0000000..e934468
--- /dev/null
+++ b/src/assets/images/workFlowImg/approvalPerson.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/condition-new.png b/src/assets/images/workFlowImg/condition-new.png
new file mode 100644
index 0000000..42c2275
--- /dev/null
+++ b/src/assets/images/workFlowImg/condition-new.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/condition.png b/src/assets/images/workFlowImg/condition.png
new file mode 100644
index 0000000..92c6e6d
--- /dev/null
+++ b/src/assets/images/workFlowImg/condition.png
Binary files differ
diff --git a/src/assets/images/workFlowImg/csr.png b/src/assets/images/workFlowImg/csr.png
new file mode 100644
index 0000000..23521a1
--- /dev/null
+++ b/src/assets/images/workFlowImg/csr.png
Binary files differ
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index aad4174..07962fd 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -11,7 +11,7 @@
const props = defineProps({
directorMaxLevel: {
type: Number,
- default: 0,
+ default: 6,
},
})
const emits = defineEmits(['update:nodeConfig'])
@@ -65,6 +65,17 @@
approverRoleVisible.value = true
checkedRoleList.value = approverConfig.value.nodeUserList
}
+// // 选择好成员
+// const sureApprover = (data: IEmployees) => {
+// approverConfig.value.nodeUserList = data
+// approverVisible.value = false
+// }
+// // 选择好角色
+// const sureRoleApprover = (data: IroleInfo) => {
+// approverConfig.value.nodeUserList = data
+// approverRoleVisible.value = false
+// }
+
// 选择好成员
const sureApprover = (data: IEmployees[]) => {
data.forEach((user: IEmployees) => {
@@ -84,6 +95,7 @@
// approverConfig.value.nodeUserList = data
approverRoleVisible.value = false
}
+
// 点击确定,保存审批设置
const saveApprover = () => {
window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
@@ -205,6 +217,16 @@
noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
}
})
+const directorLevelList = ref([]) // 连续多级主管选择框数组,过滤直接主管
+watch(() => props.directorMaxLevel, (newValue) => {
+ if (newValue) {
+ for (let i = 1; i <= newValue; i++) {
+ if (i > 1) {
+ directorLevelList.value.push(i)
+ }
+ }
+ }
+}, { immediate: true })
@@ -301,7 +323,7 @@
:label="item === 1 ? '最高层级主管' : `第${item}层级主管`"
/> -->
+
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e7b4b8f..3f84680 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -4,6 +4,11 @@
import { id } from 'element-plus/es/locale'
import $func from '@/plugins/preload'
import useWorkFlowStore from '@/store/modules/workFlow'
+
+const props = defineProps({
+ pageType: String, // 页面类型
+})
+
const workFlowStore = useWorkFlowStore() // store
const conditionVisible = ref(false) // 控制选择条件对话框显隐
const conditionsConfig = ref({ // 多个条件数据配置
@@ -17,9 +22,9 @@
const conditionRoleVisible = ref(false) // 条件选择角色对话框显隐
const conditionPersonVisible = ref(false) // 条件选择人员对话框显隐
const conditionDeptVisible = ref(false) // 条件选择部门对话框显隐
-const selectConditionTypeFront = ref('1') // 选择条件类型,1人员、2角色、3部门
+const selectConditionTypeFront = ref('') // 选择条件类型,1人员、2角色、3部门
const { setCondition, setConditionsConfig } = workFlowStore
-
+const originalType = ref('') // 记录原始的类型
// 关闭条件抽屉
const closeDrawer = () => {
setCondition(false)
@@ -42,9 +47,11 @@
watch(() => workFlowStore.conditionsConfigValue, (val) => {
conditionsConfig.value = val.value
PriorityLevel.value = val.priorityLevel
- conditionConfig.value = val.priorityLevel
- ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
- : { nodeUserList: [], conditionList: [] }
+ conditionConfig.value = val.priorityLevel ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1] : { nodeUserList: [], conditionList: [] }
+ if (conditionConfig.value.nodeUserList.length) {
+ selectConditionTypeFront.value = `${conditionConfig.value.nodeUserList[0].type}`
+ originalType.value = `${conditionConfig.value.nodeUserList[0].type}`
+ }
})
// 点击添加条件,弹出条件选择框
@@ -156,10 +163,17 @@
function clickfq(conditionList: any, param: any, columnId: number | string) {
$func.toChecked(conditionList, param, columnId)
}
-// 条件变化清空列表
+// onUpdated(() => { // 首次不监听
+// // 条件变化清空列表
+// watch(() => selectConditionTypeFront.value, (newValue) => {
+// conditionConfig.value.nodeUserList = []
+// })
+// })
watch(() => selectConditionTypeFront.value, (newValue) => {
- conditionConfig.value.nodeUserList = []
-}, { immediate: true })
+ if (originalType.value !== selectConditionTypeFront.value) {
+ conditionConfig.value.nodeUserList = []
+ }
+})
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index b773386..bb8bda1 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -75,7 +75,7 @@
-
+
审批人
@@ -87,15 +87,16 @@
-->
-
+
条件分支
-
@@ -103,6 +104,16 @@
+
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e7b4b8f..3f84680 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -4,6 +4,11 @@
import { id } from 'element-plus/es/locale'
import $func from '@/plugins/preload'
import useWorkFlowStore from '@/store/modules/workFlow'
+
+const props = defineProps({
+ pageType: String, // 页面类型
+})
+
const workFlowStore = useWorkFlowStore() // store
const conditionVisible = ref(false) // 控制选择条件对话框显隐
const conditionsConfig = ref({ // 多个条件数据配置
@@ -17,9 +22,9 @@
const conditionRoleVisible = ref(false) // 条件选择角色对话框显隐
const conditionPersonVisible = ref(false) // 条件选择人员对话框显隐
const conditionDeptVisible = ref(false) // 条件选择部门对话框显隐
-const selectConditionTypeFront = ref('1') // 选择条件类型,1人员、2角色、3部门
+const selectConditionTypeFront = ref('') // 选择条件类型,1人员、2角色、3部门
const { setCondition, setConditionsConfig } = workFlowStore
-
+const originalType = ref('') // 记录原始的类型
// 关闭条件抽屉
const closeDrawer = () => {
setCondition(false)
@@ -42,9 +47,11 @@
watch(() => workFlowStore.conditionsConfigValue, (val) => {
conditionsConfig.value = val.value
PriorityLevel.value = val.priorityLevel
- conditionConfig.value = val.priorityLevel
- ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
- : { nodeUserList: [], conditionList: [] }
+ conditionConfig.value = val.priorityLevel ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1] : { nodeUserList: [], conditionList: [] }
+ if (conditionConfig.value.nodeUserList.length) {
+ selectConditionTypeFront.value = `${conditionConfig.value.nodeUserList[0].type}`
+ originalType.value = `${conditionConfig.value.nodeUserList[0].type}`
+ }
})
// 点击添加条件,弹出条件选择框
@@ -156,10 +163,17 @@
function clickfq(conditionList: any, param: any, columnId: number | string) {
$func.toChecked(conditionList, param, columnId)
}
-// 条件变化清空列表
+// onUpdated(() => { // 首次不监听
+// // 条件变化清空列表
+// watch(() => selectConditionTypeFront.value, (newValue) => {
+// conditionConfig.value.nodeUserList = []
+// })
+// })
watch(() => selectConditionTypeFront.value, (newValue) => {
- conditionConfig.value.nodeUserList = []
-}, { immediate: true })
+ if (originalType.value !== selectConditionTypeFront.value) {
+ conditionConfig.value.nodeUserList = []
+ }
+})
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index b773386..bb8bda1 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -75,7 +75,7 @@
-
+
审批人
@@ -87,15 +87,16 @@
-->
-
+
条件分支
-
@@ -103,6 +104,16 @@
+
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e7b4b8f..3f84680 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -4,6 +4,11 @@
import { id } from 'element-plus/es/locale'
import $func from '@/plugins/preload'
import useWorkFlowStore from '@/store/modules/workFlow'
+
+const props = defineProps({
+ pageType: String, // 页面类型
+})
+
const workFlowStore = useWorkFlowStore() // store
const conditionVisible = ref(false) // 控制选择条件对话框显隐
const conditionsConfig = ref({ // 多个条件数据配置
@@ -17,9 +22,9 @@
const conditionRoleVisible = ref(false) // 条件选择角色对话框显隐
const conditionPersonVisible = ref(false) // 条件选择人员对话框显隐
const conditionDeptVisible = ref(false) // 条件选择部门对话框显隐
-const selectConditionTypeFront = ref('1') // 选择条件类型,1人员、2角色、3部门
+const selectConditionTypeFront = ref('') // 选择条件类型,1人员、2角色、3部门
const { setCondition, setConditionsConfig } = workFlowStore
-
+const originalType = ref('') // 记录原始的类型
// 关闭条件抽屉
const closeDrawer = () => {
setCondition(false)
@@ -42,9 +47,11 @@
watch(() => workFlowStore.conditionsConfigValue, (val) => {
conditionsConfig.value = val.value
PriorityLevel.value = val.priorityLevel
- conditionConfig.value = val.priorityLevel
- ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
- : { nodeUserList: [], conditionList: [] }
+ conditionConfig.value = val.priorityLevel ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1] : { nodeUserList: [], conditionList: [] }
+ if (conditionConfig.value.nodeUserList.length) {
+ selectConditionTypeFront.value = `${conditionConfig.value.nodeUserList[0].type}`
+ originalType.value = `${conditionConfig.value.nodeUserList[0].type}`
+ }
})
// 点击添加条件,弹出条件选择框
@@ -156,10 +163,17 @@
function clickfq(conditionList: any, param: any, columnId: number | string) {
$func.toChecked(conditionList, param, columnId)
}
-// 条件变化清空列表
+// onUpdated(() => { // 首次不监听
+// // 条件变化清空列表
+// watch(() => selectConditionTypeFront.value, (newValue) => {
+// conditionConfig.value.nodeUserList = []
+// })
+// })
watch(() => selectConditionTypeFront.value, (newValue) => {
- conditionConfig.value.nodeUserList = []
-}, { immediate: true })
+ if (originalType.value !== selectConditionTypeFront.value) {
+ conditionConfig.value.nodeUserList = []
+ }
+})
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index b773386..bb8bda1 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -75,7 +75,7 @@
-
+
审批人
@@ -87,15 +87,16 @@
-->
-
+
条件分支
-
@@ -103,6 +104,16 @@
+
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e7b4b8f..3f84680 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -4,6 +4,11 @@
import { id } from 'element-plus/es/locale'
import $func from '@/plugins/preload'
import useWorkFlowStore from '@/store/modules/workFlow'
+
+const props = defineProps({
+ pageType: String, // 页面类型
+})
+
const workFlowStore = useWorkFlowStore() // store
const conditionVisible = ref(false) // 控制选择条件对话框显隐
const conditionsConfig = ref({ // 多个条件数据配置
@@ -17,9 +22,9 @@
const conditionRoleVisible = ref(false) // 条件选择角色对话框显隐
const conditionPersonVisible = ref(false) // 条件选择人员对话框显隐
const conditionDeptVisible = ref(false) // 条件选择部门对话框显隐
-const selectConditionTypeFront = ref('1') // 选择条件类型,1人员、2角色、3部门
+const selectConditionTypeFront = ref('') // 选择条件类型,1人员、2角色、3部门
const { setCondition, setConditionsConfig } = workFlowStore
-
+const originalType = ref('') // 记录原始的类型
// 关闭条件抽屉
const closeDrawer = () => {
setCondition(false)
@@ -42,9 +47,11 @@
watch(() => workFlowStore.conditionsConfigValue, (val) => {
conditionsConfig.value = val.value
PriorityLevel.value = val.priorityLevel
- conditionConfig.value = val.priorityLevel
- ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
- : { nodeUserList: [], conditionList: [] }
+ conditionConfig.value = val.priorityLevel ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1] : { nodeUserList: [], conditionList: [] }
+ if (conditionConfig.value.nodeUserList.length) {
+ selectConditionTypeFront.value = `${conditionConfig.value.nodeUserList[0].type}`
+ originalType.value = `${conditionConfig.value.nodeUserList[0].type}`
+ }
})
// 点击添加条件,弹出条件选择框
@@ -156,10 +163,17 @@
function clickfq(conditionList: any, param: any, columnId: number | string) {
$func.toChecked(conditionList, param, columnId)
}
-// 条件变化清空列表
+// onUpdated(() => { // 首次不监听
+// // 条件变化清空列表
+// watch(() => selectConditionTypeFront.value, (newValue) => {
+// conditionConfig.value.nodeUserList = []
+// })
+// })
watch(() => selectConditionTypeFront.value, (newValue) => {
- conditionConfig.value.nodeUserList = []
-}, { immediate: true })
+ if (originalType.value !== selectConditionTypeFront.value) {
+ conditionConfig.value.nodeUserList = []
+ }
+})
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index b773386..bb8bda1 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -75,7 +75,7 @@
-
+
审批人
@@ -87,15 +87,16 @@
-->
-
+
条件分支
-
@@ -103,6 +104,16 @@