4.18

package-lock.json

@@ -1609,20 +1609,61 @@
       "dev": true
     },
     "body-parser": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
-      "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "requires": {
-        "bytes": "3.0.0",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.1",
-        "http-errors": "~1.6.2",
-        "iconv-lite": "0.4.19",
-        "on-finished": "~2.3.0",
-        "qs": "6.5.1",
-        "raw-body": "2.3.2",
-        "type-is": "~1.6.15"
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+        },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+        },
+        "http-errors": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+          "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+          "requires": {
+            "depd": "2.0.0",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.2.0",
+            "statuses": "2.0.1",
+            "toidentifier": "1.0.1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        },
+        "setprototypeof": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+        }
       }
     },
     "bonjour": {
@@ -2342,14 +2383,24 @@
       "dev": true
     },
     "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "requires": {
+        "safe-buffer": "5.2.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        }
+      }
     },
     "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
     },
     "convert-source-map": {
       "version": "1.5.1",
@@ -2358,14 +2409,14 @@
       "dev": true
     },
     "cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
     },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "copy-concurrently": {
       "version": "1.0.5",
@@ -3036,9 +3087,9 @@
       }
     },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
     "detect-file": {
       "version": "1.0.0",
@@ -3248,7 +3299,7 @@
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "eivindfjeldstad-dot": {
       "version": "0.0.1",
@@ -3418,7 +3469,7 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "end-of-stream": {
       "version": "1.4.1",
@@ -3634,7 +3685,7 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "event-emitter": {
       "version": "0.3.5",
@@ -3779,46 +3830,116 @@
       }
     },
     "express": {
-      "version": "4.16.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
-      "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "requires": {
-        "accepts": "~1.3.5",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.18.2",
-        "content-disposition": "0.5.2",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.3.1",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.1.1",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.3",
-        "qs": "6.5.1",
-        "range-parser": "~1.2.0",
-        "safe-buffer": "5.1.1",
-        "send": "0.16.2",
-        "serve-static": "1.13.2",
-        "setprototypeof": "1.1.0",
-        "statuses": "~1.4.0",
-        "type-is": "~1.6.16",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       },
       "dependencies": {
+        "accepts": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+          "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+          "requires": {
+            "mime-types": "~2.1.34",
+            "negotiator": "0.6.3"
+          }
+        },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+        },
+        "http-errors": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+          "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+          "requires": {
+            "depd": "2.0.0",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.2.0",
+            "statuses": "2.0.1",
+            "toidentifier": "1.0.1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        },
+        "mime-db": {
+          "version": "1.52.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+          "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+        },
+        "mime-types": {
+          "version": "2.1.35",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+          "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+          "requires": {
+            "mime-db": "1.52.0"
+          }
+        },
+        "negotiator": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+        },
+        "parseurl": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+          "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+        },
+        "range-parser": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+          "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+        },
         "safe-buffer": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        },
+        "setprototypeof": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
         }
       }
     },
@@ -4069,17 +4190,29 @@
       }
     },
     "finalhandler": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
-      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "statuses": "~1.4.0",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "parseurl": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+          "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+        }
       }
     },
     "find-cache-dir": {
@@ -4213,9 +4346,9 @@
       }
     },
     "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
     },
     "fragment-cache": {
       "version": "0.2.1",
@@ -4229,7 +4362,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "friendly-errors-webpack-plugin": {
       "version": "1.7.0",
@@ -6249,9 +6382,12 @@
       "dev": true
     },
     "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
     },
     "icss-replace-symbols": {
       "version": "1.1.0",
@@ -6405,9 +6541,9 @@
       "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
     },
     "ipaddr.js": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
-      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4="
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
     "is-absolute": {
       "version": "1.0.0",
@@ -7377,7 +7513,7 @@
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
     "mem": {
       "version": "1.1.0",
@@ -7503,12 +7639,12 @@
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
     },
     "micro-schema-validator": {
       "version": "0.1.2",
@@ -8188,9 +8324,9 @@
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
     },
     "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "requires": {
         "ee-first": "1.1.1"
       }
@@ -8548,7 +8684,7 @@
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "path-type": {
       "version": "3.0.0",
@@ -10809,12 +10945,12 @@
       "dev": true
     },
     "proxy-addr": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
-      "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "requires": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.8.0"
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
       }
     },
     "prr": {
@@ -10886,9 +11022,12 @@
       "integrity": "sha512-+Y4HA+cb6qUzdgvI3KML8GYpMFwB24dFwzMkS/yXq6hwtUGNUnZQdUnksrV1XGMc2mid5ROw5SAuY9XhI3ValA=="
     },
     "qs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "query-string": {
       "version": "4.3.4",
@@ -10999,36 +11138,52 @@
       "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
     },
     "raw-body": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "requires": {
-        "bytes": "3.0.0",
-        "http-errors": "1.6.2",
-        "iconv-lite": "0.4.19",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
       "dependencies": {
+        "bytes": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+        },
         "depd": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-          "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
         },
         "http-errors": {
-          "version": "1.6.2",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-          "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+          "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
           "requires": {
-            "depd": "1.1.1",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.0.3",
-            "statuses": ">= 1.3.1 < 2"
+            "depd": "2.0.0",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.2.0",
+            "statuses": "2.0.1",
+            "toidentifier": "1.0.1"
           }
         },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        },
         "setprototypeof": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
         }
       }
     },
@@ -11477,8 +11632,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
       "version": "1.32.2",
@@ -11722,29 +11876,66 @@
       "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="
     },
     "send": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
       },
       "dependencies": {
-        "mime": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+        },
+        "http-errors": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+          "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+          "requires": {
+            "depd": "2.0.0",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.2.0",
+            "statuses": "2.0.1",
+            "toidentifier": "1.0.1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+        },
+        "range-parser": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+          "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+        },
+        "setprototypeof": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
         }
       }
     },
@@ -11775,14 +11966,21 @@
       }
     },
     "serve-static": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
-      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "parseurl": "~1.3.2",
-        "send": "0.16.2"
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      },
+      "dependencies": {
+        "parseurl": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+          "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+        }
       }
     },
     "set-blocking": {
@@ -12589,6 +12787,11 @@
         "repeat-string": "^1.6.1"
       }
     },
+    "toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
+    },
     "toposort": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
@@ -12653,12 +12856,27 @@
       "dev": true
     },
     "type-is": {
-      "version": "1.6.16",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "~2.1.18"
+        "mime-types": "~2.1.24"
+      },
+      "dependencies": {
+        "mime-db": {
+          "version": "1.52.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+          "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+        },
+        "mime-types": {
+          "version": "2.1.35",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+          "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+          "requires": {
+            "mime-db": "1.52.0"
+          }
+        }
       }
     },
     "typecast": {
@@ -12848,7 +13066,7 @@
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
     },
     "unset-value": {
       "version": "1.0.0",
@@ -12997,7 +13215,7 @@
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
     "uuid": {
       "version": "3.3.2",

package.json

@@ -19,7 +19,6 @@
     "font-awesome": "^4.7.0",
     "image-conversion": "^2.1.1",
     "jquery": "^3.5.1",
-    
     "js-cookie": "^2.2.1",
     "moment": "^2.29.4",
     "qrcodejs2": "0.0.2",
@@ -52,6 +51,7 @@
     "css-loader": "^0.28.0",
     "element-theme": "^2.0.1",
     "element-theme-chalk": "^2.4.6",
+    "express": "^4.18.2",
     "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^1.1.4",
     "friendly-errors-webpack-plugin": "^1.6.1",

src/config/global.js

@@ -9,11 +9,11 @@
 // export const h5BaseUrl = 'http://192.168.1.7:8091'
 // export const baseUrl = 'http://192.168.1.111:8080'
 // export const h5BaseUrl = 'http://192.168.1.111:8091'
-// export const baseUrl = 'http://test.baoxianzhanggui.com:8080' 
-// export const h5BaseUrl = 'http://test.baoxianzhanggui.com:8091'
+export const baseUrl = 'http://test.baoxianzhanggui.com:8080' 
+export const h5BaseUrl = 'http://test.baoxianzhanggui.com:8091'
 // export const baseUrl = 'http://www.baoxianzhanggui.com/api'
-export const baseUrl = 'http://www.baoxianzhanggui.com:8080'
-export const h5BaseUrl = 'http://www.baoxianzhanggui.com:8091'
+// export const baseUrl = 'http://www.baoxianzhanggui.com:8080'
+// export const h5BaseUrl = 'http://www.baoxianzhanggui.com:8091'
 // // 系统数据备份还原服务器地址
 export const backupBaseUrl = 'http://localhost:8002'
 //保险公司名称

src/views/Esm/Esmcompany.vue

@@ -203,7 +203,7 @@ export default {
       dialogTitle: "窗口",
       dialogVisible: false, //控制对话框显示
       dataForm: {
-        id: "",
+        id: "",//id
         name: "",//保险公司名称
         parentId: "0",//上级编码
         namesimple: "", //保险公司简称
@@ -254,7 +254,6 @@ export default {
         }
         return ele;
       })
-
     },
     /**Split 开始 */
     changeTreeWidth(widthVal) {
@@ -263,7 +262,6 @@ export default {
       this.rightSplitWidth = 100 - (this.leftSplitWidth)
     },
     /**Split 结束 */
-
     //--tree begin-------
     // 获取树数据
     findLeftTreeData: function () {
@@ -329,7 +327,6 @@ export default {
       this.dialogVisible = true;
     },
     handleTableEdit({ index, row }) {
-      console.log(row)
       this.operType = "EDIT";
       this.dialogTitle = "编辑保险公司信息";
       this.dataForm.id = row.id;
@@ -392,45 +389,46 @@ export default {
         }
       }
       this.$refs.dataForm.validate((valid) => {
-        this.$api.insCompany.editCompany(this.dataForm).then((res) => {
-          if (res.code == 200) {
-            this.$message({ message: '操作成功', type: 'success' })
-            this.dialogVisible = false;
-          }
+      //   this.$api.insCompany.editCompany(this.dataForm).then((res) => {
+      //     if (res.code == 200) {
+      //       this.$message({ message: '操作成功', type: 'success'})
+      //       this.dialogVisible = false;
+      //     }
+      if (valid) {
+          this.$confirm('确认提交吗？', '提示', {}).then(() => {
+            let params = {};
+            Object.assign(params, this.dataForm);
+            if (this.operType.indexOf('ADD') >= 0) {
+              this.$api.insCompany.addCompany(params).then((res) => {
+                if (res.code == 200) {
+                  this.$message({ message: '操作成功', type: 'success' })
+                  this.dialogVisible = false;
+                  this.findPage();
+                } else {
+                  this.$message({ message: '操作失败', type: 'error' })
+                }
+              })
+            } else {
+              this.$api.insCompany.editCompany(params).then((res) => {
+                if (res.code == 200) {
+                  this.$message({ message: '操作成功', type: 'success' })
+                  this.dialogVisible = false;
+                  this.findPage();
+                } else {
+                  this.$message({ message: '操作失败', type: 'error'})
+                }
+              }).catch(() => {
+                this.$message({ message: '操作失败', type: 'error'})
+              });
+            }
+            this.findLeftTreeData();
+          }).catch(() => {
+            this.$message({ type: 'info', message: '已取消提交' });
+          });
+        }
         })
-        // if (valid) {
-        //   this.$confirm('确认提交吗？', '提示', {}).then(() => {
-        //     let params = {};
-        //     Object.assign(params, this.dataForm);
-        //     if (this.operType.indexOf('ADD') >= 0) {
-        //       this.$api.insCompany.addCompany(params).then((res) => {
-        //         if (res.code == 200) {
-        //           this.$message({ message: '操作成功', type: 'success' })
-        //           this.dialogVisible = false;
-        //           this.findPage();
-        //         } else {
-        //           this.$message({ message: '操作失败', type: 'error' })
-        //         }
-        //       })
-        //     } else {
-        //       this.$api.insCompany.editCompany(params).then((res) => {
-        //         if (res.code == 200) {
-        //           this.$message({ message: '操作成功', type: 'success' })
-        //           this.dialogVisible = false;
-        //           this.findPage();
-        //         } else {
-        //           this.$message({ message: '操作失败', type: 'error' })
-        //         }
-        //       }).catch(() => {
-        //         this.$message({ message: '操作失败', type: 'error' })
-        //       });
-        //     }
-        //     this.findLeftTreeData();
-        //   }).catch(() => {
-        //     this.$message({ type: 'info', message: '已取消提交' });
-        //   });
-        // }
-      })
+        
+      // })
 
     },
 

src/views/Letter/Letter.vue

@@ -568,9 +568,6 @@
             <el-radio :label="8">人工核保</el-radio>
           </el-radio-group>
         </div>
-        <div class="flex j-s a-c color">
-
-        </div>
       </div>
       <div style="padding:20px;">
         <el-table size="small" :data="HistoryList" height="250" border style="width: 100%" v-loading="loading"
@@ -583,10 +580,10 @@
           <el-table-column prop="sumpremium" label="总保费" align="center"></el-table-column>
           <el-table-column prop="orderstatus" label="状态" align="center">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.orderstatus == '0'" type="warning" size="small">报价中</el-tag>
+              <el-tag v-if="scope.row.orderstatus == '0'" type="success" size="small">报价中</el-tag>
               <el-tag v-if="scope.row.orderstatus == '1'" type="warning" size="small">待核保</el-tag>
-              <el-tag v-if="scope.row.orderstatus == '2'" type="warning" size="small">已核保待缴费</el-tag>
-              <el-tag v-if="scope.row.orderstatus == '3'" type="warning" size="small">已承保</el-tag>
+              <el-tag v-if="scope.row.orderstatus == '2'" type="danger" size="small">已核保待缴费</el-tag>
+              <el-tag v-if="scope.row.orderstatus == '3'" type="danger" size="small">已承保</el-tag>
               <el-tag v-if="scope.row.orderstatus == '4'" type="danger" size="small">核保退回</el-tag>
             </template>
           </el-table-column>
@@ -2365,7 +2362,7 @@ export default {
       if (e) {
         this.jqstartDate = this.transformTime1();
         this.jqendDate = this.oneYearPast(this.jqstartDate);
-      }else{
+      } else {
         this.jqstartDate = "";
         this.jqendDate = "";
       }
@@ -2374,7 +2371,7 @@ export default {
       if (e) {
         this.systartDate = this.transformTime1();
         this.syendDate = this.oneYearPast(this.jqstartDate);
-      }else{
+      } else {
         this.systartDate = "";
         this.syendDate = "";
       }
@@ -2458,123 +2455,14 @@ export default {
                 } else {
                   _this.kindList = [];
                 }
-                _this.$api.letter.getquote().then((res) => {
-                  _this.quoteno = res.data;//获取报价号
-                  if (_this.imgList1.length == 0) {
-                    _this.imgList1 = [];
-                    _this.imgList2 = [];
-                    _this.imgList3 = [];
-                    _this.imgList4 = [];
-                    //提交身份证/驾驶证  到后台
-                    _this.imgList1 = [{ url: this.carfrontimage }, { url: this.carbackimage }];
-                    _this.imgList2 = [{ url: this.ownerfrontimage }, { url: this.ownerbackimage }];
-                    if (this.tbczcarShow) {//投保人同车主
-                      _this.imgList3 = _this.imgList2;
-                    } else {
-                      _this.imgList3 = [{ url: this.policyfrontimage }, { url: this.policybackimage }];
-                    }
-                    if (this.bbczcarShow) {//被保人同车主
-                      _this.imgList4 = _this.imgList2;
-                    } else {
-                      _this.imgList4 = [{ url: this.insuredfrontimage }, { url: this.insuredbackimage }];
-                    }
-                    if (this.bbtbcarShow) {//被保人同投保人
-                      _this.imgList4 = _this.imgList3;
-                    } else {
-                      _this.imgList4 = [{ url: this.insuredfrontimage }, { url: this.insuredbackimage }];
-                    }
-                  }
-                  _this.imgList1.map((ele, index) => {
-                    if (ele.url == "") {
-                      _this.imgList1.splice(index, 1);
-                      return ele;
-                    }
-                  })
-                  _this.imgList2.map((ele, index) => {
-                    if (ele.url == "") {
-                      _this.imgList2.splice(index, 1);
-                      return ele;
-                    }
-                  })
-                  _this.imgList3.map((ele, index) => {
-                    if (ele.url == "") {
-                      _this.imgList3.splice(index, 1);
-                      return ele;
-                    }
-                  })
-                  _this.imgList4.map((ele, index) => {
-                    if (ele.url == "") {
-                      _this.imgList4.splice(index, 1);
-                      return ele;
-                    }
-                  })
-                  let param1 = {
-                    imgList: _this.imgList1,
-                    imgtype: "C01",
-                    taskid: _this.quoteno,
-                  };
-                  let param2 = {
-                    imgList: _this.imgList2,
-                    imgtype: "C02",
-                    taskid: _this.quoteno,
-                  };
-                  let param3 = {
-                    imgList: _this.imgList3,
-                    imgtype: "C03",
-                    taskid: _this.quoteno,
-                  };
-                  let param4 = {
-                    imgList: _this.imgList4,
-                    imgtype: "C04",
-                    taskid: _this.quoteno,
-                  };
-                  _this.$api.letter.uploadImage(param1).then((res) => {
-                    _this.imageEcho('C01', 'imgList1')
-                  })
-                  _this.$api.letter.uploadImage(param2).then((res) => {
-                    _this.imageEcho('C02', 'imgList2')
-                  })
-                  _this.$api.letter.uploadImage(param3).then((res) => {
-                    _this.imageEcho('C03', 'imgList3')
-                  })
-                  _this.$api.letter.uploadImage(param4).then((res) => {
-                    _this.imageEcho('C04', 'imgList4')
-                  })
-                  if (_this.carInfo.registerDate.length < 10) {
-                    _this.carInfo.registerDate = this.timeformat(_this.carInfo.registerDate)
-                  }
-                  if (_this.carInfo.issueDate.length < 10) {
-                    _this.carInfo.issueDate = this.timeformat(_this.carInfo.issueDate)
-                  }
-                  if (_this.carInfo.transferDate.length < 10 && _this.carInfo.transferDate != "") {
-                    _this.carInfo.transferDate = this.timeformat(_this.carInfo.transferDate)
-                  }
-                  //提交身份证/驾驶证  ——————————————————
-                  let param = {
-                    userId: _this.userId,
-                    quoteno: _this.quoteno,
-                    orderNo: _this.paramsEdit ? _this.orderno : "",
-                    carInfo: _this.carInfo,
-                    insuredPersonInfo: _this.insuredPersonInfo,
-                    ownerInfo: _this.ownerInfo,
-                    policyHolderInfo: _this.policyHolderInfo,
-                    kindList: _this.kindList,
-                    riskList: _this.riskList,
-                  }
-                  _this.$api.letter.generateOrder(param).then((res) => {
-                    _this.orderno = res.data.orderno;
-                    _this.totalCompanyList.map((ele, index) => {
-                      if (ele.checked) {
-                        //动态调用报价接口
-                        ele.quoteCode = 1;
-                        this.ToolClickFun(ele.cnName, index, ele.id)
-                      }
-                    })
-                  })
-                  document.getElementById('company').scrollIntoView();
-                  this.imageUploadShow = true;
-                });
-
+                if (_this.orderno) {
+                  this.OrderStageProcessing();
+                } else {
+                  _this.$api.letter.getquote().then((res) => {
+                    _this.quoteno = res.data;//获取报价号
+                    this.OrderStageProcessing();
+                  });
+                }
               }
             } else {
               document.getElementById('CheZhu').scrollIntoView();
@@ -2616,6 +2504,127 @@ export default {
         duration: 0
       });
     },
+    //订单生成前数据处理事件
+    OrderStageProcessing() {
+      if (this.imgList1.length == 0) {
+        this.imgList1 = [];
+        this.imgList2 = [];
+        this.imgList3 = [];
+        this.imgList4 = [];
+        //提交身份证/驾驶证  到后台
+        this.imgList1 = [{ url: this.carfrontimage }, { url: this.carbackimage }];
+        this.imgList2 = [{ url: this.ownerfrontimage }, { url: this.ownerbackimage }];
+        if (this.tbczcarShow) {//投保人同车主
+          this.imgList3 = this.imgList2;
+        } else {
+          this.imgList3 = [{ url: this.policyfrontimage }, { url: this.policybackimage }];
+        }
+        if (this.bbczcarShow) {//被保人同车主
+          this.imgList4 = this.imgList2;
+        } else {
+          this.imgList4 = [{ url: this.insuredfrontimage }, { url: this.insuredbackimage }];
+        }
+        if (this.bbtbcarShow) {//被保人同投保人
+          this.imgList4 = this.imgList3;
+        } else {
+          this.imgList4 = [{ url: this.insuredfrontimage }, { url: this.insuredbackimage }];
+        }
+      }
+      this.imgList1.map((ele, index) => {
+        if (ele.url == "") {
+          this.imgList1.splice(index, 1);
+          return ele;
+        }
+      })
+      this.imgList2.map((ele, index) => {
+        if (ele.url == "") {
+          this.imgList2.splice(index, 1);
+          return ele;
+        }
+      })
+      this.imgList3.map((ele, index) => {
+        if (ele.url == "") {
+          this.imgList3.splice(index, 1);
+          return ele;
+        }
+      })
+      this.imgList4.map((ele, index) => {
+        if (ele.url == "") {
+          this.imgList4.splice(index, 1);
+          return ele;
+        }
+      })
+      let param1 = {
+        imgList: this.imgList1,
+        imgtype: "C01",
+        taskid: this.quoteno,
+      };
+      let param2 = {
+        imgList: this.imgList2,
+        imgtype: "C02",
+        taskid: this.quoteno,
+      };
+      let param3 = {
+        imgList: this.imgList3,
+        imgtype: "C03",
+        taskid: this.quoteno,
+      };
+      let param4 = {
+        imgList: this.imgList4,
+        imgtype: "C04",
+        taskid: this.quoteno,
+      };
+      this.$api.letter.uploadImage(param1).then((res) => {
+        this.imageEcho('C01', 'imgList1')
+      })
+      this.$api.letter.uploadImage(param2).then((res) => {
+        this.imageEcho('C02', 'imgList2')
+      })
+      this.$api.letter.uploadImage(param3).then((res) => {
+        this.imageEcho('C03', 'imgList3')
+      })
+      this.$api.letter.uploadImage(param4).then((res) => {
+        this.imageEcho('C04', 'imgList4')
+      })
+      if (this.carInfo.registerDate.length < 10) {
+        this.carInfo.registerDate = this.timeformat(this.carInfo.registerDate)
+      }
+      if (this.carInfo.issueDate.length < 10) {
+        this.carInfo.issueDate = this.timeformat(this.carInfo.issueDate)
+      }
+      if (this.carInfo.transferDate.length < 10 && this.carInfo.transferDate != "") {
+        this.carInfo.transferDate = this.timeformat(this.carInfo.transferDate)
+      }
+      //提交身份证/驾驶证  ——————————————————
+      let param = {
+        userId: this.userId,
+        quoteno: this.quoteno,
+        orderNo: this.paramsEdit ? this.orderno : "",
+        carInfo: this.carInfo,
+        insuredPersonInfo: this.insuredPersonInfo,
+        ownerInfo: this.ownerInfo,
+        policyHolderInfo: this.policyHolderInfo,
+        kindList: this.kindList,
+        riskList: this.riskList,
+      }
+      this.$api.letter.generateOrder(param).then((res) => {
+        if (res.code == '200') {
+          this.orderno = res.data.orderno;
+          this.totalCompanyList.map((ele, index) => {
+            if (ele.checked) {
+              //动态调用报价接口
+              ele.quoteCode = 1;
+              this.ToolClickFun(ele.cnName, index, ele.id)
+            }
+          })
+        } else {
+          this.$message({ message: res.msg, type: "warning" });
+        }
+
+      })
+      document.getElementById('company').scrollIntoView();
+      this.imageUploadShow = true;
+    },
     //永安报价
     yongan(num, id) {
       let params = {
@@ -4214,8 +4223,8 @@ export default {
     },
     //同步
     synchronization() {
-      this.systartDate=this.jqstartDate;
-      this.syendDate=this.jqendDate;
+      this.systartDate = this.jqstartDate;
+      this.syendDate = this.jqendDate;
     },
     add() {
       this.carInfo = JSON.parse(JSON.stringify(this.defaultcarInfo))
@@ -5007,6 +5016,7 @@ export default {
 
   .el-checkbox__inner {
     border: 1px solid #ff7000;
+
     &:hover {
       border-color: #ee7000;
     }

src/views/Letter/Orderlist.vue

@@ -47,7 +47,7 @@
                 </el-col>
             </el-row>
         </el-form>
-        <el-table size="small" :data="pageResult" height="690" border style="width: 100%" v-loading="loading"
+        <el-table size="small" :data="pageResult" height="590" border style="width: 100%" v-loading="loading"
             highlight-current-row stripe
             :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#606266' }">
             <el-table-column type="expand">
@@ -93,7 +93,6 @@
             <el-table-column prop="createtime" label="录单日期" align="center" width="200"></el-table-column>
             <el-table-column label="操作" align="center" min-width="100" fixed="right">
                 <template slot-scope="scope">
-
                     <el-button size="mini" type="text" @click="CloseEdit(scope.$index, scope.row)">编辑</el-button>
                     <!-- <el-button size="mini" type="text" v-if="['0', '5'].includes(scope.row.orderstatus)"
                         @click="CloseQoute(scope.$index, scope.row)" style="color:#f56c6c">关闭报价</el-button> -->
@@ -105,7 +104,7 @@
         <!-- 分页功能 -->
         <div class="block">
             <el-pagination @size-change="applyhandleSizeChange" @current-change="applyhandleCurrentChange"
-                :current-page="pageNum" :page-size="pageSize" :page-sizes="[10, 20, 50, 100]"
+                :current-page="pageNum" :page-size="pageSize" :page-sizes="[15, 30, 50, 100]"
                 layout="total, sizes, prev, pager, next, jumper" :total="totalSize"></el-pagination>
         </div>
         <el-dialog :visible.sync="codedialogVisible" width="400px" top="10vh" :before-close="handleClose"
@@ -1004,7 +1003,7 @@ export default {
             codedialogVisible: false,
             loading: false,
             pageNum: 1,//页数
-            pageSize: 20,//条数
+            pageSize: 15,//条数
             totalSize: null,//总数
             peopleid: "",//工号
             pageResult: [],//列表