diff --git a/.eslintrc b/.eslintrc index 7d9970d..cd94cc4 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,7 +5,7 @@ "no-tabs":"off", "no-const-assign": "off", "no-console": "off", - // "eqeqeq": "off", + "eqeqeq": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git a/.eslintrc b/.eslintrc index 7d9970d..cd94cc4 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,7 +5,7 @@ "no-tabs":"off", "no-const-assign": "off", "no-console": "off", - // "eqeqeq": "off", + "eqeqeq": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git "a/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" new file mode 100644 index 0000000..e934468 --- /dev/null +++ "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" Binary files differ diff --git a/.eslintrc b/.eslintrc index 7d9970d..cd94cc4 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,7 +5,7 @@ "no-tabs":"off", "no-const-assign": "off", "no-console": "off", - // "eqeqeq": "off", + "eqeqeq": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git "a/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" new file mode 100644 index 0000000..e934468 --- /dev/null +++ "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" Binary files differ diff --git "a/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" "b/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" new file mode 100644 index 0000000..23521a1 --- /dev/null +++ "b/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" Binary files differ diff --git a/.eslintrc b/.eslintrc index 7d9970d..cd94cc4 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,7 +5,7 @@ "no-tabs":"off", "no-const-assign": "off", "no-console": "off", - // "eqeqeq": "off", + "eqeqeq": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git "a/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" new file mode 100644 index 0000000..e934468 --- /dev/null +++ "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" Binary files differ diff --git "a/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" "b/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" new file mode 100644 index 0000000..23521a1 --- /dev/null +++ "b/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" Binary files differ diff --git "a/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" "b/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" new file mode 100644 index 0000000..92c6e6d --- /dev/null +++ "b/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" Binary files differ diff --git a/.eslintrc b/.eslintrc index 7d9970d..cd94cc4 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,7 +5,7 @@ "no-tabs":"off", "no-const-assign": "off", "no-console": "off", - // "eqeqeq": "off", + "eqeqeq": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git "a/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" new file mode 100644 index 0000000..e934468 --- /dev/null +++ "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" Binary files differ diff --git "a/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" "b/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" new file mode 100644 index 0000000..23521a1 --- /dev/null +++ "b/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" Binary files differ diff --git "a/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" "b/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" new file mode 100644 index 0000000..92c6e6d --- /dev/null +++ "b/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" Binary files differ diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue index 5bf1d43..19cc830 100644 --- a/src/components/workFlow/addNode.vue +++ b/src/components/workFlow/addNode.vue @@ -91,19 +91,19 @@
- +

审批人

- +

抄送人

- +

条件分支

diff --git a/.eslintrc b/.eslintrc index 7d9970d..cd94cc4 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,7 +5,7 @@ "no-tabs":"off", "no-const-assign": "off", "no-console": "off", - // "eqeqeq": "off", + "eqeqeq": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git "a/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" new file mode 100644 index 0000000..e934468 --- /dev/null +++ "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" Binary files differ diff --git "a/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" "b/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" new file mode 100644 index 0000000..23521a1 --- /dev/null +++ "b/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" Binary files differ diff --git "a/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" "b/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" new file mode 100644 index 0000000..92c6e6d --- /dev/null +++ "b/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" Binary files differ diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue index 5bf1d43..19cc830 100644 --- a/src/components/workFlow/addNode.vue +++ b/src/components/workFlow/addNode.vue @@ -91,19 +91,19 @@
- +

审批人

- +

抄送人

- +

条件分支

diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index 5bf1d43..f6e3bd1 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -1,194 +1,1093 @@ - - diff --git a/.eslintrc b/.eslintrc index 7d9970d..cd94cc4 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,7 +5,7 @@ "no-tabs":"off", "no-const-assign": "off", "no-console": "off", - // "eqeqeq": "off", + "eqeqeq": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git "a/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" new file mode 100644 index 0000000..e934468 --- /dev/null +++ "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" Binary files differ diff --git "a/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" "b/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" new file mode 100644 index 0000000..23521a1 --- /dev/null +++ "b/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" Binary files differ diff --git "a/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" "b/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" new file mode 100644 index 0000000..92c6e6d --- /dev/null +++ "b/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" Binary files differ diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue index 5bf1d43..19cc830 100644 --- a/src/components/workFlow/addNode.vue +++ b/src/components/workFlow/addNode.vue @@ -91,19 +91,19 @@
- +

审批人

- +

抄送人

- +

条件分支

diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index 5bf1d43..f6e3bd1 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -1,194 +1,1093 @@ - - diff --git a/src/components/workFlow/workFlow.vue b/src/components/workFlow/workFlow.vue new file mode 100644 index 0000000..439b560 --- /dev/null +++ b/src/components/workFlow/workFlow.vue @@ -0,0 +1,764 @@ + + + + + diff --git a/.eslintrc b/.eslintrc index 7d9970d..cd94cc4 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,7 +5,7 @@ "no-tabs":"off", "no-const-assign": "off", "no-console": "off", - // "eqeqeq": "off", + "eqeqeq": "off", "vue/component-name-in-template-casing": ["error", "kebab-case", { "registeredComponentsOnly": false, "ignores": [] diff --git "a/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" new file mode 100644 index 0000000..e934468 --- /dev/null +++ "b/src/assets/images/workFlowImg/\345\256\241\346\211\271\344\272\272.png" Binary files differ diff --git "a/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" "b/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" new file mode 100644 index 0000000..23521a1 --- /dev/null +++ "b/src/assets/images/workFlowImg/\346\212\204\351\200\201\344\272\272.png" Binary files differ diff --git "a/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" "b/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" new file mode 100644 index 0000000..92c6e6d --- /dev/null +++ "b/src/assets/images/workFlowImg/\346\235\241\344\273\266.png" Binary files differ diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue index 5bf1d43..19cc830 100644 --- a/src/components/workFlow/addNode.vue +++ b/src/components/workFlow/addNode.vue @@ -91,19 +91,19 @@
- +

审批人

- +

抄送人

- +

条件分支

diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index 5bf1d43..f6e3bd1 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -1,194 +1,1093 @@ - - diff --git a/src/components/workFlow/workFlow.vue b/src/components/workFlow/workFlow.vue new file mode 100644 index 0000000..439b560 --- /dev/null +++ b/src/components/workFlow/workFlow.vue @@ -0,0 +1,764 @@ + + + + + diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue index 4a92993..8ea8966 100644 --- a/src/views/system/process/editProcess.vue +++ b/src/views/system/process/editProcess.vue @@ -4,6 +4,7 @@ import type { FormInstance, FormRules } from 'element-plus' import type { Ref } from 'vue' import type { Iform } from './process' +import WorkFlow from '@/components/workFlow/workFlow.vue' const emits = defineEmits(['close']) const ruleFormRef = ref() const form: Ref = ref({ @@ -195,7 +196,9 @@
流程配置
-
+
+ +
@@ -223,7 +226,10 @@ } .set { - height: 200px; + width: 100%; + background-color: #fff; + border-radius: 7px; + margin: 20px 0; } }