修改通用工单组件

package-lock.json

@@ -2736,8 +2736,8 @@
     },
     "amdefine": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true
     },
     "ansi-colors": {
@@ -3016,8 +3016,8 @@
     },
     "async-foreach": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmmirror.com/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
       "dev": true
     },
     "async-limiter": {
@@ -3871,8 +3871,8 @@
     },
     "block-stream": {
       "version": "0.0.9",
-      "resolved": "https://registry.npmmirror.com/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha512-OorbnJVPII4DuUKbjARAe8u8EfqOmkEEaSFIyoQ7OjTHn6kafxWl0wLgoZ2rXaYd7MyLcDaU4TmhfxtwgcccMQ==",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
         "inherits": "~2.0.0"
@@ -5358,8 +5358,8 @@
     },
     "console-control-strings": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmmirror.com/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
       "dev": true
     },
     "console-stream": {
@@ -6937,7 +6937,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/deep-equal/-/deep-equal-1.1.1.tgz",
       "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-      "dev": true,
       "requires": {
         "is-arguments": "^1.0.4",
         "is-date-object": "^1.0.1",
@@ -7003,7 +7002,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmmirror.com/define-properties/-/define-properties-1.1.3.tgz",
       "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
       "requires": {
         "object-keys": "^1.0.12"
       }
@@ -7133,8 +7131,8 @@
     },
     "delegates": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
       "dev": true
     },
     "depd": {
@@ -8753,6 +8751,11 @@
       "resolved": "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
+    "fast-diff": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.1.2.tgz",
+      "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+    },
     "fast-glob": {
       "version": "2.2.7",
       "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-2.2.7.tgz",
@@ -9599,8 +9602,8 @@
     },
     "gauge": {
       "version": "2.7.4",
-      "resolved": "https://registry.npmmirror.com/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
         "aproba": "^1.0.3",
@@ -9615,8 +9618,8 @@
       "dependencies": {
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
             "number-is-nan": "^1.0.0"
@@ -9624,14 +9627,14 @@
         },
         "object-assign": {
           "version": "4.1.1",
-          "resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
           "dev": true
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmmirror.com/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
             "code-point-at": "^1.0.0",
@@ -10162,15 +10165,14 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
       "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
       "requires": {
         "has-symbols": "^1.0.2"
       }
     },
     "has-unicode": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
       "dev": true
     },
     "has-value": {
@@ -13032,7 +13034,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/is-arguments/-/is-arguments-1.1.1.tgz",
       "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -13151,7 +13152,6 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmmirror.com/is-date-object/-/is-date-object-1.0.5.tgz",
       "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
       "requires": {
         "has-tostringtag": "^1.0.0"
       }
@@ -13376,7 +13376,6 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmmirror.com/is-regex/-/is-regex-1.1.4.tgz",
       "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -16433,8 +16432,8 @@
         },
         "nopt": {
           "version": "3.0.6",
-          "resolved": "https://registry.npmmirror.com/nopt/-/nopt-3.0.6.tgz",
-          "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
           "dev": true,
           "requires": {
             "abbrev": "1"
@@ -16442,8 +16441,8 @@
         },
         "semver": {
           "version": "5.3.0",
-          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha512-mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw==",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
           "dev": true
         },
         "tar": {
@@ -16556,7 +16555,7 @@
     },
     "node-sass": {
       "version": "4.14.1",
-      "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-4.14.1.tgz",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
       "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
       "dev": true,
       "requires": {
@@ -16581,8 +16580,8 @@
       "dependencies": {
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -16594,8 +16593,8 @@
         },
         "cross-spawn": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-3.0.1.tgz",
-          "integrity": "sha512-eZ+m1WNhSZutOa/uRblAc9Ut5MQfukFrFMtPSm3bZCA888NmMd5AWXWdgRZ80zd+pTk1P2JrGjg9pUPTvl2PWQ==",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
           "dev": true,
           "requires": {
             "lru-cache": "^4.0.1",
@@ -16637,8 +16636,8 @@
         },
         "yallist": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
           "dev": true
         }
       }
@@ -16825,7 +16824,6 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmmirror.com/object-is/-/object-is-1.1.5.tgz",
       "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
@@ -16834,8 +16832,7 @@
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
     "object-visit": {
       "version": "1.0.1",
@@ -17899,6 +17896,11 @@
         "no-case": "^2.2.0"
       }
     },
+    "parchment": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/parchment/-/parchment-1.1.4.tgz",
+      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz",
@@ -19976,6 +19978,41 @@
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
+    "quill": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmmirror.com/quill/-/quill-1.3.7.tgz",
+      "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+      "requires": {
+        "clone": "^2.1.1",
+        "deep-equal": "^1.0.1",
+        "eventemitter3": "^2.0.3",
+        "extend": "^3.0.2",
+        "parchment": "^1.1.4",
+        "quill-delta": "^3.6.2"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
+        },
+        "eventemitter3": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-2.0.3.tgz",
+          "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
+        }
+      }
+    },
+    "quill-delta": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-3.6.3.tgz",
+      "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+      "requires": {
+        "deep-equal": "^1.0.1",
+        "extend": "^3.0.2",
+        "fast-diff": "1.1.2"
+      }
+    },
     "raf": {
       "version": "3.4.1",
       "resolved": "https://registry.npmmirror.com/raf/-/raf-3.4.1.tgz",
@@ -20223,7 +20260,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmmirror.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz",
       "integrity": "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
@@ -21224,8 +21260,8 @@
         },
         "path-exists": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
           "dev": true
         },
         "require-main-filename": {
@@ -21383,8 +21419,8 @@
     },
     "scss-tokenizer": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmmirror.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
-      "integrity": "sha512-dYE8LhncfBUar6POCxMTm0Ln+erjeczqEvCJib5/7XNkdw1FkUGgwMPY360FY0FgPWQxHWCx29Jl3oejyGLM9Q==",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
         "js-base64": "^2.1.8",
@@ -21393,8 +21429,8 @@
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
-          "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
             "amdefine": ">=0.0.4"
@@ -24364,6 +24400,22 @@
         }
       }
     },
+    "vue-quill-editor": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmmirror.com/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz",
+      "integrity": "sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "quill": "^1.3.4"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+        }
+      }
+    },
     "vue-resize-sensor": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/vue-resize-sensor/-/vue-resize-sensor-2.0.0.tgz",

package.json

@@ -72,7 +72,7 @@
     "imagemin-gifsicle": "^7.0.0",
     "increase-memory-limit": "^1.0.7",
     "mockjs": "1.0.1-beta3",
-    "node-sass": "^4.9.0",
+    "node-sass": "^4.14.1",
     "runjs": "^4.3.2",
     "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",

src/api/process/request.js

@@ -1,110 +0,0 @@
-import request from '@/utils/request'
-// 获取角色列表
-export function getTypetree(params) {
-    return request({
-      url: '/tofly-flow/basetype/typetree',
-      method: 'get',
-      params
-    })
-}
-
-//获取流程信息
-export function getProcessPage(params) { 
-    return request({
-      url: '/tofly-flow/processconfig/page',
-      method: 'get',
-      params
-    })
-}
-
-
-//新增流程配置
-export function addProcessConfig(data) { 
-  return request({
-    url: '/tofly-flow/basetype',
-    method: 'post',
-    data
-  })
-}
-
-// 通过ID删除流程
-export function delProcessConfigById(data) {
-  return request({
-    url: '/tofly-flow/basetype/' + data,
-    method: 'delete',
-    data
-  })
-}
-//编辑流程配置
-export function editProcessConfig(data) {
-  return request({
-    url: '/tofly-flow/basetype',
-    method: 'put',
-    data
-  })
-}
-
-//设置流程启用状态
-export function setIsValid(params) { 
-  return request({
-    url: '/tofly-flow/processconfig/isStart',
-    method: 'get',
-    params
-  })
-}
-
-//获取流程列表
-export function getProcessPageList(params) { 
-  return request({
-    url: '/tofly-flow/processconfig/page',
-    method: 'get',
-    params
-  })
-}
-
-//新增流程
-export function addProcess(data) { 
-  return request({
-    url: '/tofly-flow/processconfig/saveall',
-    method: 'post',
-    data
-  })
-}
-
-//修改流程
-export function upProcess(data) { 
-  return request({
-    url: '/tofly-flow/processconfig/updateall',
-    method: 'post',
-    data
-  })
-}
-
-// 根据流程编号查询流程信息
-export function queryProcessById(data) {
-  return request({
-    url: '/tofly-flow/processconfig/' + data,
-    method: 'get',
-    data
-  })
-}
-//根据流程ID批量删除流程
-export function delProcessByIds(params) {
-  return request({
-    url: '/tofly-flow/processconfig/deleteByIds',
-    method: 'delete',
-    params
-  })
-}
-
-//通过id删除单个流程
-export function delProcessById(data) {
-  return request({
-    url: '/tofly-flow/processconfig/' + data,
-    method: 'delete',
-    data
-  })
-}
-
-
-

src/views/currentSystem/meter/circulation/Delivery/text.html

@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
-    <style>div{
-        /* border:0; */
-        height: 0;
-        width: 0;
-        border:0;
-        border:10px solid  transparent;
-        border-top:10px solid red;
-        /* border:  red; */
-    }
-        </style>
-</head>
-<body>
-    <div></div>
-    <script>
-//         let data = [{ code: 1001, name: '苹果', sl: 11 },
-
-// { code: 1001, name: '苹果', sl: 11 },
-
-// { code: 1001, name: '花椒', sl: 11 },
-
-// { code: 1001, name: '苹果', sl: 11 },
-
-// { code: 1002, name: '芒果', sl: 11 },   
-
-// { code: 1002, name: '西瓜', sl: 15 },
-
-// { code: 1003, name: '梨', sl: 15 },
-
-// { code: 1003, name: '梨', sl: 15 }]
-//         let newArray = data.reduce((total, cur, index) => {
-// 　　let hasValue = total.findIndex(current => { return current.code === cur.code&&current.name === cur.name})
-// 　　hasValue === -1 && total.push(cur)
-// 　　hasValue !== -1 && (total[hasValue].sl = total[hasValue].sl + cur.sl)
-// 　　return total
-// }, [])
-// console.log(newArray)
-    var  m_Timeout_Handle = 
-                    console.log(setTimeout(function () {
-                    }, 5000))
-    </script>
-</body>
-</html>

src/views/currentSystem/meter/circulation/Delivery/text.sass

@@ -1,19 +0,0 @@
-$color:{
-    green:(
-        thisColor:#fff
-    ),
-    red:(
-        thisColor#ff0000
-    ),
-    info:(
-        thisColor#ff00ff
-    ),
-    success(
-        thisColor:#f66
-    )
-}
- @each $name,$colorS in $color{
-     .text-#($colorS){
-         color:map-set($colorS,thisColor)
-     }
- }

src/views/currentSystem/meter/circulation/Delivery/text.vue

@@ -1,268 +0,0 @@
-<template>
-  <div id="particular">
-    <!--水表出库 -->
-    <div class="head">
-      <el-row>
-        <el-col :span="18">
-          <el-row class="search" :gutter="20">
-            <span>部门：</span>
-            <el-select v-model="pagination.bwSbcj" size="small" clearable placeholder="请选择水表厂家" style="width:12%" @change="bwSbcjClick">
-              <el-option
-                v-for="item in sbcjAll"
-                :key="item.id"
-                :label="item.cname"
-                :value="item.ccode"
-              />
-            </el-select>
-            <span>处理状态：</span>
-            <el-select v-model="pagination.bwSbkj" size="small" clearable placeholder="请选择水表口径" style="width:12%" @change="fecthClick">
-              <el-option
-                v-for="item in sbsearch"
-                :key="item.id"
-                :label="item.cname"
-                :value="item.ccode"
-              />
-            </el-select>
-            <span>&nbsp;&nbsp;月 份：</span>
-            <el-date-picker
-              v-model="value1"
-              type="month"
-              size="small"
-              style="width:12%"
-              value-format="yyyy-MM"
-              format="yyyy年MM月"
-              placeholder="选择开始月份"
-              @change="fecthClick"
-            />
-            &nbsp;至&nbsp;
-            <el-date-picker
-              v-model="value2"
-              size="small"
-              type="month"
-              style="width:12%"
-              value-format="yyyy-MM"
-              format="yyyy年MM月"
-              placeholder="选择结束月份"
-              @change="fecthClick"
-            />
-          &nbsp;&nbsp;
-            <el-button
-              v-if="ShowNum!==1&&ShowNum!==2"
-              type="primary"
-              size="small"
-              style="float:right;margin-right:10px;margin-left:10px"
-              class="DJbutton"
-              @click="fecthClick"
-            >查询</el-button>
-          </el-row>
-        </el-col>
-        <el-col :span="6">
-          <el-row>
-            <el-col>
-              <el-button
-                v-if="ShowNum!==4"
-                type="primary"
-                size="small"
-                style="float:right;margin-right:10px"
-                class="DJbutton"
-                @click="exprotExcel"
-              >导出</el-button>
-              <!-- <el-button
-                v-if="ShowNum!==1"
-                type="primary"
-                size="small"
-                icon="el-icon-back"
-                style="float:right;margin-right:10px;margin-left:10px"
-                class="DJbutton"
-                @click="goBack"
-              >返回</el-button> -->
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-    </div>
-    <!-- 表格列表 -->
-    <table-item
-      :table-data="list"
-      :column="column"
-      :pagination="true"
-      :pagesize="pagination.size"
-      :currentpage="pagination.current"
-      :tableheight="tableheight"
-      :border="true"
-      :multiple="true"
-      :total="total"
-      :fixed="true"
-      :isdelete="false"
-      @handleCurrentChange="handleCurrentChange"
-      @handleSizeChange="handleSizeChange"
-    />
-  </div>
-</template>
-
-<script>
-import TableItem from '@/components/Table'
-// import MergeModal from './particular_merge'
-import { client } from '@/utils/index'
-export default {
-  components: { TableItem },
-  data() {
-    return {
-      client: client().height,
-      date: [],
-      value1: '',
-      value2: '',
-      // 列表数据
-      list: [],
-      // 列表项
-      column: [
-        {
-          label: '水表厂家',
-          prop: 'sbcj'
-        },
-        {
-          label: '水表类型',
-          prop: 'sblx'
-        },
-        {
-          label: '水表口径',
-          prop: 'sbkj'
-        },
-        {
-          label: '水表数量',
-          prop: 'num'
-        }
-
-      ],
-      listson: [],
-      columnson: [
-        {
-          label: '客户编号',
-          prop: 'bwKhbh'
-        },
-        {
-          label: '客户姓名',
-          prop: 'bwKhxm'
-        },
-        {
-          label: '客户地址',
-          prop: 'bwKhdz'
-        },
-        {
-          label: '联系电话',
-          prop: 'bwKhdh'
-        },
-        {
-          label: '水表厂家',
-          prop: 'sbcjName'
-        },
-        {
-          label: '水表类型',
-          prop: 'sblxName'
-        },
-        {
-          label: '入库批次',
-          prop: 'bwLsbh'
-        },
-        {
-          label: '水表口径',
-          prop: 'sbkjName'
-        },
-        {
-          label: '水表起度',
-          prop: 'bwSbqd'
-        },
-        // {
-        //   label: '水表止度',
-        //   prop: 'bwSbzd'
-        // },
-        {
-          label: '安装人员',
-          prop: 'azryName'
-        },
-        {
-          label: '安装时间',
-          prop: 'bwAzrq'
-        }
-      ],
-      // 总页数
-      total: 0,
-      // 数据列表加载等待
-      listLoading: true,
-      // 选中内容
-      multipleSelection: [],
-      // 模态框显示
-      dialogVisible: false,
-      // 模态框标题
-      dialogTitle: '',
-      // 添加数据初始化
-      editData: {},
-      // 分页参数信息 ｛当前页,每页条数｝
-      pagination: { current: 1, size: 20, sbcj: '', sbxh: '', sbkj: '', startTime: '', endTime: '' },
-      // 查看 修改按钮标杆
-      disabledBtn: true,
-      width: '1200px'
-    }
-  },
-  computed: {
-    mapHeight() {
-      return '500px'
-    },
-    tableheight() {
-      return client().height - 240
-    }
-  },
-
-  watch: {
-    multipleSelection(value) {
-      this.disabledBtn = this.multipleSelection.length !== 1
-    }
-  },
-  created() {
-    var aData = new Date()
-    this.date = [aData.getFullYear() + '-01-01', aData.getFullYear() + '-' + (aData.getMonth() + 1) + '-' + aData.getDate()]
-    this.searchBtn()
-    // this.fetchData()
-  },
-  mounted() {
-  },
-  methods: {
-    // 获取当前页
-    handleCurrentChange(currentPage) {
-      this.pagination.current = currentPage
-      this.fetchData()
-    },
-    // 每页多少条
-    handleSizeChange(pagesize) {
-      this.pagination.size = pagesize
-      this.fetchData()
-    },
-    // 查询
-    searchBtn() {
-      if (this.date) {
-        this.pagination.startTime = this.date[0] ? this.date[0] + ' 00:00:00' : ''
-        this.pagination.endTime = this.date[0] ? this.date[1] + ' 23:59:59' : ''
-      } else {
-        this.pagination.startTime = this.pagination.endTime = ''
-      }
-      this.pagination.current = 1
-      this.fetchData()
-    }
-  }
-
-}
-</script>
-<style lang="scss" scoped>
-#particular {
-  padding: 20px;
-  .head {
-    margin-bottom: 10px;
-  }
-    .search{
-      width: 100%;
-      margin-bottom: 10px;
-      display: flex;
-      align-items:center;
-    }
-}
-</style>

src/views/mbsys/publicOrder/myOrder/merge/index.vue

@@ -36,11 +36,10 @@
 </template>
 
 <script>
-import Blocks from '../../components/Blocks'
 import Root from '../components/root'
 export default {
   name: 'workMerge',
-  components: { Blocks,Root },
+  components: { Root },
   props: {
     data: {
       // 编辑的数据

src/views/mbsys/publicOrder/orderRecord/detail/index.vue

@@ -31,10 +31,9 @@
 </template>
 
 <script>
-import Blocks from '../../components/Blocks'
 export default {
   name: 'workMerge',
-  components: { Blocks },
+  components: {  },
   props: {
     data: {
       // 编辑的数据

src/views/mbsys/publicOrder/orderRegister/components/check.vue

@@ -79,6 +79,9 @@ export default {
   methods: {
     changeRegion(val){
       this.CallBack(this.form)
+    },
+    submitForm(){
+      return this.form
     }
   }
 }

src/views/mbsys/publicOrder/orderRegister/components/regist.vue

@@ -1,9 +1,9 @@
-<template id="flow-container">
-  <div class="process-container" style="height:100px;padding:10px 30px">  
+<template>
+  <blocks title="用户信息" style="padding:0 20px;">  
     <el-form ref="form" :model="form" label-width="80px">
       <el-row>
         <el-col :span="8">
-          <el-form-item label="名称">
+          <el-form-item label="采购单名称">
             <el-input v-model="form.name" size="mini" :disabled="isOpt"></el-input>
           </el-form-item>
         </el-col>
@@ -38,11 +38,13 @@
         
       </el-row>
     </el-form>
-  </div>
+  </blocks>
 </template>
 
 <script>
+import blocks from "../../components/Blocks.vue"
 export default {
+  components: { blocks },
   name: 'regist',
   props: {
     CallBack:{
@@ -72,13 +74,16 @@ export default {
   },
 
   mounted(){
-
+    this.form.name = this.param.name
   },
 
   methods: {
     changeValue(){
       this.CallBack(this.form);
     },
+    submitForm(){
+      return this.form
+    }
   }
 }
 </script>

src/views/mbsys/publicOrder/orderRegister/detail/index.vue

@@ -30,9 +30,9 @@
               <div class="handler-container">
                 <el-row class="check-info">
                       <div v-for="(node,i) in step.nodes" class="check-v" :key="i" >
-                        <div class="name" v-if="node.userName != '' && node.userName != null" style="background: #48cd4c;width:60px;margin: 0px;" >{{ node.userName }}</div>
-                        <div class="name" v-else-if="node.selectUser.length == 1" style="background: #e7e7e7;width:60px;margin:0px;" >{{ node.selectUser[0].userName }}</div>
-                        <div class="time" v-if="node.ischeck" style="height:20px;color:#48cd4c;">{{node.checkTime}}</div>
+                        <div class="name" v-if="node.userName != '' && node.userName != null" style="background: #48cd4c;width:60px;margin: 0px;height:40px;text-overflow: ellipsis;overflow: hidden;" :title="node.userName">{{ node.userName }}</div>
+                        <div class="name" v-else-if="node.selectUser.length == 1" style="background: #e7e7e7;width:60px;margin:0px;height:40px;text-overflow: ellipsis;overflow: hidden;" :title="node.selectUser[0].userName">{{ node.selectUser[0].userName }}</div>
+                        <div class="time" v-if="node.ischeck" style="height:20px;color:#48cd4c;text-overflow: ellipsis;overflow: hidden;" :title="node.checkTime">{{node.checkTime}}</div>
                       </div>
                 </el-row>
               </div>
@@ -46,11 +46,12 @@
       <el-col v-for="(step,index) in steps" :key="index" :span="24" style="padding:0;">
         <div class="node-title" :style="getColor(index)">
           <span>{{(index+1)}}.{{step.title}}</span>
-          <div :class="'icon ' + (openBtn[index] ? 'el-icon-arrow-down' : 'el-icon-arrow-up')" @click="openHandler(index)"></div>
+          <div :class="'icon ' + (openBtn[index] ? 'el-icon-arrow-up' : 'el-icon-arrow-down' )" @click="openHandler(index)"></div>
         </div>
         <div v-if="openBtn[index]" class="stepInfo">
           <template>
-            <component 
+            <component
+              :ref="openBtn[index] ? 'activeComp' : 'comp'"
               v-if="dynamicComponents[index]" 
               :is="dynamicComponents[index]" 
               :param="param"
@@ -65,13 +66,12 @@
 </template>
 
 <script>
-import Blocks from '../../components/Blocks'
 import {getProcessPageList,queryProcessById} from '@/api/process/process'
 import { addProcess } from '@/api/mbsys/publicOrder'
 import { parseTime } from '@/utils/index'
 export default {
   name: 'workMerge',
-  components: { Blocks },
+  components: {  },
   props: {
     /**
      * 业务类型
@@ -115,7 +115,8 @@ export default {
       processId:'', //流程id
       proSteps:[], //流程步骤
       steps:[], //流程步骤信息
-      param:{}, //参数集合
+      param:{name:'123'}, //参数集合
+      rtnMainParam:{},//返回主页面参数
       rtnParam:null, //每一次返回的参数
       openBtn:[],
       colors:['color:#28dd12;background:#ebf5f1;','color:#0478ef;background:#dbe6f5;','color:#b9afaf;background:#e7e7e7;']
@@ -178,25 +179,6 @@ export default {
       }
     },
 
-    /**
-     * 根据插件位置获取插件
-     * @rank Number 代码位置向上层级
-     * @pathName 路径
-     * @templateName 插件名称
-    */
-    asyncComponents(rank,pathName,templateName){
-      if(rank == 1){
-        return require("../" + `${pathName}/${templateName}`).default
-      } else if(rank == 2){
-        return require("../../" + `${pathName}/${templateName}`).default
-      } else if(rank == 3){
-        return require("../../../" + `${pathName}/${templateName}`).default
-      } else if(rank == 4){
-        return require("../../../" + `${pathName}/${templateName}`).default
-      }else{
-        return null
-      }
-    },
     /**标题设置：
      *（1）已经审核 颜色  color: #28dd12;background: #ebf5f1;
      *（2）当前操作  color: #0478ef;background: #eef1f5;
@@ -327,8 +309,9 @@ export default {
      * 提交
     */
     submitForm() {
-      console.log('点击了提交按钮');
-      this.$emit('remind', '成功')
+      let data = this.$refs.activeComp[0].submitForm()
+      this.rtnMainParam = Object.assign(this.rtnMainParam,{configId:this.processId,submitData:data})
+      this.$emit('remind', this.rtnMainParam)
     },
     
     /**

src/views/mbsys/publicOrder/orderRegister/index.vue

@@ -108,7 +108,8 @@
       />
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button v-if="isedit" type="primary" @click="submitOrder">确 定</el-button>
+        <el-button @click="dialogVisible = false">保 存</el-button>
+        <el-button v-if="isedit" type="primary" @click="submitOrder">提 交</el-button>
       </span>
     </el-dialog>
   </div>

src/views/mbsys/publicOrder/orderRegister/register.vue

@@ -0,0 +1,227 @@
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'orderRegister',
+  components: { blocks },
+  props: {
+    title:{
+        type:String,
+        required:true,
+    },
+    businessType: {
+      // 业务类型
+      type: Number,
+      default:-1,
+    }
+  },
+  data() {
+    return {
+      
+    }
+  },
+
+  computed: {
+    tableheight() {
+      return client().height - 228
+    }
+  },
+  watch: {
+    multipleSelection(value) {
+      this.disabledBtn = this.multipleSelection.length !== 1
+    }
+  },
+  created() {
+    this.form.businessType = this.businessType ? parseInt(this.businessType) : null
+    //获取业务类别
+    getTypetree({datatypes:0,id:''}).then((res)=>{
+        if (res.code === 1) {
+          if(res.result.length > 0) 
+          if (res.result[0].vos.length > 1) this.businessTypes = res.result[0].vos[0].vos
+        }
+    }).catch(ex=>{
+        this.$message.error('获取数据出错！')
+    })
+    this.getProcess();
+    this.fetchData(this.pagination)
+  },
+  methods: {
+    /**
+    * 渲染数据处理
+    */
+    formatter(row, column){
+      let typeValue=typeof row[column.property];
+      if(typeValue=="undefined"){
+        return "-"
+      }else if(typeValue=="object"||typeValue=="string"){
+        if(!row[column.property]){
+          return "-"
+        }else{
+          return row[column.property]
+        }
+      }else{
+        return row[column.property]
+      }
+    },
+    // 获取列表数据
+    fetchData() {
+      this.listLoading = true
+      let data = {
+        current: this.pagination.current,
+        size: this.pagination.size,
+      }
+      if(this.businessType != '') data = Object.assign(data,{businessType:this.businessType})
+      getProcessPage(data).then(res => {
+        this.registerList = res.result.records
+        this.total = res.result.total
+        this.listLoading = false
+      }).catch(ex=>{
+        this.$message.error('获取流程列表失败！')
+        this.listLoading = false
+      })
+    },
+
+    /**
+     * 获取流程列表
+    */
+    getProcess(){
+      let data = {
+        current: 1,
+        size: 10000,
+      }
+      if(this.businessType != '') data = Object.assign(data,{businessType:this.businessType})
+      getProcessPageList(data).then(res => {
+        this.processList = res.result.records
+      }).catch(ex=>{
+        this.$message.error('获取流程列表失败！')
+      })
+    },
+    
+
+    handleCurrentChange(currentPage) {
+      this.pagination.current = currentPage
+      this.fetchData()
+    },
+
+    handleSizeChange(pagesize) {
+      this.pagination.size = pagesize
+      this.fetchData()
+    },
+
+    handleSelectionChange(value) {
+      this.multipleSelection = value
+      console.log(value)
+    },
+
+    // 查询
+    query() {
+      this.fetchData()
+    },
+
+    // 新增
+    addOrder() {
+      this.dialogVisible = true
+      this.dialogTitle = '新增'
+       this.optionType = 1
+      this.editData = {}
+      this.isedit = true
+    },
+
+    /**
+     * 双击修改
+    */
+    cellDblclick(row) {
+      this.editOrder(row,true)
+    },
+
+    // 修改
+    editOrder(data,flag) {
+      if(data && data.hasOwnProperty('id')){
+        queryProcessById(data.id).then(res=>{
+          if(res.code == 1){
+            this.optionType = flag ? 2 : 1
+            this.dialogVisible = true
+            this.dialogTitle = flag ? '修改' : '查看'
+            this.editData = res.result
+          }
+          else{
+            this.$message.error('获取流程配置信息失败！终止操作！');
+          }
+        }).catch(ex=>{
+          this.$message.error('获取流程配置信息失败！终止操作！');
+        })
+      }
+    },
+
+    operationClick(row,flag) {
+      this.editOrder(row,flag)
+    },
+
+    /**
+     * 提交流程
+    */
+    commitClick(row){
+
+    },
+
+    // 删除
+    operationDel(row) {
+      this.$confirm('此操作将永久删除该信息, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const _this = this
+        delProcessById(row.id).then(res => {
+          if (res.code === 1) {
+            _this.$message.success('删除成功')
+            _this.fetchData(this.pagination)
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+
+    // 提交
+    submitOrder() {
+      this.$refs.merge.submitForm()
+    },
+    // 提示
+    remind(data) {
+      this.dialogVisible = false
+      //设置初始操作类型
+      this.optionType = 1;
+      this.fetchData(this.pagination)
+    }
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.orderRegister{
+  padding: 10px;
+  position: absolute;
+  height: calc(100% - 36px);
+  width: 100%;
+  .head {
+    margin: 0px;
+  }
+  .tb-container{
+    height: calc(100% - 34px);
+  }
+}
+>>>.el-dialog{
+  .el-dialog__body{
+    padding: 0!important;
+  }
+}
+</style>

src/views/mbsys/publicOrder/orderSupervise/detail/index.vue

@@ -31,10 +31,9 @@
 </template>
 
 <script>
-import Blocks from '../../components/Blocks'
 export default {
   name: 'workMerge',
-  components: { Blocks },
+  components: { },
   props: {
     data: {
       // 编辑的数据

src/views/mbsys/publicOrder/orderSupervise/index.vue

@@ -109,7 +109,7 @@
       />
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button v-if="isedit" type="primary" @click="submitOrder">确 定</el-button>
+        <el-button v-if="isedit" type="primary" @click="submitOrder">提 交</el-button>
       </span>
     </el-dialog>
   </div>