diff --git a/package-lock.json b/package-lock.json
index 793f345..8484fee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,6 +16,7 @@
         "echarts": "^4.9.0",
         "element-resize-detector": "^1.2.1",
         "element-ui": "^2.15.13",
+        "exceljs": "^4.3.0",
         "iview": "^3.5.4",
         "jquery": "^3.6.0",
         "lib-flexible": "^0.3.2",
@@ -316,6 +317,43 @@
         "node": ">=4"
       }
     },
+    "node_modules/@fast-csv/format": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@fast-csv/format/-/format-4.3.5.tgz",
+      "integrity": "sha512-8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A==",
+      "dependencies": {
+        "@types/node": "^14.0.1",
+        "lodash.escaperegexp": "^4.1.2",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isequal": "^4.5.0",
+        "lodash.isfunction": "^3.0.9",
+        "lodash.isnil": "^4.0.0"
+      }
+    },
+    "node_modules/@fast-csv/format/node_modules/@types/node": {
+      "version": "14.18.51",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.51.tgz",
+      "integrity": "sha512-P9bsdGFPpVtofEKlhWMVS2qqx1A/rt9QBfihWlklfHHpUpjtYse5AzFz6j4DWrARLYh6gRnw9+5+DJcrq3KvBA=="
+    },
+    "node_modules/@fast-csv/parse": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/@fast-csv/parse/-/parse-4.3.6.tgz",
+      "integrity": "sha512-uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA==",
+      "dependencies": {
+        "@types/node": "^14.0.1",
+        "lodash.escaperegexp": "^4.1.2",
+        "lodash.groupby": "^4.6.0",
+        "lodash.isfunction": "^3.0.9",
+        "lodash.isnil": "^4.0.0",
+        "lodash.isundefined": "^3.0.1",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "node_modules/@fast-csv/parse/node_modules/@types/node": {
+      "version": "14.18.51",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.51.tgz",
+      "integrity": "sha512-P9bsdGFPpVtofEKlhWMVS2qqx1A/rt9QBfihWlklfHHpUpjtYse5AzFz6j4DWrARLYh6gRnw9+5+DJcrq3KvBA=="
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1237,7 +1275,6 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmmirror.com/archiver/-/archiver-5.3.1.tgz",
       "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
-      "dev": true,
       "dependencies": {
         "archiver-utils": "^2.1.0",
         "async": "^3.2.3",
@@ -1255,7 +1292,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmmirror.com/archiver-utils/-/archiver-utils-2.1.0.tgz",
       "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
-      "dev": true,
       "dependencies": {
         "glob": "^7.1.4",
         "graceful-fs": "^4.2.0",
@@ -1276,7 +1312,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1284,14 +1319,12 @@
     "node_modules/archiver/node_modules/async": {
       "version": "3.2.3",
       "resolved": "https://registry.npmmirror.com/async/-/async-3.2.3.tgz",
-      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
-      "dev": true
+      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
     },
     "node_modules/archiver/node_modules/readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -2705,8 +2738,7 @@
     "node_modules/base64-js": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
-      "dev": true
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
     },
     "node_modules/batch": {
       "version": "0.6.1",
@@ -2741,6 +2773,14 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/big-integer": {
+      "version": "1.6.51",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
     "node_modules/big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -2749,6 +2789,18 @@
         "node": "*"
       }
     },
+    "node_modules/binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",
+      "dependencies": {
+        "buffers": "~0.1.1",
+        "chainsaw": "~0.1.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -2772,7 +2824,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -2783,7 +2834,6 @@
       "version": "5.7.1",
       "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -2793,7 +2843,6 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -3131,7 +3180,6 @@
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true,
       "engines": {
         "node": "*"
       }
@@ -3147,12 +3195,28 @@
       "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
       "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
     },
+    "node_modules/buffer-indexof-polyfill": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+      "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
       "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
       "dev": true
     },
+    "node_modules/buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
+      "engines": {
+        "node": ">=0.2.0"
+      }
+    },
     "node_modules/builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -3382,6 +3446,17 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",
+      "dependencies": {
+        "traverse": ">=0.3.0 <0.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -3971,7 +4046,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmmirror.com/compress-commons/-/compress-commons-4.1.1.tgz",
       "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==",
-      "dev": true,
       "dependencies": {
         "buffer-crc32": "^0.2.13",
         "crc32-stream": "^4.0.2",
@@ -3986,7 +4060,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3995,7 +4068,6 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -4333,7 +4405,6 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
       "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
-      "dev": true,
       "bin": {
         "crc32": "bin/crc32.njs"
       },
@@ -4345,7 +4416,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmmirror.com/crc32-stream/-/crc32-stream-4.0.2.tgz",
       "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==",
-      "dev": true,
       "dependencies": {
         "crc-32": "^1.2.0",
         "readable-stream": "^3.4.0"
@@ -4358,7 +4428,6 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -4995,6 +5064,11 @@
         "webidl-conversions": "^4.0.2"
       }
     },
+    "node_modules/dayjs": {
+      "version": "1.11.8",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.8.tgz",
+      "integrity": "sha512-LcgxzFoWMEPO7ggRv1Y2N31hUf2R0Vj7fuy/m+Bg1K8rr+KAs1AEy4y9jd5DXe8pbHgX+srkHNS7TH6Q6ZhYeQ=="
+    },
     "node_modules/de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -5440,6 +5514,14 @@
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
       "dev": true
     },
+    "node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
     "node_modules/duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -5575,7 +5657,6 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
       "dependencies": {
         "once": "^1.4.0"
       }
@@ -6386,6 +6467,71 @@
         "safe-buffer": "^5.1.1"
       }
     },
+    "node_modules/exceljs": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/exceljs/-/exceljs-4.3.0.tgz",
+      "integrity": "sha512-hTAeo5b5TPvf8Z02I2sKIT4kSfCnOO2bCxYX8ABqODCdAjppI3gI9VYiGCQQYVcBaBSKlFDMKlAQRqC+kV9O8w==",
+      "dependencies": {
+        "archiver": "^5.0.0",
+        "dayjs": "^1.8.34",
+        "fast-csv": "^4.3.1",
+        "jszip": "^3.5.0",
+        "readable-stream": "^3.6.0",
+        "saxes": "^5.0.1",
+        "tmp": "^0.2.0",
+        "unzipper": "^0.10.11",
+        "uuid": "^8.3.0"
+      },
+      "engines": {
+        "node": ">=8.3.0"
+      }
+    },
+    "node_modules/exceljs/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/exceljs/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/exceljs/node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "dependencies": {
+        "rimraf": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.17.0"
+      }
+    },
+    "node_modules/exceljs/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/exec-sh": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
@@ -6612,6 +6758,18 @@
         "node >=0.6.0"
       ]
     },
+    "node_modules/fast-csv": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/fast-csv/-/fast-csv-4.3.6.tgz",
+      "integrity": "sha512-2RNSpuwwsJGP0frGsOmTb9oUF+VkFSM4SyLTDgwf2ciHWTarN0lQTC+F2f/t5J9QjW+c65VFIAAu85GsvMIusw==",
+      "dependencies": {
+        "@fast-csv/format": "4.3.5",
+        "@fast-csv/parse": "4.3.6"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -7371,8 +7529,7 @@
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
     },
     "node_modules/fs-extra": {
       "version": "10.1.0",
@@ -7422,6 +7579,20 @@
         "node": ">= 4.0"
       }
     },
+    "node_modules/fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
     "node_modules/ftp": {
       "version": "0.3.10",
       "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
@@ -8175,8 +8346,7 @@
     "node_modules/ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
     },
     "node_modules/iferr": {
       "version": "0.1.5",
@@ -8190,6 +8360,11 @@
       "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
       "dev": true
     },
+    "node_modules/immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
+    },
     "node_modules/import-cwd": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -9674,6 +9849,17 @@
       "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
       "dev": true
     },
+    "node_modules/jszip": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+      "dependencies": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "^1.0.5"
+      }
+    },
     "node_modules/killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -9722,7 +9908,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/lazystream/-/lazystream-1.0.1.tgz",
       "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
-      "dev": true,
       "dependencies": {
         "readable-stream": "^2.0.5"
       },
@@ -9774,6 +9959,14 @@
       "resolved": "https://registry.npmjs.org/lib-flexible/-/lib-flexible-0.3.2.tgz",
       "integrity": "sha512-9yowMWA70tKhKdCJDaltY0mNQG4OWo7pWKScnTp9aiSxS7s20ZYlwBRE3335nweOf5qKXVC7sDxJwMPM8/MFZg=="
     },
+    "node_modules/lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "dependencies": {
+        "immediate": "~3.0.5"
+      }
+    },
     "node_modules/linkify-it": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
@@ -9782,6 +9975,11 @@
         "uc.micro": "^1.0.1"
       }
     },
+    "node_modules/listenercount": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+      "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ=="
+    },
     "node_modules/load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -10017,8 +10215,7 @@
     "node_modules/lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmmirror.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
-      "dev": true
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="
     },
     "node_modules/lodash.defaultsdeep": {
       "version": "4.3.2",
@@ -10043,14 +10240,22 @@
     "node_modules/lodash.difference": {
       "version": "4.5.0",
       "resolved": "https://registry.npmmirror.com/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
-      "dev": true
+      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA=="
+    },
+    "node_modules/lodash.escaperegexp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
+      "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="
     },
     "node_modules/lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmmirror.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
-      "dev": true
+      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="
+    },
+    "node_modules/lodash.groupby": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz",
+      "integrity": "sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw=="
     },
     "node_modules/lodash.isarguments": {
       "version": "3.1.0",
@@ -10064,11 +10269,35 @@
       "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
       "dev": true
     },
+    "node_modules/lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
+    },
+    "node_modules/lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+    },
+    "node_modules/lodash.isfunction": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz",
+      "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw=="
+    },
+    "node_modules/lodash.isnil": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.isnil/-/lodash.isnil-4.0.0.tgz",
+      "integrity": "sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng=="
+    },
     "node_modules/lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-      "dev": true
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    },
+    "node_modules/lodash.isundefined": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz",
+      "integrity": "sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA=="
     },
     "node_modules/lodash.keys": {
       "version": "3.1.2",
@@ -10119,14 +10348,12 @@
     "node_modules/lodash.union": {
       "version": "4.6.0",
       "resolved": "https://registry.npmmirror.com/lodash.union/-/lodash.union-4.6.0.tgz",
-      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==",
-      "dev": true
+      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="
     },
     "node_modules/lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
     },
     "node_modules/log-symbols": {
       "version": "2.2.0",
@@ -12169,8 +12396,7 @@
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
     },
     "node_modules/parallel-transform": {
       "version": "1.2.0",
@@ -15893,7 +16119,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/readdir-glob/-/readdir-glob-1.1.1.tgz",
       "integrity": "sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==",
-      "dev": true,
       "dependencies": {
         "minimatch": "^3.0.4"
       }
@@ -16963,6 +17188,17 @@
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
       "dev": true
     },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/schema-utils": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
@@ -17262,8 +17498,7 @@
     "node_modules/setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-      "dev": true
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
     },
     "node_modules/setprototypeof": {
       "version": "1.1.1",
@@ -18249,7 +18484,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmmirror.com/tar-stream/-/tar-stream-2.2.0.tgz",
       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
       "dependencies": {
         "bl": "^4.0.3",
         "end-of-stream": "^1.4.1",
@@ -18265,7 +18499,6 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -18522,6 +18755,14 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -18930,6 +19171,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/unzipper": {
+      "version": "0.10.14",
+      "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.14.tgz",
+      "integrity": "sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==",
+      "dependencies": {
+        "big-integer": "^1.6.17",
+        "binary": "~0.3.0",
+        "bluebird": "~3.4.1",
+        "buffer-indexof-polyfill": "~1.0.0",
+        "duplexer2": "~0.1.4",
+        "fstream": "^1.0.12",
+        "graceful-fs": "^4.2.2",
+        "listenercount": "~1.0.1",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "~1.0.4"
+      }
+    },
+    "node_modules/unzipper/node_modules/bluebird": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+      "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA=="
+    },
     "node_modules/upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
@@ -21599,6 +21862,11 @@
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
+    },
     "node_modules/xregexp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
@@ -21683,7 +21951,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmmirror.com/zip-stream/-/zip-stream-4.1.0.tgz",
       "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==",
-      "dev": true,
       "dependencies": {
         "archiver-utils": "^2.1.0",
         "compress-commons": "^4.1.0",
@@ -21697,7 +21964,6 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -21896,6 +22162,47 @@
         }
       }
     },
+    "@fast-csv/format": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@fast-csv/format/-/format-4.3.5.tgz",
+      "integrity": "sha512-8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A==",
+      "requires": {
+        "@types/node": "^14.0.1",
+        "lodash.escaperegexp": "^4.1.2",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isequal": "^4.5.0",
+        "lodash.isfunction": "^3.0.9",
+        "lodash.isnil": "^4.0.0"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "14.18.51",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.51.tgz",
+          "integrity": "sha512-P9bsdGFPpVtofEKlhWMVS2qqx1A/rt9QBfihWlklfHHpUpjtYse5AzFz6j4DWrARLYh6gRnw9+5+DJcrq3KvBA=="
+        }
+      }
+    },
+    "@fast-csv/parse": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/@fast-csv/parse/-/parse-4.3.6.tgz",
+      "integrity": "sha512-uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA==",
+      "requires": {
+        "@types/node": "^14.0.1",
+        "lodash.escaperegexp": "^4.1.2",
+        "lodash.groupby": "^4.6.0",
+        "lodash.isfunction": "^3.0.9",
+        "lodash.isnil": "^4.0.0",
+        "lodash.isundefined": "^3.0.1",
+        "lodash.uniq": "^4.5.0"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "14.18.51",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.51.tgz",
+          "integrity": "sha512-P9bsdGFPpVtofEKlhWMVS2qqx1A/rt9QBfihWlklfHHpUpjtYse5AzFz6j4DWrARLYh6gRnw9+5+DJcrq3KvBA=="
+        }
+      }
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -22700,7 +23007,6 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmmirror.com/archiver/-/archiver-5.3.1.tgz",
       "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
-      "dev": true,
       "requires": {
         "archiver-utils": "^2.1.0",
         "async": "^3.2.3",
@@ -22714,14 +23020,12 @@
         "async": {
           "version": "3.2.3",
           "resolved": "https://registry.npmmirror.com/async/-/async-3.2.3.tgz",
-          "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
-          "dev": true
+          "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
         },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
           "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -22734,7 +23038,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmmirror.com/archiver-utils/-/archiver-utils-2.1.0.tgz",
       "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
-      "dev": true,
       "requires": {
         "glob": "^7.1.4",
         "graceful-fs": "^4.2.0",
@@ -22751,8 +23054,7 @@
         "normalize-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
         }
       }
     },
@@ -24060,8 +24362,7 @@
     "base64-js": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
-      "dev": true
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
     },
     "batch": {
       "version": "0.6.1",
@@ -24093,11 +24394,25 @@
         "tryer": "^1.0.0"
       }
     },
+    "big-integer": {
+      "version": "1.6.51",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="
+    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
+    "binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",
+      "requires": {
+        "buffers": "~0.1.1",
+        "chainsaw": "~0.1.0"
+      }
+    },
     "binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -24118,7 +24433,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
       "requires": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -24129,7 +24443,6 @@
           "version": "5.7.1",
           "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz",
           "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-          "dev": true,
           "requires": {
             "base64-js": "^1.3.1",
             "ieee754": "^1.1.13"
@@ -24139,7 +24452,6 @@
           "version": "3.6.0",
           "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
           "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -24459,8 +24771,7 @@
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
     },
     "buffer-from": {
       "version": "1.1.1",
@@ -24473,12 +24784,22 @@
       "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
       "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
     },
+    "buffer-indexof-polyfill": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+      "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A=="
+    },
     "buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
       "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
       "dev": true
     },
+    "buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ=="
+    },
     "builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -24677,6 +24998,14 @@
         "deep-eql": "0.1.3"
       }
     },
+    "chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",
+      "requires": {
+        "traverse": ">=0.3.0 <0.4"
+      }
+    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -25157,7 +25486,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmmirror.com/compress-commons/-/compress-commons-4.1.1.tgz",
       "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==",
-      "dev": true,
       "requires": {
         "buffer-crc32": "^0.2.13",
         "crc32-stream": "^4.0.2",
@@ -25168,14 +25496,12 @@
         "normalize-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
         },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
           "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -25451,14 +25777,12 @@
     "crc-32": {
       "version": "1.2.2",
       "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
-      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
-      "dev": true
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
     },
     "crc32-stream": {
       "version": "4.0.2",
       "resolved": "https://registry.npmmirror.com/crc32-stream/-/crc32-stream-4.0.2.tgz",
       "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==",
-      "dev": true,
       "requires": {
         "crc-32": "^1.2.0",
         "readable-stream": "^3.4.0"
@@ -25468,7 +25792,6 @@
           "version": "3.6.0",
           "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
           "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -26016,6 +26339,11 @@
         }
       }
     },
+    "dayjs": {
+      "version": "1.11.8",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.8.tgz",
+      "integrity": "sha512-LcgxzFoWMEPO7ggRv1Y2N31hUf2R0Vj7fuy/m+Bg1K8rr+KAs1AEy4y9jd5DXe8pbHgX+srkHNS7TH6Q6ZhYeQ=="
+    },
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -26389,6 +26717,14 @@
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
       "dev": true
     },
+    "duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "requires": {
+        "readable-stream": "^2.0.2"
+      }
+    },
     "duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -26519,7 +26855,6 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
@@ -27183,6 +27518,55 @@
         "safe-buffer": "^5.1.1"
       }
     },
+    "exceljs": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/exceljs/-/exceljs-4.3.0.tgz",
+      "integrity": "sha512-hTAeo5b5TPvf8Z02I2sKIT4kSfCnOO2bCxYX8ABqODCdAjppI3gI9VYiGCQQYVcBaBSKlFDMKlAQRqC+kV9O8w==",
+      "requires": {
+        "archiver": "^5.0.0",
+        "dayjs": "^1.8.34",
+        "fast-csv": "^4.3.1",
+        "jszip": "^3.5.0",
+        "readable-stream": "^3.6.0",
+        "saxes": "^5.0.1",
+        "tmp": "^0.2.0",
+        "unzipper": "^0.10.11",
+        "uuid": "^8.3.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "tmp": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+          "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+          "requires": {
+            "rimraf": "^3.0.0"
+          }
+        },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+        }
+      }
+    },
     "exec-sh": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
@@ -27376,6 +27760,15 @@
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
       "dev": true
     },
+    "fast-csv": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/fast-csv/-/fast-csv-4.3.6.tgz",
+      "integrity": "sha512-2RNSpuwwsJGP0frGsOmTb9oUF+VkFSM4SyLTDgwf2ciHWTarN0lQTC+F2f/t5J9QjW+c65VFIAAu85GsvMIusw==",
+      "requires": {
+        "@fast-csv/format": "4.3.5",
+        "@fast-csv/parse": "4.3.6"
+      }
+    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -27991,8 +28384,7 @@
     "fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
     },
     "fs-extra": {
       "version": "10.1.0",
@@ -28032,6 +28424,17 @@
         "nan": "^2.12.1"
       }
     },
+    "fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      }
+    },
     "ftp": {
       "version": "0.3.10",
       "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
@@ -28678,8 +29081,7 @@
     "ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
     },
     "iferr": {
       "version": "0.1.5",
@@ -28693,6 +29095,11 @@
       "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
       "dev": true
     },
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
+    },
     "import-cwd": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -29962,6 +30369,17 @@
         }
       }
     },
+    "jszip": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+      "requires": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "^1.0.5"
+      }
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -30001,7 +30419,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/lazystream/-/lazystream-1.0.1.tgz",
       "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
-      "dev": true,
       "requires": {
         "readable-stream": "^2.0.5"
       }
@@ -30041,6 +30458,14 @@
       "resolved": "https://registry.npmjs.org/lib-flexible/-/lib-flexible-0.3.2.tgz",
       "integrity": "sha512-9yowMWA70tKhKdCJDaltY0mNQG4OWo7pWKScnTp9aiSxS7s20ZYlwBRE3335nweOf5qKXVC7sDxJwMPM8/MFZg=="
     },
+    "lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "requires": {
+        "immediate": "~3.0.5"
+      }
+    },
     "linkify-it": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
@@ -30049,6 +30474,11 @@
         "uc.micro": "^1.0.1"
       }
     },
+    "listenercount": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+      "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ=="
+    },
     "load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -30261,8 +30691,7 @@
     "lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmmirror.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
-      "dev": true
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="
     },
     "lodash.defaultsdeep": {
       "version": "4.3.2",
@@ -30289,14 +30718,22 @@
     "lodash.difference": {
       "version": "4.5.0",
       "resolved": "https://registry.npmmirror.com/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
-      "dev": true
+      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA=="
+    },
+    "lodash.escaperegexp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
+      "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="
     },
     "lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmmirror.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
-      "dev": true
+      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="
+    },
+    "lodash.groupby": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz",
+      "integrity": "sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw=="
     },
     "lodash.isarguments": {
       "version": "3.1.0",
@@ -30310,11 +30747,35 @@
       "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
       "dev": true
     },
+    "lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
+    },
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+    },
+    "lodash.isfunction": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz",
+      "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw=="
+    },
+    "lodash.isnil": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.isnil/-/lodash.isnil-4.0.0.tgz",
+      "integrity": "sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng=="
+    },
     "lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-      "dev": true
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    },
+    "lodash.isundefined": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz",
+      "integrity": "sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA=="
     },
     "lodash.keys": {
       "version": "3.1.2",
@@ -30365,14 +30826,12 @@
     "lodash.union": {
       "version": "4.6.0",
       "resolved": "https://registry.npmmirror.com/lodash.union/-/lodash.union-4.6.0.tgz",
-      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==",
-      "dev": true
+      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="
     },
     "lodash.uniq": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
     },
     "log-symbols": {
       "version": "2.2.0",
@@ -32103,8 +32562,7 @@
     "pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
     },
     "parallel-transform": {
       "version": "1.2.0",
@@ -35173,7 +35631,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/readdir-glob/-/readdir-glob-1.1.1.tgz",
       "integrity": "sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==",
-      "dev": true,
       "requires": {
         "minimatch": "^3.0.4"
       }
@@ -36066,6 +36523,14 @@
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
       "dev": true
     },
+    "saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "requires": {
+        "xmlchars": "^2.2.0"
+      }
+    },
     "schema-utils": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
@@ -36329,8 +36794,7 @@
     "setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-      "dev": true
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
     },
     "setprototypeof": {
       "version": "1.1.1",
@@ -37164,7 +37628,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmmirror.com/tar-stream/-/tar-stream-2.2.0.tgz",
       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
       "requires": {
         "bl": "^4.0.3",
         "end-of-stream": "^1.4.1",
@@ -37177,7 +37640,6 @@
           "version": "3.6.0",
           "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
           "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
@@ -37398,6 +37860,11 @@
         "punycode": "^2.1.0"
       }
     },
+    "traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ=="
+    },
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -37734,6 +38201,30 @@
         }
       }
     },
+    "unzipper": {
+      "version": "0.10.14",
+      "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.14.tgz",
+      "integrity": "sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==",
+      "requires": {
+        "big-integer": "^1.6.17",
+        "binary": "~0.3.0",
+        "bluebird": "~3.4.1",
+        "buffer-indexof-polyfill": "~1.0.0",
+        "duplexer2": "~0.1.4",
+        "fstream": "^1.0.12",
+        "graceful-fs": "^4.2.2",
+        "listenercount": "~1.0.1",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "~1.0.4"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.4.7",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+          "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA=="
+        }
+      }
+    },
     "upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
@@ -40007,6 +40498,11 @@
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
+    "xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
+    },
     "xregexp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
@@ -40090,7 +40586,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmmirror.com/zip-stream/-/zip-stream-4.1.0.tgz",
       "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==",
-      "dev": true,
       "requires": {
         "archiver-utils": "^2.1.0",
         "compress-commons": "^4.1.0",
@@ -40101,7 +40596,6 @@
           "version": "3.6.0",
           "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.0.tgz",
           "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
           "requires": {
             "inherits": "^2.0.3",
             "string_decoder": "^1.1.1",
diff --git a/package.json b/package.json
index 7863e70..562fdf8 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "echarts": "^4.9.0",
     "element-resize-detector": "^1.2.1",
     "element-ui": "^2.15.13",
+    "exceljs": "^4.3.0",
     "iview": "^3.5.4",
     "jquery": "^3.6.0",
     "lib-flexible": "^0.3.2",
diff --git a/src/api/eashier.js b/src/api/eashier.js
index 8e13c9e..d01fe3d 100644
--- a/src/api/eashier.js
+++ b/src/api/eashier.js
@@ -38,6 +38,42 @@ export function exportRefCourse(data){
   })
 }
 
+// 会员协议分页查询
+export function memberSelectPage(params) {
+  return service({
+    url: "/api" + "/demay/ssm/member/selectPage",
+    method: "post",
+    data: params
+  });
+}
+
+// 会员协议更新
+export function updateMemberAgreement(params) {
+  return service({
+    url: "/api" + "/demay/ssm/member/updateMemberAgreement",
+    method: "post",
+    data: params
+  });
+}
+
+// 会员协议发布
+export function pushMemberAgreement(params) {
+  return service({
+    url: "/api" + "/demay/ssm/member/pushMemberAgreement",
+    method: "post",
+    data: params
+  });
+}
+
+// 会员协议新增
+export function addMemberAgreement(params) {
+  return service({
+    url: "/api" + "/demay/ssm/member/addMemberAgreement",
+    method: "post",
+    data: params
+  });
+}
+
 // 充值退导出
 export function exportRefundRec(data){
   return service({
diff --git a/src/api/promotion.js b/src/api/promotion.js
index 23ce369..685c376 100644
--- a/src/api/promotion.js
+++ b/src/api/promotion.js
@@ -9,6 +9,7 @@ export function addPromotion(params) {
     data: params
   });
 }
+
 // 促销活动审核 (门店端-促销活动-促销活动审核)
 export function promotionAudit(params) {
   return service({
diff --git a/src/api/storeManage.js b/src/api/storeManage.js
index fcdbc70..676adff 100644
--- a/src/api/storeManage.js
+++ b/src/api/storeManage.js
@@ -5,7 +5,23 @@ import {
   localPath
 } from "./api.js";
 
+// 查询总归属
+export function pageStore(params) {
+  return service({
+    url: "/api" + "/demay/ssm/store/pageStore",
+    method: "post",
+    data: params
+  });
+}
 
+// 查询角色归属哪个门店
+export function SysRoleStore(params) {
+  return service({
+    url: "/api" + "/demay/ssm/SysRoleStore/page",
+    method: "post",
+    data: params
+  });
+}
 
 // 获取某门店参数
 export function allStores(data){
@@ -1434,3 +1450,12 @@ export function doEditWXAccount(data) {
     data
   });
 }
+
+// 疗程报表导出
+export function groupCourse(params) {
+  return service({
+    url: "/api" + "/demay/ssm/course/groupCourse",
+    method: "post",
+    data: params
+  });
+}
diff --git a/src/components/project/index.vue b/src/components/project/index.vue
index 6321e28..a153b16 100644
--- a/src/components/project/index.vue
+++ b/src/components/project/index.vue
@@ -215,7 +215,6 @@ export default {
             this.rows=res.rows
             this.rows = res.rows.length?res.rows:[{}]
             this.$emit("projectData", this.radioForm,this.rows);
-            // this.$message.success({ message: "操作成功" });
           }else{
             this.$alert(res.message, "提示", {
               confirmButtonText: "确定",
diff --git a/src/components/store/select/index.vue b/src/components/store/select/index.vue
index dda50b7..c6eb34d 100644
--- a/src/components/store/select/index.vue
+++ b/src/components/store/select/index.vue
@@ -1,12 +1,12 @@
 <template>
-  <el-select ref="select" multiple  filterable default-first-option v-model="storeIds" clearable @clear="getData" placeholder="请选择门店" @change="getData">
-    <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
+  <el-select ref="select" multiple collapse-tags filterable default-first-option v-model="storeIds" clearable @clear="getData" placeholder="请选择门店" @change="getData">
+    <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.storeId">
     </el-option>
   </el-select>
 </template>
 
 <script>
-import { organizations } from "@/api/storeManage.js";
+import { SysRoleStore } from "@/api/storeManage.js"; //通过登陆账户获取归属门店
 
 export default {
   data() {
@@ -24,12 +24,15 @@ export default {
       this.$emit("selecData", this.storeIds);
     },
     show() {
-      organizations({ pageSize: 999 }).then((res) => {
+      let params = {
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      SysRoleStore(params).then((res) => {
         if (res.code == "000000") {
-          res.rows.forEach((item) => {
+          res.pageInfo.list.forEach((item) => {
             item.label = item.storeNum + "-" + item.storeName;
           });
-          this.options = res.rows;
+          this.options = res.pageInfo.list;
         } else {
           this.$alert(res.message, "提示", {
             confirmButtonText: "确定",
diff --git a/src/layout/components/asider.vue b/src/layout/components/asider.vue
index 0361e36..8100eb2 100644
--- a/src/layout/components/asider.vue
+++ b/src/layout/components/asider.vue
@@ -835,7 +835,7 @@ export default {
               route: "/cardCollection",
               index: "cardCollection",
               number: "6001500",
-              id:"10011011",
+              id:"100110113",
             },
             {
               name: "活跃会员",
@@ -1236,8 +1236,19 @@ export default {
     },
   },
   created() {
+    if(sessionStorage.getItem("headOffice") * 1 == 1){ //总店
+      this.menuList[7].menuLists.push({
+        name: "会员协议",
+        icon: "el-icon-receiving",
+        route: "/memberAgreement",
+        index: "memberAgreement",
+        number: "500200",
+        id:"800800423",
+      })
+    }
     var that = this;
     let menuList = [...that.menuList];
+    console.log(this.menuList)
     setTimeout(() => {
       that.sessionStorageData = JSON.parse(
         sessionStorage.getItem("sessionStorageData")
@@ -1266,7 +1277,6 @@ export default {
         });
       });
       that.menuList = menuList;
-      console.log(that.menuList);
     }, 1000);
   },
   mounted() {
diff --git a/src/layout/layout.vue b/src/layout/layout.vue
index 80706ae..8aa0e55 100644
--- a/src/layout/layout.vue
+++ b/src/layout/layout.vue
@@ -9,9 +9,9 @@
             <div class="collapse" @click="handleChangeCollapse">
               <i :class="[isShow==true?'el-icon-s-unfold':'el-icon-s-fold']"></i>
             </div>
-            <div @click='ruotes' style='cursor: pointer;'>
-              <span class="headertitle">门店业务</span>
-              <!-- <span class="headertitle">代收业务</span> -->
+            <div @click='ruotes' style='cursor: pointer'>
+              <!-- <span class="headertitle">门店业务</span> -->
+              <span class="headertitle">代收业务</span>
               <span class="text-white ">
                 {{storeNum}}
               </span>
diff --git a/src/pages/branch/map/components/room/index.vue b/src/pages/branch/map/components/room/index.vue
index dff7c61..b29d0d3 100644
--- a/src/pages/branch/map/components/room/index.vue
+++ b/src/pages/branch/map/components/room/index.vue
@@ -6,10 +6,6 @@
         <el-input class="form-width margin-right-xs" placeholder='搜索房间号' size="samll" pattern="[0-9]*" maxlength="11" v-model="form.roomNum">
           <el-button size="mini" slot="append" icon="el-icon-search"></el-button>
         </el-input>
-        <!-- <el-select style="width:100px" class="margin-right-xs" v-model="queryForm.num" placeholder="请选择">
-          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
-        </el-select> -->
         <div class="text-bold flex align-center justify-start">
           <div class="flex align-center justify-start line-height" v-for="(item,index) in stateList" :key="index" @click="stateIndex=index,queryForm.state=item.value">
             <div :class="stateIndex==index?'selcet-text':''" class="pointer padding-xss margin-left-xs">{{item.label}}</div>
diff --git a/src/pages/branch/subbranch/index.vue b/src/pages/branch/subbranch/index.vue
index f447294..9ed5915 100644
--- a/src/pages/branch/subbranch/index.vue
+++ b/src/pages/branch/subbranch/index.vue
@@ -1,11 +1,13 @@
 <template>
   <div class="displsy-mod">
-    <div class="header_flex" style="align-items: center;justify-content: flex-end;">
-      <div class="flex">
+    <div class="flex">
+      <div class="left">
+        <el-button size="mini" type="primary" style="margin-left: 10px;" :disabled="!radioForm.id" @click="detailShow" v-if="headOffice">修改</el-button>
+      </div>
+      <div class="right">
         <el-input size="medium" style="width: 180px" placeholder="当前页搜索" v-model="queryForm.storeName">
-        <i slot="prefix" class="el-input__icon el-icon-search"></i>
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
         </el-input>
-        <el-button size="mini" type="primary" style="margin-left: 10px;" :disabled="!radioForm.id" @click="detailShow" v-if="headOffice">修改</el-button>
       </div>
     </div>
     <hr />
@@ -132,4 +134,12 @@ export default {
 .el-input {
   width: 200px;
 }
+.flex{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.right{
+  text-align: right;
+}
 </style>
diff --git a/src/pages/discount-coupon/issue/components/qrCode.vue b/src/pages/discount-coupon/issue/components/qrCode.vue
index 534fc52..166fa31 100644
--- a/src/pages/discount-coupon/issue/components/qrCode.vue
+++ b/src/pages/discount-coupon/issue/components/qrCode.vue
@@ -3,8 +3,8 @@
     <div class="box" style="width: 400px; height: 400px;  background-color: #FFF;">
       <el-image style="width: 100%; height: 100%" :src="qrCode" fit="fill" v-if="codeNumber===1"></el-image>
       <div class="img" v-if="codeNumber===2||codeNumber===3">
-        <img style="width:100px; height: 100px;" src="../../../../../image/check.png" fit="fill" v-if="codeNumber===2&&openid"></img>
-        <img style="width:100px; height: 100px;" src="../../../../../image/close.png" fit="fill" v-if="codeNumber===3"></img>
+        <img style="width:100px; height: 100px;" src="../../../../../image/check.png" fit="fill" v-if="codeNumber===2&&openid">
+        <img style="width:100px; height: 100px;" src="../../../../../image/close.png" fit="fill" v-if="codeNumber===3">
         <div class="title">{{codeNumber===2?'扫码关注成功':'二维码失效'}}</div>
       </div>
     </div>
@@ -14,9 +14,6 @@
 <script>
 var getOpenid = null;
 import {
-  getAccessToken,
-  getTicket,
-  getQrCode,
   getJavaQrCode,
   getJavaOpenid,
   doDeleteJavaOpenid,
@@ -42,9 +39,6 @@ export default {
       this.openid = "";
       this.dialogFormVisible = true;
       this.handleDeleteJavaOpenid();
-      // setTimeout(() => {
-      //   that.codeNumber = 3
-      // }, 60000);
     },
     close() {
       this.qrCode = "";
@@ -85,33 +79,10 @@ export default {
         }
       });
     },
-    // 获取微信公众号access_token
-    // fetchAccessToken() {
-    //   getAccessToken().then(res => {
-    //     if (res.expires_in == 7200) {
-    //       this.fetchTicket(res.access_token)
-    //     }
-    //   })
-    // },
-    // 根据微信公众号access_token获取ticket
-    // fetchTicket(data) {
-    //   getTicket(data, { "expire_seconds": 1800, "action_name": "QR_SCENE", "action_info": { "scene": { "scene_id": 1800 } } }).then(res => {
-    //     this.fetchQrCode(res.ticket)
-    //   })
-    // },
-    // 通过ticket换取二维码
-    // fetchQrCode(data) {
-    //   getQrCode(data).then(res => {
-    //     this.qrCode = window.URL.createObjectURL(res)
-    //   })
-    // },
   },
 };
 </script>
 <style >
-/* .el-dialog .el-dialog__body {
-  padding: 0 !important;
-} */
 </style>
 <style scoped>
 .box {
diff --git a/src/pages/eashier/collectionList/collectionList.vue b/src/pages/eashier/collectionList/collectionList.vue
index cf3d187..9775d15 100644
--- a/src/pages/eashier/collectionList/collectionList.vue
+++ b/src/pages/eashier/collectionList/collectionList.vue
@@ -513,6 +513,7 @@ export default {
         //查询对象
         pageNum: 1, // 当前页码
         pageSize: 10, // 每页的数据条数,
+        storeList:[]
       },
       selectDate: new Date(),
       total: 0, //分页总条数
@@ -562,9 +563,15 @@ export default {
   },
   methods: {
     rechargeExport(){
+      if(!this.queryForm.storeList.length){
+        return this.$message.error({
+          message: "请至少选择一个门店!",
+        });
+      }
       this.exportloading = true
       let params = {
-        rechargeDate:this.formatTime(this.selectDate, "YYYY-MM-DD hh:mm:ss")
+        rechargeDate:this.formatTime(this.selectDate, "YYYY-MM-DD hh:mm:ss"),
+        storeIds:this.queryForm.storeList
       }
       rechargeExport(params).then(res=>{
         this.exportloading = false
diff --git a/src/pages/eashier/errorOrder/component/index.vue b/src/pages/eashier/errorOrder/component/index.vue
index 04ab557..a2974c1 100644
--- a/src/pages/eashier/errorOrder/component/index.vue
+++ b/src/pages/eashier/errorOrder/component/index.vue
@@ -140,110 +140,6 @@
               />
             </td>
           </tr>
-          <!-- <tr>
-            <th rowspan="2">提成</th>
-            <th>现付</th>
-            <td v-show="wageForm.directConsumption == 0">
-              <span v-show="!editShow">{{ wageForm.salesCommission }}</span>
-              <input
-                oninput="this.value=this.value.replace(/\D*(\d*)(\.?)(\d{0,4})\d*/,'$1$2$3')"
-                pattern="[0-9]*\.?[0-9]1{0,4}"
-                v-show="editShow"
-                v-model="wageForm.salesCommission"
-              />
-            </td>
-
-            <td>
-              <span v-show="!editShow">{{ wageForm.commissionLarge }}</span>
-              <input
-                oninput="this.value=this.value.replace(/\D*(\d*)(\.?)(\d{0,4})\d*/,'$1$2$3')"
-                pattern="[0-9]*\.?[0-9]1{0,4}"
-                v-show="editShow"
-                v-model="wageForm.commissionLarge"
-              />
-            </td>
-            <td>
-              <span v-show="!editShow">{{ wageForm.commissionZhonggong }}</span>
-              <input
-                oninput="this.value=this.value.replace(/\D*(\d*)(\.?)(\d{0,4})\d*/,'$1$2$3')"
-                pattern="[0-9]*\.?[0-9]1{0,4}"
-                v-show="editShow"
-                v-model="wageForm.commissionZhonggong"
-              />
-            </td>
-            <td>
-              <span v-show="!editShow">{{
-                wageForm.commissionTechnician
-              }}</span>
-              <input
-                oninput="this.value=this.value.replace(/\D*(\d*)(\.?)(\d{0,4})\d*/,'$1$2$3')"
-                pattern="[0-9]*\.?[0-9]1{0,4}"
-                v-show="editShow"
-                v-model="wageForm.commissionTechnician"
-              />
-            </td>
-            <td>
-              <span v-show="!editShow">{{ wageForm.commissionSmall }}</span>
-              <input
-                oninput="this.value=this.value.replace(/\D*(\d*)(\.?)(\d{0,4})\d*/,'$1$2$3')"
-                pattern="[0-9]*\.?[0-9]1{0,4}"
-                v-show="editShow"
-                v-model="wageForm.commissionSmall"
-              />
-            </td>
-          </tr>
-          <tr>
-            <th>卡付</th>
-            <td v-show="wageForm.directConsumption == 0">
-              <span v-show="!editShow">{{ wageForm.cardSalesCommission }}</span>
-              <input
-                oninput="this.value=this.value.replace(/\D*(\d*)(\.?)(\d{0,4})\d*/,'$1$2$3')"
-                pattern="[0-9]*\.?[0-9]1{0,4}"
-                v-show="editShow"
-                v-model="wageForm.cardSalesCommission"
-              />
-            </td>
-            <td>
-              <span v-show="!editShow">{{ wageForm.cardCommissionLarge }}</span>
-              <input
-                oninput="this.value=this.value.replace(/\D*(\d*)(\.?)(\d{0,4})\d*/,'$1$2$3')"
-                pattern="[0-9]*\.?[0-9]1{0,4}"
-                v-show="editShow"
-                v-model="wageForm.cardCommissionLarge"
-              />
-            </td>
-            <td>
-              <span v-show="!editShow">{{
-                wageForm.cardCommissionZhonggong
-              }}</span>
-              <input
-                oninput="this.value=this.value.replace(/\D*(\d*)(\.?)(\d{0,4})\d*/,'$1$2$3')"
-                pattern="[0-9]*\.?[0-9]1{0,4}"
-                v-show="editShow"
-                v-model="wageForm.cardCommissionZhonggong"
-              />
-            </td>
-            <td>
-              <span v-show="!editShow">{{
-                wageForm.cardCommissionTechnician
-              }}</span>
-              <input
-                oninput="this.value=this.value.replace(/\D*(\d*)(\.?)(\d{0,4})\d*/,'$1$2$3')"
-                pattern="[0-9]*\.?[0-9]1{0,4}"
-                v-show="editShow"
-                v-model="wageForm.cardCommissionTechnician"
-              />
-            </td>
-            <td>
-              <span v-show="!editShow">{{ wageForm.cardCommissionSmall }}</span>
-              <input
-                oninput="this.value=this.value.replace(/\D*(\d*)(\.?)(\d{0,4})\d*/,'$1$2$3')"
-                pattern="[0-9]*\.?[0-9]1{0,4}"
-                v-show="editShow"
-                v-model="wageForm.cardCommissionSmall"
-              />
-            </td>
-          </tr> -->
         </table>
         <span slot="footer" class="dialog-footer">
           <el-button size="mini" type="primary" @click="wageDialogVisible = false" plain>取 消</el-button>
diff --git a/src/pages/eashier/memberAgreement/components/index.vue b/src/pages/eashier/memberAgreement/components/index.vue
index 2e3d075..be563bb 100644
--- a/src/pages/eashier/memberAgreement/components/index.vue
+++ b/src/pages/eashier/memberAgreement/components/index.vue
@@ -1,9 +1,9 @@
 <template>
     <el-dialog :close-on-click-modal="false" v-dialogDrag :title="title" :visible.sync="dialogFormVisible" :before-close="handleClose" width="50%" >
       <el-form :model="form" ref="form" label-width="60px">
-        <el-form-item label="协议名称" prop="mobilePhone">
+        <el-form-item label="协议名称" prop="agreementName">
           <div class="form-width-ms">
-            <el-input  v-model="form.agrName">
+            <el-input  v-model="form.agreementName">
             </el-input>
           </div>
         </el-form-item>
@@ -13,12 +13,13 @@
       </div>  
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" type="primary" plain @click="dialogFormVisible = false">关闭</el-button>
-        <el-button size="mini" type="primary" @click="confirms()">{{ title=='修改'?'修改':'添加' }}</el-button>
+        <el-button size="mini" type="primary" @click="confirms()" :loading="loading">{{ title=='修改'?'修改':'添加' }}</el-button>
       </div>
     </el-dialog>
   </template>
   <script>
   import quillEditor from './quillEditor'
+  import { updateMemberAgreement,addMemberAgreement } from "@/api/eashier.js";
   export default {
     components:{
         quillEditor
@@ -27,25 +28,59 @@
       return {
         title: "添加",
         form:{},
+        loading:false,
         dialogFormVisible: false, //弹窗开关
       };
     },
     methods: {
       confirms(){
-        console.log( this.$refs.quillEditor.content )
+        this.loading = true
+        if(this.title == '修改'){
+          let params = {
+            ...this.form,
+            content:this.$refs.quillEditor.content
+          }
+          updateMemberAgreement(params).then(res=>{
+            this.loading = false
+            if(res.code == "000000"){
+              this.$message.success({ message: "更新成功" })
+              this.dialogFormVisible = false
+              this.$emit('init')
+            }
+          })
+        }else{
+          let params = {
+            content:this.$refs.quillEditor.content,
+            agreementName:this.form.agreementName
+          }
+          addMemberAgreement(params).then(res=>{
+            if(res.code == "000000"){
+              this.$message.success({ message: "添加成功" })
+              this.dialogFormVisible = false
+              this.$emit('init')
+            }
+          })
+        }
       },
       //关闭弹窗前的回调方法
       handleClose() {
         this.dialogFormVisible = false;
       },
       //组件传值
-      show(id) {
-        this.title = id?'修改':'添加'
+      show(res) {
+        this.title = res?'修改':'添加'
         this.dialogFormVisible = true
-        this.$nextTick(()=>{
+        if(res){
+          this.$nextTick(()=>{
+            this.form = res
+            this.$refs.quillEditor.content = res.content
+          })
+        }else{
+          this.$nextTick(()=>{
             this.form = {}
             this.$refs.quillEditor.content = ''
-        })
+          })
+        }
       },
     }  
   };
diff --git a/src/pages/eashier/memberAgreement/index.vue b/src/pages/eashier/memberAgreement/index.vue
index bea8c95..3c8a2c3 100644
--- a/src/pages/eashier/memberAgreement/index.vue
+++ b/src/pages/eashier/memberAgreement/index.vue
@@ -3,7 +3,7 @@
     <div style="text-align: right;;margin-bottom:10px">
       <el-button size="mini" type="primary" @click="handleAddUpdata(1)">添加</el-button>
       <el-button size="mini" type="primary" :disabled="!radioRowValue.id" @click="handleAddUpdata(2)">修改</el-button>
-      <el-button size="mini" type="primary" :disabled="!radioRowValue.id">发布</el-button>
+      <el-button size="mini" type="primary" :disabled="!radioRowValue.id" @click="publishAgreement" :loading="publishLoading">发布</el-button>
       </div>
     <div>
       <el-table :data="list" :header-cell-style="{
@@ -13,37 +13,43 @@
         max-height="650"
         @row-click="rowClick" 
         @row-dblclick="electConfirm"
+        v-loading="loading"
         >
         <el-table-column label="选择" width="55" align="center" sortable type="index">
           <template slot-scope="scope">
             <el-radio v-model="radio" :label="scope.row.id" @change.native="(scope.row)">{{null}}</el-radio>
           </template>
         </el-table-column>
-        <el-table-column label="协议名称" min-width="85" align="center" prop="name"></el-table-column>
-        <el-table-column label="创建时间" min-width="85" align="center"></el-table-column>
-        <el-table-column label="创建人" min-width="85" align="center"></el-table-column>
-        <el-table-column label="修改时间" min-width="85" align="center"></el-table-column>
-        <el-table-column label="修改人" min-width="85" align="center"></el-table-column>
-        <el-table-column label="发布时间" min-width="85" align="center"></el-table-column>
-        <el-table-column label="发布人" min-width="85" align="center"></el-table-column>
-        <el-table-column label="状态" min-width="85" align="center"></el-table-column>
+        <el-table-column label="协议名称" min-width="85" align="center" prop="agreementName"></el-table-column>
+        <el-table-column label="创建人" min-width="85" align="center" prop="addName"></el-table-column>
+        <el-table-column label="创建时间" min-width="85" align="center" prop="addDate"></el-table-column>
+        <el-table-column label="修改人" min-width="85" align="center" prop="updateName"></el-table-column>
+        <el-table-column label="修改时间" min-width="85" align="center" prop="updateDate"></el-table-column>
+        <el-table-column label="发布人" min-width="85" align="center" prop="startName"></el-table-column>
+        <el-table-column label="发布时间" min-width="85" align="center" prop="startDate"></el-table-column>
+        <el-table-column label="状态" min-width="85" align="center" prop="startState">
+          <template slot-scope="scope">
+                <el-tag :type="scope.row.startState == 1 ? 'primary' : 'success'">{{ scope.row.startState==1?'启用':'未启用' }}</el-tag>
+              </template>
+        </el-table-column>
       </el-table>
       <div class="block" style="margin-top:15px;">
-          <!-- 分页组件 -->
           <el-pagination align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageInfo.pageNum" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageInfo.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="pageInfo.total"></el-pagination>
       </div>
       </div>
-    <detail ref="detail"/>
+    <detail ref="detail" @init="init"/>
   </div> 
   </template>
   <script>
   import detail from './components/index'
+  import { memberSelectPage,pushMemberAgreement } from "@/api/eashier.js";
   export default {
     components:{
       detail
     },
     data() {
       return {
+        publishLoading:false,
         radioRowValue:{},
         radio:"",
         pageInfo: {
@@ -51,20 +57,42 @@
           pageNum: 1,
           pageSize: 10,
         },
-        list:[{
-            name:'1',
-            id:1
-        },{
-            name:'2',
-            id:2
-        }]
+        list:[],
+        loading:false
       };
     },
     created() {
+      this.init()
     },
     methods:{
+      publishAgreement(){
+        let params = {
+          id:this.radio
+        }
+        this.publishLoading = true
+        pushMemberAgreement(params).then(res=>{
+          this.publishLoading = false
+          if(res.code == "000000"){
+            this.$message.success({ message: "发布成功" })
+            this.init()
+          }
+        })
+      },
+      init(){
+        let params = {
+          ...this.pageInfo
+        }
+        this.loading = true
+        memberSelectPage(params).then(res=>{
+          this.loading = false
+          if(res.code == "000000"){
+            this.list = res.pageInfo.list
+            this.pageInfo.total = res.pageInfo.total
+          }
+        })
+      },
       handleAddUpdata(num){
-        num==1?this.$refs.detail.show():this.$refs.detail.show(this.radioRowValue.id)
+        num==1?this.$refs.detail.show():this.$refs.detail.show(this.radioRowValue)
       },
       handleCurrentChange(current){
         this.pageInfo.pageNum = current
diff --git a/src/pages/eashier/noArrears/noarrears.vue b/src/pages/eashier/noArrears/noarrears.vue
index 12ffde0..d148bfb 100644
--- a/src/pages/eashier/noArrears/noarrears.vue
+++ b/src/pages/eashier/noArrears/noarrears.vue
@@ -4,7 +4,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="还款单" name="还款单">
         <el-select v-if="headOffice == 1" ref="select" multiple collapse-tags filterable default-first-option v-model="queryForm.storeList" clearable @clear="getData" placeholder="请选择门店" @change="getData">
-          <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
+          <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.storeId">
           </el-option>
         </el-select>
         <el-input size="medium" class="form-width-ms" v-model="queryForm.docNum" placeholder="输入要查询的单据号" clearable></el-input>
@@ -278,7 +278,7 @@ import {
   recycleCancelDebtList,
   submitCancelDebtList,
 } from "@/api/eashier.js";
-import { organizations } from "@/api/storeManage.js";
+import { organizations,SysRoleStore } from "@/api/storeManage.js";
 import excel from "@/components/excel";
 import admin from "@/components/staffList/admin/index";
 import manager from "@/components/staffList/manager/index";
@@ -674,22 +674,25 @@ export default {
     list.forEach((item) => {
       if (item.id == 5008001) {
         this.getData();
-        organizations({ pageSize: 999 }).then((res) => {
-          if (res.code == "000000") {
-            res.rows.forEach((item) => {
-              item.label = item.storeNum + "-" + item.storeName;
-            });
-            this.options = res.rows;
-          } else {
-            this.$alert(res.message, "提示", {
-              confirmButtonText: "确定",
-              confirmButtonClass: "confirmbtnFalses",
-              type: "warning",
-              center: true,
-              callback: (action) => {},
-            });
-          }
-        });
+        let params = {
+          roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+        }
+        SysRoleStore(params).then((res) => {
+        if (res.code == "000000") {
+          res.pageInfo.list.forEach((item) => {
+            item.label = item.storeNum + "-" + item.storeName;
+          });
+          this.options = res.pageInfo.list;
+        } else {
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      }); 
       }
     });
   },
diff --git a/src/pages/eashier/proceeds/detail/editform.vue b/src/pages/eashier/proceeds/detail/editform.vue
index 06df3ad..87d2ef0 100644
--- a/src/pages/eashier/proceeds/detail/editform.vue
+++ b/src/pages/eashier/proceeds/detail/editform.vue
@@ -105,6 +105,11 @@
             </el-table-column>
             <el-table-column show-overflow-tooltip min-width="100" align="center" prop="projectNum" label="项目编码"></el-table-column>
             <el-table-column show-overflow-tooltip min-width="120" align="center" prop="projectName" label="项目名称"></el-table-column>
+            <el-table-column show-overflow-tooltip min-width="100" align="center" label="提成明细">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleCommission(scope.row)">明细</el-button>
+              </template>
+            </el-table-column>
             <el-table-column show-overflow-tooltip min-width="100" align="center" prop="transactionPrice" label="项目金额"></el-table-column>
             <el-table-column show-overflow-tooltip min-width="100" align="center" prop="" label="支付类型">
               <template slot-scope="scope">
@@ -128,11 +133,6 @@
               </template>
             </el-table-column>
             <el-table-column show-overflow-tooltip min-width="100" align="center" prop="remark" label="备注"></el-table-column>
-            <el-table-column show-overflow-tooltip min-width="100" align="center" label="提成明细">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleCommission(scope.row)">明细</el-button>
-              </template>
-            </el-table-column>
           </el-table>
         </div>
         <div class=' border-radius-10 border margin-left-xs  bg-white padding-xs' style="width:280px" v-if="list.length!=0">
diff --git a/src/pages/eashier/raiseReatment/components/detail.vue b/src/pages/eashier/raiseReatment/components/detail.vue
index 9310a5b..3acfff6 100644
--- a/src/pages/eashier/raiseReatment/components/detail.vue
+++ b/src/pages/eashier/raiseReatment/components/detail.vue
@@ -80,12 +80,12 @@
         </div>
       </el-form>
     </div>
-    <span slot="footer" class="dialog-footer" v-if="title=='明细'">
+    <!-- <span slot="footer" class="dialog-footer" v-if="title=='明细'">
       <el-button size="mini" type="primary" @click="detailDialog=false">关闭</el-button>
-    </span>
-    <span v-else slot="footer" class="dialog-footer">
+    </span> -->
+    <span  slot="footer" class="dialog-footer">
       <el-button size="mini" type="primary" plain @click="cancel()">取 消</el-button>
-      <el-button v-if="title=='修改'" size="mini" type="primary" @click="subStaffRatio()">修 改</el-button>
+      <el-button size="mini" type="primary" @click="subStaffRatio()">修 改</el-button>
     </span>
   </el-dialog>
 </template>
diff --git a/src/pages/eashier/raiseReatment/components/index.vue b/src/pages/eashier/raiseReatment/components/index.vue
index 2bd10d3..00d6b6a 100644
--- a/src/pages/eashier/raiseReatment/components/index.vue
+++ b/src/pages/eashier/raiseReatment/components/index.vue
@@ -171,7 +171,7 @@
               <el-table-column label="最低转入次数" show-overflow-tooltip align="center" prop="minumumTimes" min-width="110">
               </el-table-column>
               <el-table-column label="单价" align="center" prop="prices" min-width="90">
-                <template slot-scope='scope'>
+                <!-- <template slot-scope='scope'>
                   <div class="form-input-width" v-if="inNumberIndexs != scope.$index"
                     @click="openEdit(scope.row, scope.$index, inNumberIndexs = scope.$index)">
                     {{ scope.row.prices }}
@@ -179,7 +179,7 @@
                   </div>
                   <el-input v-focus class="form-input-width-xs" type="number" v-else v-model="scope.row.prices"
                     @blur="endEditprices(scope.row)"></el-input>
-                </template>
+                </template> -->
               </el-table-column>
               <el-table-column label="转入次数" align="center" prop="changeInTime" min-width="90">
                 <template slot-scope='scope'>
@@ -195,6 +195,15 @@
               <!-- <el-table-column label="欠款金额" v-if="sessionStorageData.allowdebt" align="center" prop="debtMoney"
                 min-width="90"></el-table-column> -->
               <el-table-column label="成交金额" align="center" prop="transactionMoney" min-width="80">
+                <template slot-scope='scope'>
+                  <div class="form-input-width" v-if="inNumberIndexs != scope.$index"
+                    @click="openEdit(scope.row, scope.$index, inNumberIndexs = scope.$index)">
+                    {{ scope.row.transactionMoney }}
+                    <i class="el-icon-edit text-cyan"></i>
+                  </div>
+                  <el-input v-focus class="form-input-width-xs" type="number" v-else v-model="scope.row.transactionMoney"
+                    @blur="endEditprices(scope.row)"></el-input>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -869,8 +878,9 @@ export default {
       //   });
       //   row.changeInTime = row.minumumTimes;
       // }
+      row.prices = (row.transactionMoney / row.changeInTime).toFixed(2)*1
       if (row.minumumPriceMember > row.prices) {
-        this.$alert("单价不可以低于最低单价: ", "提示", {
+        this.$alert(`单价不可以低于最低单价: ${row.minumumPriceMember}`, "提示", {
           confirmButtonText: "确定",
           confirmButtonClass: "confirmbtnFalses",
           type: "warning",
@@ -880,7 +890,7 @@ export default {
         });
         row.prices = row.minumumPriceMember
       } else if (row.priceMember < row.prices) {
-        this.$alert("单价不可以高于标准单价: ", "提示", {
+        this.$alert(`单价不可以高于标准单价: ${row.priceMember}`, "提示", {
           confirmButtonText: "确定",
           confirmButtonClass: "confirmbtnFalses",
           type: "warning",
diff --git a/src/pages/eashier/raiseReatment/components/raiseList.vue b/src/pages/eashier/raiseReatment/components/raiseList.vue
index 7c14231..0a14194 100644
--- a/src/pages/eashier/raiseReatment/components/raiseList.vue
+++ b/src/pages/eashier/raiseReatment/components/raiseList.vue
@@ -121,6 +121,7 @@ export default {
         //查询对象
         pageNum: 1,
         pageSize: 10,
+        storeList:[]
       },
       list: [], //主数组
       activeName: "现付",
@@ -138,16 +139,22 @@ export default {
   },
   methods: {
     handleExport(){
+      if(!this.queryForm.storeList.length){
+        return this.$message.error({
+          message: "请至少选择一个门店!",
+        });
+      }
       this.$refs.dateExport.searchDialog = true
     },
     handleDateExport(val){
       this.exportLoad = true
       let params = {
-        strDate:this.formatTime(val, "YYYY-MM")
+        strDate:this.formatTime(val, "YYYY-MM"),
+        storeIds:this.queryForm.storeList
       }
       exporCardChange(params).then(res=>{
         this.exportLoad = false
-        let blob = new Blob([res]);
+        let blob = new Blob([res]); 
         var a = document.createElement("a");
         var url = window.URL.createObjectURL(blob);
         console.log(url);
@@ -221,7 +228,11 @@ export default {
       this.listLoading = true;
       let selectDate = this.formatTime(this.selectDate, "YYYYMM");
       this.queryForm.selectDate = selectDate;
-      cardChangePage(this.queryForm).then((res) => {
+      let params = {
+        ...this.queryForm,
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      cardChangePage(params).then((res) => {
         this.listLoading = false;
 
         if (res.code == "000000") {
diff --git a/src/pages/eashier/reatment/components/detail.vue b/src/pages/eashier/reatment/components/detail.vue
index 08fb706..f89a1e0 100644
--- a/src/pages/eashier/reatment/components/detail.vue
+++ b/src/pages/eashier/reatment/components/detail.vue
@@ -8,6 +8,11 @@
     }" >
       <el-table-column align="center" prop="courseReatmentNum" label="单号" min-width="130"></el-table-column>
       <el-table-column align="center" prop="date" label="单据日期" min-width="150"> </el-table-column>
+      <el-table-column show-overflow-tooltip min-width="100" align="center" label="提成明细" v-if="isShow">
+        <template slot-scope="scope">
+          <el-button type="primary" size="mini" @click="handleCommission(scope.row)">明细</el-button>
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="memberName" label="名字" min-width="70"> </el-table-column>
       <el-table-column align="center" prop="mobilePhone" label="手机号码" min-width="100"> </el-table-column>
       <el-table-column align="center" prop="projectNum" label="疗程编码" min-width="100"> </el-table-column>
@@ -23,11 +28,6 @@
         </template>  
       </el-table-column>
       <el-table-column align="center" prop="description" label="说明" min-width="120"> </el-table-column>
-      <el-table-column show-overflow-tooltip min-width="100" align="center" label="提成明细">
-        <template slot-scope="scope">
-          <el-button type="primary" size="mini" @click="handleCommission(scope.row)">明细</el-button>
-        </template>
-      </el-table-column>
     </el-table>
     <div class="text-bold padding-xs">卡付/现付</div>
       <div class="flex justify-start align-start ">
@@ -64,7 +64,7 @@
         <admin ref="admin" @adminData="adminData"></admin>
         <manager ref="manager" @managerData="managerData"></manager>
       </div>
-    <span slot="footer" class="dialog-footer" v-if="title=='明细'">
+    <span slot="footer" class="dialog-footer" v-if="title=='明细'&& !isShow">
       <el-button size="mini" type="primary" @click="detailDialog=false">关闭</el-button>
     </span>
     <span v-else slot="footer" class="dialog-footer">
@@ -114,6 +114,11 @@ export default {
   created(){
     this.init()
   },
+  computed:{
+    isShow(){ //只有异常单展示
+      return this.$route.path == '/errorOrder'
+    }
+  },
   methods: {
     handleCommission(){
         this.$refs.detail.show(this.project)
diff --git a/src/pages/eashier/reatment/reatment.vue b/src/pages/eashier/reatment/reatment.vue
index b5ea465..c4f1875 100644
--- a/src/pages/eashier/reatment/reatment.vue
+++ b/src/pages/eashier/reatment/reatment.vue
@@ -522,6 +522,7 @@ export default {
         //查询对象
         pageNum: 1, // 当前页码
         pageSize: 10, // 每页的数据条数,
+        storeList:[]
       },
       selectDate: new Date(),
       payMoney: "",
@@ -703,9 +704,15 @@ export default {
   },
   methods: {
     exportachis(){
+      if(!this.queryForm.storeList.length){
+        return this.$message.error({
+          message: "请至少选择一个门店!",
+        });
+      }
       this.exportloading = true
       let params = {
-        date:this.formatTime(this.selectDate, "YYYY-MM-DD hh:mm:ss")
+        date:this.formatTime(this.selectDate, "YYYY-MM-DD hh:mm:ss"),
+        storeIds:this.queryForm.storeList
       }
       exportachis(params).then(res=>{
         this.exportloading = false
diff --git a/src/pages/eashier/refund/refund.vue b/src/pages/eashier/refund/refund.vue
index 6d378b7..9b82d69 100644
--- a/src/pages/eashier/refund/refund.vue
+++ b/src/pages/eashier/refund/refund.vue
@@ -177,7 +177,7 @@
       <div style="display: flex;justify-content:center;margin-right:50px">
         <div>
           <el-button size="mini" type="info" @click="reset">重 置</el-button>
-          <el-button size="mini" type="primary" plain @click="openRefList (refDialogVisible=true)" v-role='5007001'>列表</el-button>
+          <el-button size="mini" type="primary" plain @click="openRefList(refDialogVisible=true)" v-role='5007001'>列表</el-button>
           <el-button size="mini" type="primary" :loading="loading" @click="submit(loading=true)" v-role='5007002'>提 交</el-button>
         </div>
       </div>
@@ -663,6 +663,7 @@ export default {
         pageNum: 10,
         pageNum: 1,
         type: 2,
+        storeList:[]
       },
       total: 0,
       list: [],
@@ -782,12 +783,18 @@ export default {
   },
   methods: {
     exportRefundCash(){
+      if(!this.queryForm.storeList.length){
+        return this.$message.error({
+          message: "请至少选择一个门店导出!",
+        });
+      }
       this.$refs.dateExport.show()
     },
     handleDateExport(val){
       this.exportloading = true
       let params = {
-        strDate:this.formatTime(val, "YYYY-MM")
+        strDate:this.formatTime(val, "YYYY-MM"),
+        storeIds:this.queryForm.storeList
       }
       exportRefundCash(params).then(res=>{
         this.exportloading = false
@@ -1727,7 +1734,11 @@ export default {
       this.getOrder();
     },
     getOrder() {
-      refOrderPage(this.queryForm).then((res) => {
+      let params = {
+        ...this.queryForm,
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      refOrderPage(params).then((res) => {
         if (res.code == "000000") {
           this.list = res.pageInfo.list;
           this.total = res.pageInfo.total;
diff --git a/src/pages/eashier/refundCourse/refundCourse.vue b/src/pages/eashier/refundCourse/refundCourse.vue
index 8227440..f54232f 100644
--- a/src/pages/eashier/refundCourse/refundCourse.vue
+++ b/src/pages/eashier/refundCourse/refundCourse.vue
@@ -605,6 +605,7 @@ export default {
         pageNum: 10,
         pageNum: 1,
         type: 1,
+        storeList:[]
       },
       total: 0,
       list: [],
@@ -643,12 +644,18 @@ export default {
   },
   methods: {
     handleExport(){
+      if(!this.queryForm.storeList.length){
+        return this.$message.error({
+          message: "请至少选择一个门店导出!",
+        });
+      }
       this.$refs.dateExport.searchDialog = true
     },
     exportRefCourse(val){
       this.exportloading = true
       let params = {
-        strDate:this.formatTime(val, "YYYY-MM")
+        strDate:this.formatTime(val, "YYYY-MM"),
+        storeIds:this.queryForm.storeList
       }
       exportRefCourse(params).then(res=>{
         this.exportloading = false
@@ -1073,7 +1080,11 @@ export default {
       }
     },
     getOrder() {
-      refOrderPage(this.queryForm).then((res) => {
+      let params = {
+        ...this.queryForm,
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      refOrderPage(params).then((res) => {
         if (res.code == "000000") {
           this.list = res.pageInfo.list;
           this.total = res.pageInfo.total;
diff --git a/src/pages/eashier/refundRecharge/refundRecharge.vue b/src/pages/eashier/refundRecharge/refundRecharge.vue
index e5a3ac3..93d1791 100644
--- a/src/pages/eashier/refundRecharge/refundRecharge.vue
+++ b/src/pages/eashier/refundRecharge/refundRecharge.vue
@@ -1269,7 +1269,7 @@ export default {
       queryForm: {
         pageNum: 10,
         pageNum: 1,
-        type: 0
+        type: 0,
       },
       total: 0,
       list: [],
@@ -1313,12 +1313,19 @@ export default {
   },
   methods: {
     exportRefundRec(){
+      console.log(this.queryForm.storeList)
+      if(!this.queryForm.storeList){
+        return this.$message.error({
+          message: "请至少选择一个门店导出!",
+        });
+      }
       this.$refs.dateExport.show()
     },
     handleExport(val){
       this.exportloading = true
       let params = {
-        strDate:this.formatTime(val, "YYYY-MM")
+        strDate:this.formatTime(val, "YYYY-MM"),
+        storeIds:this.queryForm.storeList
       }
       exportRefundRec(params).then(res=>{
         this.exportloading = false
@@ -1808,7 +1815,11 @@ export default {
       }
     },
     getOrder() {
-      refOrderPage(this.queryForm).then(res => {
+      let params = {
+        ...this.queryForm,
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      refOrderPage(params).then(res => {
         if (res.code == "000000") {
           this.list = res.pageInfo.list;
           this.total = res.pageInfo.total;
diff --git a/src/pages/eashier/repayment/repayment.vue b/src/pages/eashier/repayment/repayment.vue
index 929209f..eba9733 100644
--- a/src/pages/eashier/repayment/repayment.vue
+++ b/src/pages/eashier/repayment/repayment.vue
@@ -4,7 +4,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="还款单" name="还款单">
         <el-select v-if="headOffice == 1" ref="select" multiple collapse-tags filterable default-first-option v-model="queryForm.storeList" clearable @clear="getData" placeholder="请选择门店" @change="getData">
-          <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
+          <el-option v-for="item in options" :key="item.id" :label="item.storeNum + '-' + item.storeName" :value="item.storeId">
           </el-option>
         </el-select>
         <el-input size="medium" class="form-width-ms" v-model="queryForm.repayNum" placeholder="输入要查询的单据号" clearable></el-input>
@@ -56,152 +56,7 @@
           <el-pagination align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryForm.pageNum" :page-sizes="[10,20,30,40,50]" :page-size="queryForm.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
         </div>
       </el-tab-pane>
-      <!-- <el-tab-pane label="取消欠款" name="取消欠款">
-        <selec v-if="headOffice == 1" ref="selec" @selecData="selecData"></selec>
-        <el-input size="medium" class="form-width-ms" v-model="queryForm.docNum" placeholder="输入要查询的单据号" clearable></el-input>
-        <el-input size="medium" class="form-width-ms" v-model="queryForm.memberName" placeholder="输入要查询的会员名字" clearable></el-input>
-        <el-input size="medium" class="form-width-ms" maxlength="11" v-model="queryForm.mobilePhone" placeholder="输入要查询的11位会员手机号" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" clearable></el-input>
-        <el-button size="mini" type="primary" plain @click="getData">搜索</el-button>
-        <el-button @click="confirms(radioList)" size="mini" type="primary" :disabled="radioList.state==undefined">明细</el-button>
-        <el-button @click="editOrder(1)" size="mini" type="primary" :disabled="radioList.state==3||radioList.state==5 ||radioList.state==1 ||radioList.state==undefined">送审</el-button>
-        <el-button @click="editOrder(2)" size="mini" type="primary" :disabled="radioList.state==0||radioList.state==5||radioList.state==2||radioList.state==3||radioList.state==4||radioList.state==undefined" plain>回收</el-button>
-        <el-button @click="editOrder(3)" size="mini" type="primary" :disabled="radioList.state==2||radioList.state==5||radioList.state==3 || radioList.state==0|| radioList.state==4||radioList.state==undefined">审核</el-button>
-        <el-button @click="editOrder(4)" size="mini" type="primary" :disabled="radioList.state==0||radioList.state==5|| radioList.state==1||radioList.state==2|| radioList.state==4||radioList.state==undefined">反审核</el-button>
-        <el-table :data="list" class="margin-top-xs" @row-dblclick="confirms" @row-click="clickRow" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" ref="multipleTable" highlight-current-row tooltip-effect="dark" stripe>
-          <el-table-column align="center" label="状态" min-width="130">
-            <template slot-scope="scope">
-              <div class="flex align-center">
-                <el-radio v-model="radioValue" :label="scope.row.id" @change.native="(scope.row)">{{''}}
-                </el-radio>
-                <el-tag size="medium" effect="dark" :type="scope.row.state==0?'info':''||scope.row.state==1?'primary':''||scope.row.state==2?'info':''||scope.row.state==3?'success':''||scope.row.state==4?'warning':scope.row.state==5?'primary':''">
-                  <span v-show="scope.row.state==0">新创建</span>
-                  <span v-show="scope.row.state==1">已送审</span>
-                  <span v-show="scope.row.state==2">已回收</span>
-                  <span v-show="scope.row.state==3">已审核</span>
-                  <span v-show="scope.row.state==4">反审核</span>
-                  <span v-show="scope.row.state==5">已作废</span>
-                  <span v-show="scope.row.state==null">未划分</span>
-                </el-tag>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="docType" label="类型" align="center" width="75">
-            <template slot-scope="scope">
-              <div>{{scope.row.docType=='card_use'?'疗程':scope.row.docType=='promotion_card_use'?'促销':scope.row.liftType==1?'升降级':'正常充值'}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="docNum" show-overflow-tooltip label="单号" min-width="120"></el-table-column>
-          <el-table-column align="center" prop="docDate" show-overflow-tooltip label="日期" min-width="105"></el-table-column>
-          <el-table-column align="center" prop="memberName" label="会员名字" min-width="80"></el-table-column>
-          <el-table-column align="center" prop="mobilePhone" label="手机号码" min-width="100"></el-table-column>
-          <el-table-column align="center" prop="tradeName" label="名称" min-width="120"></el-table-column>
-          <el-table-column align="center" prop="tradeMoney" label="成交金额" min-width="80"></el-table-column>
-          <el-table-column align="center" prop="debtMoney" label="待付金额" min-width="80"></el-table-column>
-          <el-table-column align="center" prop="cancelMoney" label="取消欠款金额" min-width="110"></el-table-column>
-          <el-table-column align="center" prop="cancelNum" label="取消欠款次数" min-width="110"></el-table-column>
-          <el-table-column align="center" label="操作" width="150">
-            <template slot-scope="scope">
-              <el-button size="mini" type="primary" :disabled="!(scope.row.state==4||scope.row.state==2||scope.row.state==0)" plain @click="(cancelForm=scope.row,cancelDialogVisible=true,title='修改')">修改</el-button>
-              <el-button size="mini" type="primary" plain @click="del(scope.row)">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="block" style="margin-top:15px;"> -->
-          <!-- 分页组件 -->
-          <!-- <el-pagination align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryForm.pageNum" :page-sizes="[10,20,30,40,50]" :page-size="queryForm.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-        </div>
-      </el-tab-pane> -->
     </el-tabs>
-    <!-- <el-dialog :close-on-click-modal="false" v-dialogDrag :title="title" :visible.sync="cancelDialogVisible" width="650px" append-to-body>
-      <el-form label-width="120px" inline>
-        <div v-if="cancelForm.docType=='promotion_card_use'">
-          <el-form-item label="会员名称">
-            {{cancelForm.memberName}}
-          </el-form-item>
-          <el-form-item label="手机号码">
-            {{cancelForm.memberName}}
-          </el-form-item>
-          <el-form-item label="促销名称">
-            {{cancelForm.tradeName}}
-          </el-form-item>
-          <el-form-item label="成交金额">
-            <span class="text-red text-price">
-              {{cancelForm.tradeMoney}}
-            </span>
-          </el-form-item>
-          <el-form-item label="欠款金额">
-            <span class="text-cyan text-price">
-              {{cancelForm.debtMoney}}
-            </span>
-          </el-form-item>
-          <el-form-item label="取消欠款">
-            <span class="text-cyan text-price">
-              {{cancelForm.cancelMoney}}
-            </span>
-          </el-form-item>
-          <el-table :data="cancelForm.cancelDebtMxes" highlight-current-row tooltip-effect="dark">
-            <el-table-column prop="courseProjectNum" show-overflow-tooltip label="项目编码" align="center" min-width="80"></el-table-column>
-            <el-table-column prop="courseProjectName" show-overflow-tooltip label="项目名称" align="center" min-width="120"></el-table-column>
-            <el-table-column prop="price" show-overflow-tooltip label="欠款" align="center" min-width="80">
-              <el-table-column prop="debtMoney" show-overflow-tooltip label="金额" align="center" min-width="80"></el-table-column>
-              <el-table-column prop="debtCount" show-overflow-tooltip label="次数" align="center" min-width="80"></el-table-column>
-            </el-table-column>
-            <el-table-column prop="price" show-overflow-tooltip label="取消欠款" align="center" min-width="80">
-              <el-table-column prop="cancelMoney" show-overflow-tooltip label="金额" align="center" min-width="80">
-                <template slot-scope="scope">
-                  <div @click.stop v-if="title=='修改'">
-                    <div class="text-cyan" v-if="editCancelMIndex!=scope.$index" @click="openEditCancelM(scope.row,scope.$index,editCancelMIndex=scope.$index)">
-                      {{scope.row.cancelMoney}}
-                      <i class="el-icon-edit text-cyan"></i>
-                    </div>
-                    <el-input v-focus type="number" class="form-input-width-xs" v-else @blur="endEditCancelM(scope.row,editCancelMIndex=-1)" v-model="scope.row.cancelMoney"></el-input>
-                  </div>
-                  <div v-else>{{scope.row.cancelMoney}}</div>
-                </template>
-              </el-table-column>
-              <el-table-column prop="cancelNum" show-overflow-tooltip label="次数" align="center" min-width="80">
-                <template slot-scope="scope">
-                  <div @click.stop v-if="title=='修改'">
-                    <div class="text-cyan" v-if="editCancelCIndex!=scope.$index" @click="openEditCancelC(scope.row,scope.$index,editCancelCIndex=scope.$index)">
-                      {{scope.row.cancelNum}}
-                      <i class="el-icon-edit text-cyan"></i>
-                    </div>
-                    <el-input v-focus type="number" class="form-input-width-xs" v-else @blur="endEditCancelC(scope.row,editCancelCIndex=-1)" v-model="scope.row.cancelNum"></el-input>
-                  </div>
-                  <div v-else>{{scope.row.cancelNum}}</div>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div v-else>
-          <el-form-item label="欠款帐户">
-            {{cancelForm.tradeName}}
-          </el-form-item>
-          <el-form-item label="成交金额">
-            <span class="text-red text-price">
-              {{cancelForm.tradeMoney}}
-            </span>
-          </el-form-item>
-          <el-form-item label="欠款金额">
-            <span class="text-cyan text-price">
-              {{cancelForm.debtMoney}}
-            </span>
-          </el-form-item>
-          <el-form-item label="取消欠款金额">
-            <el-input type="number" class="form-width-ms" v-model="cancelForm.cancelMoney"></el-input>
-          </el-form-item>
-          <el-form-item label="取消欠款次数" v-if="cancelForm.docType == 'card_use'">
-            <el-input pattern="[0-9]*\" type="number" class="form-width-ms" v-model="cancelForm.cancelNum"></el-input>
-          </el-form-item>
-        </div>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" type="primary" plain @click="cancelDialogVisible = false">取 消</el-button>
-        <el-button size="mini" v-if="title=='修改'" type="primary" @click="confirmCancel()">确 定 </el-button>
-      </span>
-    </el-dialog> -->
-
     <el-dialog :close-on-click-modal="false" v-dialogDrag title="打印" :visible.sync="printDialogVisible" width="60%">
       <div id="printService" class="printDiv">
         <div class="text-center text-grey padding-xs">
@@ -279,7 +134,7 @@ import {
   submitCancelDebtList,
   exportrepay
 } from "@/api/eashier.js";
-import { organizations } from "@/api/storeManage.js";
+import { SysRoleStore } from "@/api/storeManage.js";
 import excel from "@/components/excel";
 import admin from "@/components/staffList/admin/index";
 import manager from "@/components/staffList/manager/index";
@@ -342,6 +197,7 @@ export default {
         //查询对象
         pageNum: 1,
         pageSize: 10,
+        storeList:[]
       },
       infoDialog: false, //上传文件弹窗开关
       editCancelCIndex: -1,
@@ -351,12 +207,18 @@ export default {
   },
   methods: {
     handleDateShow(){
+      if(!this.queryForm.storeList.length){
+        return this.$message.error({
+          message: "请至少选择一个门店导出!",
+        });
+      }
       this.$refs.dateExport.show()
     },
     handleDateExport(val){
       this.exportLoad = true
       let params = {
-        strDate:this.formatTime(val, "YYYY-MM")
+        strDate:this.formatTime(val, "YYYY-MM"),
+        storeIds:this.queryForm.storeList
       }
       exportrepay(params).then(res=>{
         this.exportLoad = false
@@ -692,12 +554,9 @@ export default {
     list.forEach((item) => {
       if (item.id == 5008001) {
         this.getData();
-        organizations({ pageSize: 999 }).then((res) => {
+        SysRoleStore({ roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId }).then((res) => {
           if (res.code == "000000") {
-            res.rows.forEach((item) => {
-              item.label = item.storeNum + "-" + item.storeName;
-            });
-            this.options = res.rows;
+            this.options = res.pageInfo.list;
           } else {
             this.$alert(res.message, "提示", {
               confirmButtonText: "确定",
diff --git a/src/pages/eashier/service/detail/detail.vue b/src/pages/eashier/service/detail/detail.vue
index 1d4964a..42d3350 100644
--- a/src/pages/eashier/service/detail/detail.vue
+++ b/src/pages/eashier/service/detail/detail.vue
@@ -107,6 +107,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         type: 1,
+        storeList:[]
       },
       printForm: {},
       month: "",
@@ -115,9 +116,15 @@ export default {
   },
   methods: {
     exporSyList(){
+      if(!this.queryForm.storeList.length){
+        return this.$message.error({
+          message: "请至少选择一个门店!",
+        });
+      }
       this.exportloading = true
       let params = {
-        cashDate:this.formatTime(this.month, "YYYY-MM-DD hh:mm:ss")
+        cashDate:this.formatTime(this.month, "YYYY-MM-DD hh:mm:ss"),
+        storeIds:this.queryForm.storeList
       }
       exporSyList(params).then(res=>{
         this.exportloading = false
diff --git a/src/pages/eashier/service/detail/editform.vue b/src/pages/eashier/service/detail/editform.vue
index 4f5a546..498f3b8 100644
--- a/src/pages/eashier/service/detail/editform.vue
+++ b/src/pages/eashier/service/detail/editform.vue
@@ -187,7 +187,7 @@
       <!-- 只有补单才需要重发短信 -->
       <el-button type="primary" size="mini" @click="reissueSms()">短信重发</el-button>
       <el-button type="primary" plain size="mini" @click="handleClose">取消</el-button>
-      <el-button :disabled="form.isCancel==1" type="primary" size="mini" @click="confirm()">{{title=='作废'?title:"确定"}}</el-button>
+      <el-button :disabled="form.isCancel==1" type="primary" size="mini" @click="confirm()" :loading="isLoading">{{title=='作废'?title:"确定"}}</el-button>
     </div>
   </el-dialog>
 </template>
@@ -207,6 +207,7 @@ export default {
   components: { staffratio },
   data() {
     return {
+      isLoading:false,
       form: {}, //主对象
       list: [], //主数组
       dialogVisible: false, //弹窗开关
@@ -555,7 +556,9 @@ export default {
           };
           list.push(items);
         });
+        this.isLoading = true
         cashcancel(list).then((res) => {
+          this.isLoading = false
           if (res.code == "000000") {
             this.$message.success({
               message: res.message,
@@ -635,8 +638,9 @@ export default {
           };
           list.push(item2);
         });
-
+        this.isLoading = true
         cashEditStaff(list).then((res) => {
+          this.isLoading = false
           if (res.code == "000000") {
             this.$message.success({
               message: res.message,
diff --git a/src/pages/promotion/components/suit.vue b/src/pages/promotion/components/suit.vue
index 8992763..1171f7b 100644
--- a/src/pages/promotion/components/suit.vue
+++ b/src/pages/promotion/components/suit.vue
@@ -2,10 +2,10 @@
   <div>
     <el-dialog :close-on-click-modal="false" append-to-body v-dialogDrag :title="title" :visible.sync="dialogVisible" width="80%" :before-close="handleClose">
       <div style="text-align: center">
-        <el-transfer style="text-align: left; display: inline-block" v-model="dataList" filterable :left-default-audited="leftData" :right-default-audited="rightData" :render-content="renderFunc" :titles="['门店列表', '适用门店']" :button-texts="['移除', '添加']" :format="{
+        <el-transfer style="text-align: left; display: inline-block" v-model="dataList" filterable :left-default-audited="leftData" :left-default-checked='leftArr' :right-default-audited="rightData" :render-content="renderFunc" :titles="['门店列表', '适用门店']" :button-texts="['移除', '添加']" :format="{
         noAudited: '${total}',
         hasAudited: '${audited}/${total}'
-      }" @change="handleChange" :data="data">
+      }" @change="handleChange" :data="data" @left-check-change="handleLeftChange">
         </el-transfer>
       </div>
       <div class="transferFooter">
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import { organizations } from "@/api/storeManage.js";
+import { organizations,pageStore } from "@/api/storeManage.js";
 export default {
   data() {
     return {
@@ -27,9 +27,11 @@ export default {
       data: [],
       title: "门店列表",
       leftData: [],
+      leftArr:[],
       rightData: [],
       storeList: [],
       backMemberList: [],
+      ascriptionList:[],
       renderFunc(h, option) {
         return (
           <span>
@@ -41,6 +43,24 @@ export default {
   },
 
   methods: {
+    handleLeftChange(arr,value){
+      // let list = []
+      // this.leftArr = arr
+      // this.ascriptionList.forEach(item=>{
+      //   arr.forEach(item2=>{
+      //     if(item2 === item){
+      //       list.push(item)
+      //     }
+      //   })
+      // })
+      // if(list.length){
+      //   list.forEach(item=>{
+      //     this.leftArr = this.leftArr.concat(this.data.filter(item2 => item2.description === item).map(item3=>item3.key))
+      //     let index = this.leftArr.findIndex(item2=>item2===item)
+      //     this.leftArr.splice(index,1)
+      //   })
+      // }
+    },
     //组件传值
     show(form) {
       this.dataList = [];
@@ -92,22 +112,42 @@ export default {
       } else {
         this.backMemberList = [];
       }
-      console.log(this.backMemberList);
+    },
+    updataData(arr){
+      let params = {}
+      pageStore(params).then(res=>{
+        if(res.code = "000000"){
+          this.ascriptionList = res.data
+          let ascriptionList = res.data.filter(item=>item!='无') //归属公司
+          let noAscriptionList = arr.filter(item => !item.description) //没有归属公司的数组
+          let existAscriptionList = arr.filter(item => item.description) //有归属公司的数组
+          let list = []
+          ascriptionList.forEach((item,index)=>{
+            list.push({
+              key:item,
+              storeId:null,
+              disabled:true,
+              storeName:item
+            })
+            list = list.concat( existAscriptionList.filter(item2=>item2.description == item) )
+          })
+          this.data = noAscriptionList.concat(list)
+        }
+      })
     },
     //获取数据
     async getData() {
       let parentId = JSON.parse(sessionStorage.getItem("storeInfo")).id;
       organizations({ pageSize: 999 }).then((res) => {
         res.rows.forEach((item) => {
-          item.key = item.id;
-          item.storeId = item.id;
+          item.key = item.id
+          item.storeId = item.id
         });
-        this.data = res.rows;
+        // this.data = res.rows;
+        this.updataData(res.rows)
       });
     },
   },
-  mounted() {},
-  created() {},
 };
 </script>
 
diff --git a/src/pages/promotion/group/components/edit.vue b/src/pages/promotion/group/components/edit.vue
index 5ad9c5b..018bc58 100644
--- a/src/pages/promotion/group/components/edit.vue
+++ b/src/pages/promotion/group/components/edit.vue
@@ -29,7 +29,7 @@
       </el-form-item>
       <el-form-item label="所属门店：" prop="storeNames">
         <el-select filterable default-first-option v-model="form.storeNames" placeholder="请选择" @change="radioChange" :disabled="title!='添加'">
-          <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
+          <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.storeId">
           </el-option>
         </el-select>
       </el-form-item>
@@ -68,7 +68,7 @@ import staffsles from "@/components/staffList/staff/index";
 import admin from "@/components/staffList/admin/index";
 import member from "@/components/member/index";
 import { partten } from "../../../../../partten/index";
-import { organizations } from "@/api/storeManage.js";
+import { organizations,SysRoleStore } from "@/api/storeManage.js";
 export default {
   components: {
     member,
@@ -275,12 +275,15 @@ export default {
 
     //获取数据
     async getData() {
-      organizations({ pageSize: 999 }).then((res) => {
+      let params = {
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      SysRoleStore(params).then((res) => {
         if (res.code == "000000") {
-          res.rows.forEach((item) => {
+          res.pageInfo.list.forEach((item) => {
             item.label = item.storeNum + "-" + item.storeName;
           });
-          this.options = res.rows;
+          this.options = res.pageInfo.list;
         } else {
           this.$alert(res.message, "提示", {
             confirmButtonText: "确定",
diff --git a/src/pages/promotion/packing/packing.vue b/src/pages/promotion/packing/packing.vue
index 7280b88..662b5f9 100644
--- a/src/pages/promotion/packing/packing.vue
+++ b/src/pages/promotion/packing/packing.vue
@@ -1423,7 +1423,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
 .packing .el-date-editor.el-input,
 .packing .el-date-editor.el-input__inner {
   width: 150px;
diff --git a/src/pages/promotion/sellpacking/sellpackingTable.vue b/src/pages/promotion/sellpacking/sellpackingTable.vue
index 9e6b4ff..ff19d60 100644
--- a/src/pages/promotion/sellpacking/sellpackingTable.vue
+++ b/src/pages/promotion/sellpacking/sellpackingTable.vue
@@ -190,6 +190,7 @@ export default {
       options: [],
       proList: [],
       queryForm: {
+        storeList:[],
         storeType: 0,
         pageSize: 10, // 每页的数据条数,
         pageNum: 1, // 当前页码
@@ -243,11 +244,17 @@ export default {
 
   methods: {
     handleExportShow(){
+      if(!this.queryForm.storeList.length){
+        return this.$message.error({
+          message: "请至少选择一个门店导出!",
+        });
+      }
       this.$refs.dateExport.show()
     },
     handleDateExport(val){
       let params = {
-        strDate:this.formatTime(val, "YYYY-MM")
+        strDate:this.formatTime(val, "YYYY-MM"),
+        storeIds:this.queryForm.storeList
       }
       exportDocPromotion(params).then(res=>{
         this.exportLoad = false
@@ -297,7 +304,11 @@ export default {
       //条件搜索
       this.searchForm.pageNum = this.queryForm.pageNum;
       this.searchForm.pageSize = this.queryForm.pageSize;
-      docPromotionPageNew(this.searchForm).then((res) => {
+      let params = {
+        ...this.searchForm,
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      docPromotionPageNew(params).then((res) => {
         if (res.code == "000000") {
           this.refreshtext = true;
           this.list = res.pageInfo.list;
@@ -370,7 +381,11 @@ export default {
     },
     //获取单据数据
     getList() {
-      docPromotionPageNew(this.queryForm).then((res) => {
+      let params = {
+        ...this.searchForm,
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      docPromotionPageNew(params).then((res) => {
         //console.log(res);
         if (res.code == "000000") {
           this.list = res.pageInfo.list;
diff --git a/src/pages/statistics/courseStatistics/components/Edit.vue b/src/pages/statistics/courseStatistics/components/Edit.vue
new file mode 100644
index 0000000..4b74623
--- /dev/null
+++ b/src/pages/statistics/courseStatistics/components/Edit.vue
@@ -0,0 +1,164 @@
+<template>
+  <el-dialog :title="title+'项目类别'" :visible.sync="dialogFormVisible" width="500px" :before-close="handleClose">
+
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form-item label="上级" prop="parentId" v-if="!form.children">
+        <treeselect v-model="form.parentId" :options="options" :disable-branch-nodes="false" :show-count="true" :normalizer="normalizer" :flatten-search-results="false" noOptionsText="无上级可选" placeholder="请选择上级" />
+      </el-form-item>
+      <el-form-item label="编码：" prop='projectTypeNum'>
+        <el-input ref="projectTypeNum" type="number" v-model="form.projectTypeNum" autocomplete="on" style="width:200px"></el-input>
+      </el-form-item>
+      <el-form-item label="名称：" prop='projectTypeName'>
+        <el-input v-model="form.projectTypeName" autocomplete="on" style="width:200px"></el-input>
+      </el-form-item>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleClose" size="mini">取 消</el-button>
+      <el-button type="primary" size="mini" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Treeselect from "@riophae/vue-treeselect";
+import { handleTree } from "@/utils/index";
+import {
+  proTypepage,
+  proTypeStates,
+  addproType,
+  delproType,
+  editproType,
+  proTypeDownload,
+  proTypeExport,
+  proTypeImport,
+} from "@/api/storeManage.js";
+
+export default {
+  name: "DeptEdit",
+  components: { Treeselect },
+  data() {
+    return {
+      form: {}, //主对象
+      rules: {
+        projectTypeNum: [
+          {
+            required: true,
+            message: "请输入项目类别编码",
+            trigger: ["blur", "change"],
+          },
+        ],
+        deptName: [
+          {
+            required: true,
+            message: "请输入项目类别名称",
+            trigger: ["blur", "change"],
+          },
+        ],
+      },
+      title: "", //弹窗标题
+      dialogFormVisible: false, //弹窗开关
+      options: [],
+    };
+  },
+  methods: {
+    //关闭弹窗前的回调方法
+    handleClose() {
+      this.form = {};
+      this.dialogFormVisible = false;
+      this.$refs.form.clearValidate();
+    },
+    async fetchData() {
+      await proTypepage({ pageSize: 9999 }).then((res) => {
+        if (res.code == "000000") {
+          let list = [];
+          res.pageInfo.list.forEach((item) => {
+            if (this.form.projectTypeNum == item.projectTypeNum) {
+            } else {
+              list.push(item);
+            }
+          });
+          this.options = handleTree(
+            list,
+            "projectTypeNum",
+            "parentId",
+            "children",
+            0
+          );
+        }
+      });
+    },
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.projectTypeNum + "--" + node.projectTypeName,
+        children: node.children,
+      };
+    },
+    //组件传值
+    show(row) {
+      this.form = Object.assign({});
+      if (row == "添加") {
+        this.title = row;
+      } else {
+        this.title = "修改";
+        this.form = Object.assign({}, row);
+        if (this.form.parentId == 0) {
+          this.form.parentId = null;
+        }
+      }
+      setTimeout(() => {
+        this.$refs.projectTypeNum.focus();
+        this.$refs.projectTypeNum.select();
+        this.$refs.form.clearValidate();
+      }, 300);
+      this.fetchData();
+      this.dialogFormVisible = true;
+    },
+    close() {
+      this.$refs["form"].resetFields();
+      this.form = this.$options.data().form;
+      this.dialogFormVisible = false;
+    },
+    //保存确定方法
+    save() {
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          if (this.title == "添加") {
+            await addproType(this.form).then((res) => this.callbackFun(res));
+          } else {
+            var form = {
+              id: this.form.id,
+              projectTypeName: this.form.projectTypeName,
+              projectTypeNum: this.form.projectTypeNum,
+              parentId: this.form.parentId,
+            };
+            await editproType(form).then((res) => this.callbackFun(res));
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    callbackFun(res) {
+      if (res.code == "000000") {
+        this.$message.success({ message: this.title + "成功" });
+        this.$emit("editData");
+        this.close();
+      } else {
+        this.$alert(res.message, "提示", {
+          confirmButtonText: "确定",
+          confirmButtonClass: "confirmbtnFalses",
+          type: "warning",
+          center: true,
+          callback: (action) => {},
+        });
+      }
+    },
+  },
+};
+</script>
diff --git a/src/pages/statistics/courseStatistics/components/dateExport.vue b/src/pages/statistics/courseStatistics/components/dateExport.vue
new file mode 100644
index 0000000..b079e24
--- /dev/null
+++ b/src/pages/statistics/courseStatistics/components/dateExport.vue
@@ -0,0 +1,76 @@
+<template>
+    <div>
+      <el-dialog title="导出" :visible.sync="searchDialog" :modal-append-to-body="false" append-to-body :close-on-click-modal="false">
+        <el-form :model="searchForm">
+          <el-form-item label="请选择日期:" label-width="120px">
+            <div class="block">
+              <el-date-picker style="width: 2rem;" @change='changeDate' size="large" v-model="date" type="daterange" align="center" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" >
+              </el-date-picker>
+            </div>
+          </el-form-item>
+          <el-form-item label="请选择门店:" label-width="120px">
+            <div class="block">
+              <selec @selecData="selecData"/>
+            </div>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button size="mini" type="primary" plain @click="searchDialog = false">取 消</el-button>
+          <el-button type="primary" size="mini" @click="search ">确 定</el-button>
+        </span>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import selec from "@/components/store/select/index";
+  export default {
+    components:{
+      selec
+    },
+    data() {
+      return {
+          searchDialog:false,
+          storeIds:[],
+          searchForm:{},
+          date:[new Date(),new Date()]
+      }
+    },
+    methods: {
+      selecData(v){
+        this.storeIds = v
+      },
+      show(){
+          this.searchDialog = true
+          this.date = [new Date(),new Date()]
+      },
+      search(){
+        if(!this.date){
+          this.$message.warning({ message: "请选择正确日期" });
+        }else{
+          if(!this.storeIds.length){
+            this.$message.warning({ message: "请选择门店" });
+          }else{
+            this.searchDialog = false
+            let date1 = this.formatTime(this.date[0], "YYYY-MM-DD 00:00:00");
+            let date2 = this.formatTime(this.date[1], "YYYY-MM-DD 23:59:59");
+            let params = {
+              storeIds:this.storeIds,
+              startTime:date1,
+              endTime:date2
+            }
+            this.$emit('confirmExport',params)
+          }
+        }
+      },
+      changeDate(date){
+          if(!date){
+              this.date = []
+          }
+      }
+    },
+  }
+  </script>
+  <style scoped>
+  
+  </style>
\ No newline at end of file
diff --git a/src/pages/statistics/courseStatistics/components/select.vue b/src/pages/statistics/courseStatistics/components/select.vue
deleted file mode 100644
index ec3b038..0000000
--- a/src/pages/statistics/courseStatistics/components/select.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <div>
-    <el-dialog title="搜索" :visible.sync="searchDialog">
-      <el-form :model="searchForm">
-        <el-form-item label="单据号搜索:" label-width="120px">
-          <div class="searchDiv">
-            <el-input size="medium" v-model="searchForm.refundNum" placeholder="输入要查询的单据号" clearable></el-input>
-          </div>
-        </el-form-item>
-        <el-form-item label="跟单人员:" label-width="120px">
-          <div class="searchDiv">
-            <el-input size="medium" v-model="searchForm.memberName" placeholder="输入跟单人员" clearable></el-input>
-          </div>
-        </el-form-item>
-        <el-form-item label="次数金额:" label-width="120px">
-          <div class="searchDiv">
-            <el-input size="medium" v-model="searchForm.mobilePhone" placeholder="输入次数金额" oninput="this.value=this.value.replace(/\D/g,'')" maxlength="11" pattern="[0-9]*" clearable></el-input>
-          </div>
-        </el-form-item>
-        <el-form-item label="单据日期搜索:" label-width="120px">
-          <div class="block">
-            <el-date-picker style="width:1.25rem" @change='changeDate' size="large" v-model="searchForm.date" type="daterange" :default-time="['00:00:01', '23:59:59']" value-format="yyyy-MM-dd HH:mm:ss" align="center" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" >
-            </el-date-picker>
-          </div>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" type="primary" plain @click="searchDialog = false">取 消</el-button>
-        <el-button type="primary" size="mini" @click="search(searchDialog = false) ">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-        searchDialog:false,
-        searchForm:{}
-    }
-  },
-  methods: {
-    show(){
-        this.searchDialog = true
-    },
-    search(){},
-    changeDate(date){
-        if(!date){
-            this.searchForm.date = ''
-        }
-    }
-  },
-}
-</script>
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/pages/statistics/courseStatistics/index.vue b/src/pages/statistics/courseStatistics/index.vue
index eaae954..290ea5b 100644
--- a/src/pages/statistics/courseStatistics/index.vue
+++ b/src/pages/statistics/courseStatistics/index.vue
@@ -1,75 +1,481 @@
 <template>
+  <div class="proType">
+    <div class="header_flex">
+    </div>
+    <el-table style="width: 100%;margin-top:5px" max-height="700" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" ref="deptRef" border v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText" default-expand-all row-key="id" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" @row-click="handleRowClick">
+      <el-table-column align="center" prop="projectTypeNum" sortable label="编码" min-width="100"></el-table-column>
+      <el-table-column align="center" prop="projectTypeName" :show-overflow-tooltip="true" label="名称" min-width="100"></el-table-column>
+      <el-table-column align="center" fixed="right" label="操作" width="76" >
+        <template slot-scope="scope">
+          <el-button size="mini" type="primary" @click="handleExport(scope.row)" plain>导出</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
     <div>
-      <div class="staffRanking_header padding-bottom-xs">
-        <div></div>
-        <div class="block">
-          <el-date-picker
-            v-model="Time"
-            placeholder="选择月份"
-            type="month" 
-            range-separator="至"
-            >
-          </el-date-picker>
-          <el-button size="mini" type="primary" @click="selectShow">高级搜索</el-button>
-          <el-button size="mini" type="primary" @click="exit">导出</el-button>
+      <el-dialog :close-on-click-modal="false" title="修改" :visible.sync="dialogFormVisible" width="50%" v-dialogDrag>
+        <el-form :model="editForm">
+          <el-form-item label="编码：" :label-width="formLabelwidth">
+            <el-input oninput="this.value=this.value.replace(/[^\w_]/g,'');" v-model="editForm.projectTypeNum" style="width:200px" autocomplete="on" :disabled="true">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="名称：" :label-width="formLabelwidth">
+            <el-input v-model="editForm.projectTypeName" style="width:200px" autocomplete="on"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button size="mini" type="primary" @click="dialogFormVisible = false">取 消</el-button>
+          <el-button size="mini" type="primary" @click="confirm(dialogFormVisible=false)">确 定</el-button>
         </div>
-      </div>
-      <el-table v-loading="loading" :data="list" :header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee', }" show-summary border max-height="600" ref="table">
-        <el-table-column align="center" min-width="80" prop="storeNum" label="门店" ></el-table-column>
-        <el-table-column align="center" min-width="100" prop="storeName" label="日期" ></el-table-column>
-        <el-table-column align="center" min-width="90" prop="date" label="顾客姓名"></el-table-column>
-        <el-table-column align="center" min-width="50" prop="allRows" label="项目名称"></el-table-column>
-        <el-table-column align="center" min-width="50" prop="cashRows" label="数量"></el-table-column>
-        <el-table-column align="center" min-width="50" prop="courseRows" label="会员编码"></el-table-column>
-        <el-table-column align="center" min-width="50" prop="rechargeRows" label="单据号"></el-table-column>
-        <el-table-column align="center" min-width="60" prop="allCashNumber" label="业绩（元）"></el-table-column>
-        <el-table-column align="center" min-width="50" prop="cashManNumber" label="次数"></el-table-column>
-        <el-table-column align="center" min-width="50" prop="cashWomanNumber" label="员工工号"></el-table-column>
-        <el-table-column align="center" min-width="95" prop="allAmount" label="跟蛋管理层"></el-table-column>
-        <el-table-column align="center" min-width="95" prop="allCardAmount" label="专家组老师"></el-table-column>
-        <el-table-column align="center" min-width="75" prop="allRepayAmount" label="备注"></el-table-column>
-      </el-table>
-      <select-dialog ref="select" />
+      </el-dialog>
     </div>
-  </template>
-  <script>
-  import selectDialog from './components/select.vue'
-  export default {
-    components:{
-      selectDialog
-    },
-    data() {
-      return {
-        loading: false,
-        list: [],
-        Time:new Date()
-      };
-    },
-    methods:{
-      selectShow(){
-        this.$refs.select.show()
-      },
-      dateChange(date){
-      },
-      exit(){
+    <el-dialog title="搜索" :visible.sync="searchDialog">
+      <el-form :model="searchForm">
+        <el-form-item label="类别名称搜索:" label-width="120px">
+          <div class="searchDiv">
+            <el-input size="medium" v-model="searchForm.projectTypeName" placeholder="输入要查询的项目类别名称" clearable></el-input>
+          </div>
+        </el-form-item>
+        <el-form-item label="根据状态搜索:" label-width="120px">
+          <div class="searchDiv">
+            <el-radio-group v-model="searchForm.state" fill="#f78989">
+              <el-radio :label="1" @click.native.prevent="clickitem(1)" size="medium" type="primary">启用中</el-radio>
+              <el-radio :label="0" @click.native.prevent="clickitem(0)" size="medium" type="primary">已停用</el-radio>
+            </el-radio-group>
+          </div>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" type="primary" plain @click="searchDialog = false">取 消</el-button>
+        <el-button type="primary" size="mini" @click="search(searchDialog = false) ">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog title="导入表格" :visible.sync="infoDialog" :close-on-click-modal='false'>
+      <excel @fileData='fileData' @infoDialogV='infoDialogV'></excel>
+    </el-dialog>
+
+    <el-dialog title="导入提示" :visible.sync="infoErrorDialog">
+      <span>以下导入的项目类别的 <q>编码</q> 或者 <q>名称</q> 存在重复 , 请检查修改后重新导入</span>
+      <el-table :data="infoList">
+        <el-table-column align="center" prop="projectTypeNum" label="编码" sortable min-width="100">
+        </el-table-column>
+        <el-table-column align="center" prop="projectTypeName" :show-overflow-tooltip="true" label="名称" min-width="100"></el-table-column>
+        <el-table-column align="center" label="状态" min-width="80" v-role='4004005'>
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.state" active-text="启用 " inactive-text="停用" :active-value="1" :inactive-value="0" inactive-color="#cccccc" class="demo" @change="state(scope.row)" />
+          </template>
+        </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" type="primary" plain @click="infoErrorDialog = false">关 闭</el-button>
+      </span>
+    </el-dialog>
+    <edit ref="edit" @editData="getData"></edit>
+    <date-export ref="dateExport" @confirmExport="handleDateExport"/>
+  </div>
+</template>
+<style>
+.proType .el-table th {
+  padding: 5px 0;
+}
+</style>
+<script>
+import edit from "./components/Edit.vue";
+import excel from "@/components/excel";
+import { handleTree } from "@/utils/index";
+import dateExport from './components/dateExport.vue'
+import {
+  proTypepage,
+  proTypeStates,
+  delproType,
+  proTypeDownload,
+  proTypeExport,
+  proTypeImport,
+  queryTree,
+  groupCourse
+} from "@/api/storeManage.js";
+export default {
+  components: {
+    excel,
+    edit,
+    dateExport
+  },
+  data() {
+    return {
+      currentRow:null,
+      listLoading: true,
+      elementLoadingText: "正在加载...",
+      dialogFormVisible: false, //弹窗开关
+      addialogFormVisible: false,
+      searchDialog: false, //搜索弹窗开关
+      refreshtext: false, //搜索判断字符
+      infoErrorDialog: false,
+      infoList: [],
+      headOffice: sessionStorage.getItem("headOffice") * 1,
+      searchForm: {
+        //搜索表单
+        state: 1,
+        projectTypeName: "",
       },
-      timestampToTime(timestamp) {
-        const date = new Date(timestamp);
-        const year = date.getFullYear();
-        const month = ("0" + (date.getMonth() + 1)).slice(-2);
-        const day = ("0" + date.getDate()).slice(-2);
-        const hour = ("0" + date.getHours()).slice(-2);
-        const minute = ("0" + date.getMinutes()).slice(-2);
-        const second = ("0" + date.getSeconds()).slice(-2);
-        const formattedTime = `${year}-${month}-${day}`;
-        return formattedTime;
+      value1: 0,
+      date: [],
+      list: [], //主数组
+      formLabelwidth: "180px",
+      formLabelwidth1: "180px",
+      pageNum: 1, // 当前页码
+      total: 0, //分页总条数 // 总条数
+      pageSize: 999, // 每页的数据条数,
+      editForm: [],
+      addForm: {},
+      pageInfo: {
+        total: 0, //分页总条数
+        tableList: [],
       },
-      init(){
-        this.loading = true
+      searchTrue: false, //搜索判断
+      infoDialog: false, //上传文件弹窗开关
+    };
+  },
+  methods: {
+    handleDateExport(v){
+      let params = {
+        ...v,
+        projectType:this.currentRow.id
+      }
+      console.log(params)
+      groupCourse(params).then(res=>{
+        let blob = new Blob([res]);
+        var a = document.createElement("a");
+        var url = window.URL.createObjectURL(blob);
+        console.log(url);
+        a.href = url;
+        a.download = "疗程统计导出表.xlsx";
+        a.click();
+        window.URL.revokeObjectURL(url);
+      })
+    },
+    handleExport(row){
+      this.currentRow = {...row}
+      this.$refs.dateExport.show()
+    },
+    handleRowClick(row, event, column) {
+      this.$refs.deptRef.toggleRowExpansion(row);
+    },
+    //树形组件子集自定义返回方法
+    hasChildren(row) {
+      if (row.children) {
+        return true;
+      }
+      return false;
+    },
+
+    clickitem(e) {
+      e === this.searchForm.state
+        ? (this.searchForm.state = null)
+        : (this.searchForm.state = e);
+    },
+    //下载模板方法
+    download() {
+      proTypeDownload().then((res) => {
+        let blob = new Blob([res]);
+        console.log(blob);
+        var a = document.createElement("a");
+        var url = window.URL.createObjectURL(blob);
+        console.log(url);
+        a.href = url;
+        a.download = "项目类别模板.xlsx";
+        a.click();
+        window.URL.revokeObjectURL(url);
+      });
+    },
+
+    //导出方法
+    exit() {
+      if (this.searchForm.projectTypeName == "") {
+        delete this.searchForm.projectTypeName;
+      }
+      proTypeExport(this.searchForm).then((res) => {
+        let blob = new Blob([res]);
+        var a = document.createElement("a");
+        var url = window.URL.createObjectURL(blob);
+        console.log(url);
+        a.href = url;
+        a.download = "项目类别导出表.xlsx";
+        a.click();
+        window.URL.revokeObjectURL(url);
+      });
+    },
+    //上传文件方法
+    fileData(v) {
+      console.log(v);
+      var fileData = new FormData();
+      if (v == null) {
+        this.$alert("请选择需要上传的文件", "提示", {
+          confirmButtonText: "确定",
+          confirmButtonClass: "confirmbtnFalses",
+          type: "warning",
+          center: true,
+          callback: (action) => {},
+        });
+      } else {
+        fileData.append("multipartFile", v);
+        proTypeImport(fileData).then((res) => {
+          if (res.rows != undefined) {
+            this.infoList = res.rows;
+            this.infoErrorDialog = true;
+          } else {
+            if (res.code == "000000") {
+              this.$message.success({
+                message: res.message,
+              });
+
+              this.getData();
+            } else {
+              this.$alert(res.message, "提示", {
+                confirmButtonText: "确定",
+                confirmButtonClass: "confirmbtnFalses",
+                type: "warning",
+                center: true,
+                callback: (action) => {},
+              });
+            }
+          }
+        });
+      }
+    },
+    //返回上传文件弹窗状态
+    infoDialogV(v) {
+      this.infoDialog = v;
+    },
+    //搜索方法
+    search() {
+      //条件搜索
+      proTypepage(this.searchForm).then((res) => {
+        if (res.code == "000000") {
+          this.searchTrue = true;
+          this.list = res.pageInfo.list;
+          this.pageInfo = res.pageInfo;
+          if (res.pageInfo.total == 0) {
+            this.$message.warning({
+              message: "没有找到相对应的项目类别",
+            });
+          }
+        } else {
+          this.$message.error({
+            message: res.message,
+          });
+        }
+      });
+    },
+    change(value) {
+      var da = new Date(value).toLocaleString("chinese", {
+        hour12: false,
+      });
+      //console.log(da);
+      //  if(da.indexOf("上午")||da.indexOf("下午")){
+      //    //console.log("有上午或者下午");
+      //  }
+      this.date = da;
+    },
+    //编辑
+    edit(row) {
+      this.$refs.edit.show(row);
+    },
+    //删除
+    del(row) {
+      var id = {
+        id: row.id,
+      };
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        cancelButtonClass: "cancelbtnFalses",
+        confirmButtonClass: "confirmbtnFalses",
+      })
+        .then(() => {
+          delproType(id).then((res) => {
+            if (res.code == "000000") {
+              this.$message.success({
+                message: row.projectTypeName + "  删除成功!",
+              });
+              if (this.pageInfo.total % this.pageSize == 1) {
+                this.pageNum = this.pageNum - 1;
+              }
+              this.getData();
+            } else {
+              this.$alert(res.message, "提示", {
+                confirmButtonText: "确定",
+                confirmButtonClass: "confirmbtnFalses",
+                type: "warning",
+                center: true,
+                callback: (action) => {},
+              });
+            }
+          });
+        })
+        .catch(() => {
+          this.$message.info({
+            message: "已取消操作！",
+          });
+        });
+    },
+
+    //状态 0 1
+    state(row) {
+      var state = {
+        id: row.id,
+        state: row.state,
+      };
+      if (row.state == 0) {
+        this.$confirm(
+          "如有该项目类别的项目在启用中，不能停用此项目类别, 是否继续?",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+            cancelButtonClass: "cancelbtnFalses",
+            confirmButtonClass: "confirmbtnFalses",
+          }
+        )
+          .then(() => {
+            proTypeStates(state).then((res) => {
+              //console.log(res);
+              if (res.code == "000000") {
+                this.getData();
+                this.$message({
+                  type: "success",
+                  message: "项目类别已停用",
+                });
+              } else {
+                this.$alert(res.message, "提示", {
+                  confirmButtonText: "确定",
+                  confirmButtonClass: "confirmbtnFalses",
+                  type: "warning",
+                  center: true,
+                  callback: (action) => {},
+                });
+                this.getData();
+              }
+            });
+          })
+          .catch(() => {
+            row.state = 1;
+            this.$message({
+              type: "info",
+              message: "取消停用!",
+            });
+          });
+      } else {
+        this.$confirm("启用项目类别, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+          cancelButtonClass: "cancelbtnFalses",
+          confirmButtonClass: "confirmbtnFalses",
+        })
+          .then(() => {
+            proTypeStates(state).then((res) => {
+              //console.log(res);
+              if (res.code == "000000") {
+                this.getData();
+                this.$message({
+                  type: "success",
+                  message: "启用成功!",
+                });
+              } else {
+                this.$alert(res.message, "提示", {
+                  confirmButtonText: "确定",
+                  confirmButtonClass: "confirmbtnFalses",
+                  type: "warning",
+                  center: true,
+                  callback: (action) => {},
+                });
+              }
+            });
+          })
+          .catch(() => {
+            row.state = 0;
+            this.$message({
+              type: "info",
+              message: "取消启用",
+            });
+          });
+      }
+    },
+    //分页方法
+    handleSizeChange(val) {
+      this.pageSize = val;
+      if (this.searchTrue == true) {
+        this.search();
+      } else {
+        this.getData();
+      }
+    },
+    handleCurrentChange(val) {
+      this.pageNum = val;
+      if (this.searchTrue == true) {
+        this.search();
+      } else {
+        this.getData();
+      }
+    },
+    //获取数据
+    async getData() {
+      var page = {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+      };
+      queryTree().then();
+      proTypepage(page).then((res) => {
+        this.listLoading = false;
+        if (res.code == "000000") {
+          if (this.refreshtext == true) {
+            this.$message.success({
+              message: "已刷新最新数据",
+            });
+            this.refreshtext = false;
+            this.searchTrue = false;
+          }
+          let list = [
+            { id: "1", projectTypeNum: "1001", parentId: 0 },
+            { id: "1002", projectTypeNum: "1002", parentId: "1" },
+            { id: "1003", projectTypeNum: "1003", parentId: "1" },
+            { id: "1004", projectTypeNum: "1004", parentId: "1" },
+          ];
+          res.pageInfo.list.forEach((item) => {
+            // console.log(JSON.parse(JSON.stringify(item)));
+            if (!item.parentId) {
+              item.parentId = 0;
+            }
+          });
+          this.list = handleTree(
+            res.pageInfo.list,
+            "id",
+            "parentId",
+            "children",
+            0
+          );
+          this.pageInfo = res.pageInfo;
+        } else {
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      });
+    },
+  },
+
+  created() {
+    let list = JSON.parse(sessionStorage.getItem("list"));
+    list.forEach((item) => {
+      if (item.id == 4004001) {
+        this.getData();
       }
-    }
-  };
-  </script>
-   
-<style scoped>
-</style>
\ No newline at end of file
+    });
+  },
+};
+</script>
diff --git a/src/pages/statistics/negativeCard/negativeCard.vue b/src/pages/statistics/negativeCard/negativeCard.vue
index 3995fd7..9edfb21 100644
--- a/src/pages/statistics/negativeCard/negativeCard.vue
+++ b/src/pages/statistics/negativeCard/negativeCard.vue
@@ -2,7 +2,7 @@
   <!-- 负卡金 -->
   <div>
     <el-select  v-if="isTrue == 1" ref="select" collapse-tags filterable default-first-option :multiple='true' v-model="storeId" clearable @clear="getData" placeholder="请选择门店" @change="getData">
-      <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
+      <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.storeId">
       </el-option>
     </el-select>
     <div>
@@ -41,7 +41,7 @@
       <div>
         <el-table :data="tableDate1" 
           :header-cell-style="{ background: 'linear-gradient(#6cb3ff, #1873d4)', color: '#eeeeee' }" style="margin-bottom: 10%; width: 90%;
-    margin-left: 5%;">
+            margin-left: 5%;">
           <el-table-column align="center" label="疗程">
             <el-table-column align="center" prop="openning" label="期初"></el-table-column>
             <el-table-column align="center" prop="storeName" label="门店"></el-table-column>
@@ -88,7 +88,7 @@
 
 <script>
 import { partten } from "../../../../partten/index";
-import { organizations } from "@/api/storeManage.js";
+import { organizations,SysRoleStore } from "@/api/storeManage.js";
 import { dayStatisticRecharge, dayStatisticTreatment } from "../../../api/statistics.js";
 export default {
   data() {
@@ -103,12 +103,15 @@ export default {
   },
   methods: {
     init(){
-      organizations({ pageSize: 999 }).then((res) => {
+      let params = {
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      SysRoleStore(params).then((res) => {
         if (res.code == "000000") {
-          res.rows.forEach((item) => {
+          res.pageInfo.list.forEach((item) => {
             item.label = item.storeNum + "-" + item.storeName;
           });
-          this.options = res.rows;
+          this.options = res.pageInfo.list;
         } else {
           this.$alert(res.message, "提示", {
             confirmButtonText: "确定",
@@ -118,7 +121,7 @@ export default {
             callback: (action) => {},
           });
         }
-      });        
+      });       
     },
     getData(ids){
       if(ids){
diff --git a/src/pages/statistics/projectRanking/projectRanking.vue b/src/pages/statistics/projectRanking/projectRanking.vue
index a81183b..b4f025b 100644
--- a/src/pages/statistics/projectRanking/projectRanking.vue
+++ b/src/pages/statistics/projectRanking/projectRanking.vue
@@ -5,7 +5,7 @@
       <div class="block">
         <span class="demonstration padding-left-xs">选择日</span>
         <el-select v-if="headOffice" ref="select" collapse-tags filterable default-first-option :multiple='true' v-model="storeId" clearable placeholder="请选择门店">
-          <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
+          <el-option v-for="(item,index) in options" :key="index" :label="item.storeNum + '-' + item.storeName" :value="item.storeId">
           </el-option>
         </el-select> 
         <el-date-picker v-model="date" type="month" value-format="yyyyMM" :clearable="false">
@@ -66,7 +66,7 @@ import {
   serviceActive,
   balance
 } from "../../../api/statistics.js";
-import { organizations } from "@/api/storeManage.js";
+import { organizations,SysRoleStore } from "@/api/storeManage.js";
 export default {
   data() {
     return {
@@ -147,14 +147,14 @@ export default {
       })
     },
     getStoreInit(){
-      organizations({ pageSize: 999 }).then((res) => {
+      let params = {
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      SysRoleStore(params).then((res) => {
         if (res.code == "000000") {
-          res.rows.forEach((item) => {
-            item.label = item.storeNum + "-" + item.storeName;
-          });
-          this.options = res.rows;
+          this.options = res.pageInfo.list;
         } else {
-          this.$alert(res.message, "提示", {
+          this.$alert(res.message, "获取门店信息", {
             confirmButtonText: "确定",
             confirmButtonClass: "confirmbtnFalses",
             type: "warning",
diff --git a/src/pages/statistics/staffBrokerage/staffBrokerage.vue b/src/pages/statistics/staffBrokerage/staffBrokerage.vue
index 1d8f9a7..305c878 100644
--- a/src/pages/statistics/staffBrokerage/staffBrokerage.vue
+++ b/src/pages/statistics/staffBrokerage/staffBrokerage.vue
@@ -8,8 +8,8 @@
         <el-button size="mini" @click="del" type="primary" v-role="6006001">删除</el-button>
       </div>
       <div class="block">
-        <el-select filterable default-first-option clearable v-model="storeId" placeholder="请选择" v-if="headOffice">
-          <el-option v-for="(item,index) in options" :key="index" :label="item.storeNum + '-' + item.storeName" :value="item.id">
+        <el-select filterable default-first-option clearable v-model="storeId" placeholder="请选择" v-if="headOffice" multiple collapse-tags>
+          <el-option v-for="(item,index) in options" :key="index" :label="item.storeNum + '-' + item.storeName" :value="item.storeId">
           </el-option>
         </el-select>
         <span class="demonstration padding-left-xs">选择日</span>
@@ -25,6 +25,11 @@
         background: 'linear-gradient(#6cb3ff, #1873d4)',
         color: '#eeeeee',
       }" :summary-method="getSummaries" show-summary border max-height="700">
+      <el-table-column align="center" prop="brandNumber" label="门店" min-width="120" v-if="headOffice">
+        <template slot-scope="scope">
+          {{ scope.row.storeNum +'--'+ scope.row.storeName }}
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="brandNumber" label="水牌号"></el-table-column>
       <el-table-column align="center" prop="staffName" label="员工名称"></el-table-column>
       <el-table-column align="center" min-width="80" prop="baseSalary" label="底薪">
@@ -134,7 +139,7 @@ import {
   exportachi,
   exportachiwhole,
 } from "@/api/statistics.js";
-import { organizations } from "@/api/storeManage.js";
+import { organizations,SysRoleStore } from "@/api/storeManage.js";
 import { partten } from "../../../../partten/index";
 import perform from "./examine/index";
 export default {
@@ -190,9 +195,12 @@ export default {
   },
   methods: {
     async getData() {
-      organizations({ pageSize: 999 }).then((res) => {
+      let params = {
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      SysRoleStore(params).then((res) => {
         if (res.code == "000000") {
-          this.options = res.rows;
+          this.options = res.pageInfo.list;
         } else {
           this.$alert(res.message, "获取门店信息", {
             confirmButtonText: "确定",
@@ -210,7 +218,7 @@ export default {
       let date2 = this.formatTime(this.days[1], "YYYY-MM-DD 23:59:59");
       let form = { startDate: date1, endDate: date2 };
       if(this.storeId){
-        form.storeId = this.storeId
+        form.storeIds = this.storeId
       }
       exportachi(form).then((res) => {
         let blob = new Blob([res]);
@@ -227,7 +235,7 @@ export default {
       let date1 = this.formatTime(this.days[0], "YYYY-MM-DD 00:00:00");
       let date2 = this.formatTime(this.days[1], "YYYY-MM-DD 23:59:59");
       let form = { startDate: date1, endDate: date2 };
-      if(this.storeId)form.storeId = this.storeId
+      if(this.storeId)form.storeIds = this.storeId
       exportachiwhole(form).then((res) => {
         let blob = new Blob([res]);
         var a = document.createElement("a");
@@ -296,7 +304,7 @@ export default {
       let month = this.formatTime(this.month, "YYYY-MM");
       this.loading = true
       this.disabled = true
-      if(this.storeId)form.storeId = this.storeId
+      if(this.storeId)form.storeIds = this.storeId
       achiCommListsgroup(form).then((res) => {
         this.loading = false
         this.disabled = false
diff --git a/src/pages/statistics/storeTotalPerformance/index.vue b/src/pages/statistics/storeTotalPerformance/index.vue
index fec6dae..f4c7055 100644
--- a/src/pages/statistics/storeTotalPerformance/index.vue
+++ b/src/pages/statistics/storeTotalPerformance/index.vue
@@ -31,16 +31,16 @@
           <el-table-column align="center" min-width="50" prop="cashManNumber" label="男客"></el-table-column>
           <el-table-column align="center" min-width="50" prop="cashWomanNumber" label="女客"></el-table-column>
         </el-table-column>
-        <el-table-column align="center" min-width="75" prop="allAmount" label="实际营业额"></el-table-column>
-        <el-table-column align="center" min-width="75" prop="allCardAmount" label="总卡付金额"></el-table-column>
-        <el-table-column align="center" min-width="75" prop="allRepayAmount" label="还款总金额"></el-table-column>
+        <el-table-column align="center" min-width="95" prop="allAmount" label="实际营业额"></el-table-column>
+        <el-table-column align="center" min-width="95" prop="allCardAmount" label="总卡付金额"></el-table-column>
+        <el-table-column align="center" min-width="95" prop="allRepayAmount" label="还款总金额"></el-table-column>
 
         <el-table-column align="center" label="疗程">
-          <el-table-column align="center" min-width="75" prop="allCourseAmount" label="总金额"></el-table-column>
-          <el-table-column align="center" min-width="75" prop="courseCashAmount" label="实收金额"></el-table-column>
-          <el-table-column align="center" min-width="75" prop="courseRepayAmount" label="还款金额"></el-table-column>
-          <el-table-column align="center" min-width="75" prop="courseDebtAmount" label="下欠金额"></el-table-column>
-          <el-table-column align="center" min-width="75" prop="courseCardAmount" label="卡付金额"></el-table-column>
+          <el-table-column align="center" min-width="85" prop="allCourseAmount" label="总金额"></el-table-column>
+          <el-table-column align="center" min-width="85" prop="courseCashAmount" label="实收金额"></el-table-column>
+          <el-table-column align="center" min-width="85" prop="courseRepayAmount" label="还款金额"></el-table-column>
+          <el-table-column align="center" min-width="85" prop="courseDebtAmount" label="下欠金额"></el-table-column>
+          <el-table-column align="center" min-width="85" prop="courseCardAmount" label="卡付金额"></el-table-column>
         </el-table-column>
 
         <el-table-column align="center" label="充值">
@@ -51,11 +51,11 @@
           <el-table-column align="center" min-width="75" prop="rechargeCashAmount" label="卡付金额"></el-table-column>
         </el-table-column>
       
-        <el-table-column align="center" min-width="75" prop="cashAmount" label="收银实收金额"></el-table-column>
-        <el-table-column align="center" min-width="75" prop="refundAmount" label="退款金额"></el-table-column>
-        <el-table-column align="center" min-width="75" prop="allCashAchi" label="实收总业绩"></el-table-column>
-        <el-table-column align="center" min-width="75" prop="cashAchi" label="公司实业绩"></el-table-column>
-        <el-table-column align="center" min-width="75" prop="storeCashAchi" label="门店实业绩"></el-table-column>
+        <el-table-column align="center" min-width="85" prop="cashAmount" label="收银实收金额"></el-table-column>
+        <el-table-column align="center" min-width="85" prop="refundAmount" label="退款金额"></el-table-column>
+        <el-table-column align="center" min-width="95" prop="allCashAchi" label="实收总业绩"></el-table-column>
+        <el-table-column align="center" min-width="85" prop="cashAchi" label="公司实业绩"></el-table-column>
+        <el-table-column align="center" min-width="95" prop="storeCashAchi" label="门店实业绩"></el-table-column>
 
         <el-table-column align="center" label="现付">
           <el-table-column
@@ -64,15 +64,14 @@
             :key="index"
             :label="item.label"
             :prop="item.prop"
-            width="80"
+            width="90"
           ></el-table-column>
         </el-table-column>
-        
       </el-table>
     </div>
   </template>
   <script>
-import { storeByDayDailys,exportStoreByDayDailys } from "@/api/statistics.js";
+  import { storeByDayDailys,exportStoreByDayDailys } from "@/api/statistics.js";
   export default {
     data() {
       return {
diff --git a/src/pages/storeManage/admins/index.vue b/src/pages/storeManage/admins/index.vue
index 56f3570..ca3c53f 100644
--- a/src/pages/storeManage/admins/index.vue
+++ b/src/pages/storeManage/admins/index.vue
@@ -3,16 +3,8 @@
     <div class="flex justify-start align-start">
       <el-form inline>
         <el-form-item label="门店编码" v-if="headOffice==1">
-          <!-- <el-input class="form-width" style="padding-left:0px;" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="queryForm.storeNum">
-            <el-button size="mini" slot="append" icon="el-icon-search" @click="openStore"></el-button>
-          </el-input> -->
           <store @selecData="selecData"></store>
         </el-form-item>
-        <!-- <el-form-item label="门店名称" v-if="headOffice==1">
-          <div class="form-width" style="width: 100px;">
-            {{queryForm.storeName}}
-          </div>
-        </el-form-item> -->
         <br>
         <el-form-item label="员工编码">
           <el-input class="form-width" style="padding-left:0px;" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="queryForm.brandNumber">
@@ -29,16 +21,10 @@
           </el-date-picker>
           <el-button size="mini" type="primary"  @click="changeMonth" :disabled="disabled">查询</el-button>
           <el-button size="mini" type="success"  @click="exit()">导出</el-button>
-          <el-button size="mini" type="success" v-role="40013002" @click="exits()">全部明细</el-button>
+          <el-button size="mini" type="success" v-role="40013002" @click="exits()" :loading="exitLoad">全部明细</el-button>
+          <el-button size="mini" type="success" @click="handleExport" v-if="headOffice==1" :loading="locumentsLoad">导出单据明细</el-button>
           </el-form-item>
       </el-form>
-      <!-- <div class="block">
-        <span class="demonstration padding-left-xs">选择日</span>
-        <el-date-picker v-model="days" :picker-options="pickerOptions" @change="changeMonth" type="daterange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
-        </el-date-picker>
-        <el-button size="mini" type="success"  @click="exit()">导出</el-button>
-        <el-button size="mini" type="success" v-role="40013002" @click="exits()">全部明细</el-button>
-      </div> -->
     </div>
     <el-table border v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText" @row-dblclick="rowdbClick" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}">
       <el-table-column show-overflow-tooltip align="center" min-width="120" prop="startDate" label="开始时间"></el-table-column>
@@ -67,7 +53,7 @@
       <!-- 分页组件 -->
       <el-pagination align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryForm.pageNum" :page-sizes="[10,20,30,40,50]" :page-size="queryForm.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
     </div>
-    <store ref="store" @storeData="storeData" :storeId='storeId'></store>
+    <!-- <store ref="store" @storeData="storeData" :storeId='storeId'></store> -->
     <admin ref="admin" @adminData="adminData"></admin>
     <detail ref="detail" @detailData="detailData"></detail>
   </div>
@@ -77,6 +63,7 @@ import {
   salesmans,
   salesmanExportachis,
   exportachiMXswhole,
+  exportachiMXs
 } from "@/api/storeManage.js";
 import store from "@/components/store/select/index";
 // import store from "@/components/store/radio/index";
@@ -86,6 +73,8 @@ export default {
   components: { store, admin, detail },
   data() {
     return {
+      exitLoad:false,
+      locumentsLoad:false,
       headOffice: sessionStorage.getItem("headOffice") * 1, //是否总店
       disabled:false,
       storeId:'',
@@ -132,12 +121,39 @@ export default {
     };
   },
   methods: {
+    handleExport(){
+      if(!this.queryForm.storeIds){
+        return this.$message.error({
+          message: "请至少选择一个门店!",
+        });
+      }
+      let params = {
+        startDate:this.days[0],
+        endDate:this.formatTime(this.days[1], "YYYY-MM-DD 23:59:59"),
+        storeIds:this.queryForm.storeIds,
+        staffType:1
+      }
+      this.locumentsLoad = true
+      exportachiMXs(params).then(res=>{
+        this.locumentsLoad = false
+        let blob = new Blob([res]);
+        var a = document.createElement("a");
+        var url = window.URL.createObjectURL(blob);
+        console.log(url);
+        a.href = url;
+        a.download = "管理层单据明细导出表.xlsx";
+        a.click();
+        window.URL.revokeObjectURL(url);
+      })
+    },
     selecData(list){
       this.queryForm.storeIds = list
     },
     //导出方法
     exit() {
+      this.exitLoad = true
       salesmanExportachis(this.queryForm).then((res) => {
+        this.exitLoad = true
         let blob = new Blob([res]);
         var a = document.createElement("a");
         var url = window.URL.createObjectURL(blob);
diff --git a/src/pages/storeManage/baseProject/components/detail.vue b/src/pages/storeManage/baseProject/components/detail.vue
index f07669a..bb7627a 100644
--- a/src/pages/storeManage/baseProject/components/detail.vue
+++ b/src/pages/storeManage/baseProject/components/detail.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog title="门店列表" :visible.sync="dialogFormVisible" append-to-body width="75%" @close="close">
     <el-select filterable default-first-option v-model="radio" placeholder="请选择门店" @change="radioChange">
-      <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
+      <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.storeId">
       </el-option>
     </el-select>
     <el-table class="margin-top-xs"  max-height="600" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color: '#eeeeee'}" border v-loading="listLoading" :data="list" ref="list" :element-loading-text="elementLoadingText" @row-click="getCurrentRow" :row-class-name="rowName" @selection-change="handleSelectionChange">
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import { propage, organization, importProject } from "@/api/storeManage.js";
+import { propage, organization, importProject,SysRoleStore } from "@/api/storeManage.js";
 export default {
   data() {
     return {
@@ -102,12 +102,15 @@ export default {
     },
     //获取数据
     async getData() {
-      organization({ pageSize: 999 }).then((res) => {
+      let params = {
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      SysRoleStore(params).then((res) => {
         if (res.code == "000000") {
-          res.rows.forEach((item) => {
+          res.pageInfo.list.forEach((item) => {
             item.label = item.storeNum + "-" + item.storeName;
           });
-          this.options = res.rows;
+          this.options = res.pageInfo.list;
         } else {
           this.$alert(res.message, "提示", {
             confirmButtonText: "确定",
@@ -117,7 +120,7 @@ export default {
             callback: (action) => {},
           });
         }
-      });
+      })
     },
     //多选方法
     getCurrentRow(row) {
diff --git a/src/pages/storeManage/dept/index.vue b/src/pages/storeManage/dept/index.vue
index ff50d92..4aca5c6 100644
--- a/src/pages/storeManage/dept/index.vue
+++ b/src/pages/storeManage/dept/index.vue
@@ -4,8 +4,8 @@
       选择日期
       <el-date-picker v-model="days" :picker-options="pickerOptions" type="daterange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
       </el-date-picker>
-      <el-select filterable default-first-option clearable v-model="storeId" placeholder="请选择" v-if="headOffice">
-          <el-option v-for="(item,index) in options" :key="index" :label="item.storeNum + '-' + item.storeName" :value="item.id">
+      <el-select filterable default-first-option clearable v-model="storeIds" placeholder="请选择" v-if="headOffice" multiple collapse-tags>
+          <el-option v-for="(item,index) in options" :key="index" :label="item.storeNum + '-' + item.storeName" :value="item.storeId">
           </el-option>
         </el-select>
       <el-button type="primary" size="mini" @click="exit" v-if="headOffice">导出</el-button>
@@ -84,7 +84,7 @@
 </template>
 
 <script>
-import { departmentPerformance,organizations,exportachi } from "@/api/storeManage.js";
+import { departmentPerformance,organizations,exportachi,SysRoleStore } from "@/api/storeManage.js";
 import detail from "./components/index";
 
 export default {
@@ -94,7 +94,7 @@ export default {
     return {
       headOffice: sessionStorage.getItem("headOffice") * 1,
       options:[],
-      storeId:"",
+      storeIds:"",
       pickerOptions: {
         //组件限制方法
         onPick: ({ maxDate, minDate }) => {
@@ -131,7 +131,7 @@ export default {
       list: [], //主数组
       queryForm: {
         //查询对象
-        storeId: sessionStorage.getItem("parentId"),
+        storeIds: sessionStorage.getItem("parentId"),
         pageSize: 10,
         pageNum: 1,
       },
@@ -142,8 +142,8 @@ export default {
       let date1 = this.formatTime(this.days[0], "YYYY-MM-DD 00:00:00");
       let date2 = this.formatTime(this.days[1], "YYYY-MM-DD 23:59:59");
       let form = { startDate: date1, endDate: date2 };
-      if(this.storeId){
-        form.storeId = this.storeId
+      if(this.storeIds){
+        form.storeIds = this.storeIds
       }
       exportachi(form).then(res=>{
         let blob = new Blob([res]);
@@ -157,9 +157,12 @@ export default {
       })
     },
     async getStore() {
-      organizations({ pageSize: 999 }).then((res) => {
+      let params = {
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      SysRoleStore(params).then((res) => {
         if (res.code == "000000") {
-          this.options = res.rows;
+          this.options = res.pageInfo.list;
         } else {
           this.$alert(res.message, "获取门店信息", {
             confirmButtonText: "确定",
@@ -197,8 +200,8 @@ export default {
       let date1 = this.formatTime(this.days[0], "YYYY-MM-DD 00:00:00");
       let date2 = this.formatTime(this.days[1], "YYYY-MM-DD 23:59:59");
       let form = { startDate: date1, endDate: date2 };
-      if(this.storeId){
-        form.storeId = this.storeId
+      if(this.storeIds){
+        form.storeIds = this.storeIds
       }
       this.loading = true
       this.disabled = true
diff --git a/src/pages/storeManage/goods/components/detail.vue b/src/pages/storeManage/goods/components/detail.vue
index 06335a7..60e0fd3 100644
--- a/src/pages/storeManage/goods/components/detail.vue
+++ b/src/pages/storeManage/goods/components/detail.vue
@@ -2,8 +2,7 @@
   <!-- 引入商品 -->
   <el-dialog title="门店列表" :visible.sync="dialogFormVisible" append-to-body width="75%" @close="close">
     <el-select filterable default-first-option v-model="radio" placeholder="请选择" @change="radioChange">
-      <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
-      </el-option>
+      <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.storeId"></el-option>
     </el-select>
     <el-table border v-loading="listLoading" :data="list" ref="list" :element-loading-text="elementLoadingText" @row-click="getCurrentRow" :row-class-name="rowName" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55"></el-table-column>
@@ -55,7 +54,7 @@
 </template>
 
 <script>
-import { propage, organization, importProject } from "@/api/storeManage.js";
+import { propage, organization, importProject,SysRoleStore } from "@/api/storeManage.js";
 export default {
   data() {
     return {
@@ -107,12 +106,15 @@ export default {
     },
     //获取数据
     async getData() {
-      organization({ pageSize: 999 }).then((res) => {
+      let params = {
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      SysRoleStore(params).then((res) => {
         if (res.code == "000000") {
-          res.rows.forEach((item) => {
+          res.pageInfo.list.forEach((item) => {
             item.label = item.storeNum + "-" + item.storeName;
           });
-          this.options = res.rows;
+          this.options = res.pageInfo.list;
         } else {
           this.$alert(res.message, "提示", {
             confirmButtonText: "确定",
@@ -122,7 +124,7 @@ export default {
             callback: (action) => {},
           });
         }
-      });
+      }) 
     },
     //多选方法
     getCurrentRow(row) {
diff --git a/src/pages/storeManage/managers/detail/index.vue b/src/pages/storeManage/managers/detail/index.vue
index 07b1aed..92f0393 100644
--- a/src/pages/storeManage/managers/detail/index.vue
+++ b/src/pages/storeManage/managers/detail/index.vue
@@ -20,7 +20,9 @@
           {{scope.row.type==0?"服务":scope.row.type==1?"充值":scope.row.type==2?"疗程":scope.row.type==3?"加价转疗程":scope.row.type==4?"充值退":scope.row.type==5?"疗程退":scope.row.type==6?"消费退":scope.row.type==7?"还款":scope.row.type==8?"促销单":'无'}}
         </template>
       </el-table-column>
-      <el-table-column show-overflow-tooltip align="center" min-width="90" prop="chia" label="成交业绩"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="90" prop="chia" label="需业绩"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="90" prop="cooperationAchi" label="实业绩"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="90" prop="money" label="总业绩"></el-table-column>
     </el-table>
     <div class="block margin-top-xs">
       <!-- 分页组件 -->
diff --git a/src/pages/storeManage/managers/index.vue b/src/pages/storeManage/managers/index.vue
index 17f2501..3380b41 100644
--- a/src/pages/storeManage/managers/index.vue
+++ b/src/pages/storeManage/managers/index.vue
@@ -4,16 +4,8 @@
       <el-form inline>
         <el-form-item label="门店编码" v-if="headOffice==1">
           <store @selecData="selecData"></store>
-          <!-- <el-input class="form-width" style="padding-left:0px;" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="queryForm.storeNum">
-            <el-button size="mini" slot="append" icon="el-icon-search" @click="openStore"></el-button>
-          </el-input> -->
         </el-form-item>
         <br>
-        <!-- <el-form-item label="门店名称" v-if="headOffice==1">
-          <div class="form-width">
-            {{queryForm.storeName}}
-          </div>
-        </el-form-item><br> -->
         <el-form-item label="高管编码">
           <el-input class="form-width" style="padding-left:0px;" ref="" oninput="this.value=this.value.replace(/\D/g,'')" pattern="[0-9]*" maxlength="11" v-model="queryForm.brandNumber">
             <el-button size="mini" slot="append" icon="el-icon-search" @click="openStaff"></el-button>
@@ -28,7 +20,8 @@
           <el-date-picker v-model="days" :picker-options="pickerOptions" type="daterange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
         <el-button size="mini" type="primary" @click="changeMonth" :disabled="disabled">查询</el-button>
-        <el-button size="mini" type="success" @click="exit()">导出</el-button>
+        <el-button size="mini" type="success" @click="exit()" :loading="exitLoad">导出</el-button>
+        <el-button size="mini" type="success" @click="handleExport()" v-if="headOffice" :loading="locumentsLoad">导出单据明细</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -60,7 +53,7 @@
       <!-- 分页组件 -->
       <el-pagination align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryForm.pageNum" :page-sizes="[10,20,30,40,50]" :page-size="queryForm.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
     </div>
-    <store ref="store" @storeData="storeData"></store>
+    <!-- <store ref="store" @storeData="storeData"></store> -->
     <manager ref="manager" @managerData="managerData"></manager>
     <detail ref="detail" @detailData="detailData"></detail>
     <staff ref="staff" @staffData="staffData"></staff>
@@ -72,6 +65,7 @@ import {
   salesman,
   salesmanExportachi,
   exportachiMXwhole,
+  exportachiMX
 } from "@/api/storeManage.js";
 import store from "@/components/store/select/index";
 // import store from "@/components/store/radio/index";
@@ -82,6 +76,8 @@ export default {
   components: { store, manager, detail, staff },
   data() {
     return {
+      locumentsLoad:false,
+      exitLoad:false,
       options:[],
       disabled:false,
       days: [], //日期数组
@@ -128,12 +124,39 @@ export default {
     };
   },
   methods: {
+    handleExport(){
+      if(!this.queryForm.storeIds){
+        return this.$message.error({
+          message: "请至少选择一个门店!",
+        });
+      }
+      let params = {
+        startDate:this.days[0],
+        endDate:this.formatTime(this.days[1], "YYYY-MM-DD 23:59:59"),
+        storeIds:this.queryForm.storeIds,
+        staffType:0
+      }
+      this.locumentsLoad = true
+      exportachiMX(params).then(res=>{
+        this.locumentsLoad = false
+        let blob = new Blob([res]);
+        var a = document.createElement("a");
+        var url = window.URL.createObjectURL(blob);
+        console.log(url);
+        a.href = url;
+        a.download = "高管单据明细导出表.xlsx";
+        a.click();
+        window.URL.revokeObjectURL(url);
+      })
+    },
     selecData(list){
       this.queryForm.storeIds = list
     },
     //导出方法
     exit() {
+      this.exitLoad = true
       salesmanExportachi(this.queryForm).then((res) => {
+        this.exitLoad = false
         let blob = new Blob([res]);
         var a = document.createElement("a");
         var url = window.URL.createObjectURL(blob);
diff --git a/src/pages/storeManage/storeParameters/component/multipleStore.vue b/src/pages/storeManage/storeParameters/component/multipleStore.vue
index 19bb23c..b4af404 100644
--- a/src/pages/storeManage/storeParameters/component/multipleStore.vue
+++ b/src/pages/storeManage/storeParameters/component/multipleStore.vue
@@ -7,8 +7,7 @@
     >
       <div>
           <el-select  ref="select"  multiple  filterable  v-model="storeId"  placeholder="请选择门店">
-            <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
-            </el-option>
+            <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.storeId"></el-option>
           </el-select>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -19,7 +18,7 @@
   </template>
   
   <script>
-  import { organizations } from "@/api/storeManage.js";
+  import { organizations,SysRoleStore } from "@/api/storeManage.js";
   export default {
     props:['storeIds'],
     watch:{
@@ -57,22 +56,25 @@
       },
       // 初始化门店
       init(){
-          organizations({ pageSize: 999 }).then((res) => {
-            if (res.code == "000000") {
-              res.rows.forEach((item) => {
-                item.label = item.storeNum + "-" + item.storeName;
-              });
-              this.options = res.rows;
-            } else {
-              this.$alert(res.message, "提示", {
-                confirmButtonText: "确定",
-                confirmButtonClass: "confirmbtnFalses",
-                type: "warning",
-                center: true,
-                callback: (action) => {},
-              });
-            }
-          });        
+        let params = {
+          roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+        }
+        SysRoleStore(params).then((res) => {
+        if (res.code == "000000") {
+          res.pageInfo.list.forEach((item) => {
+            item.label = item.storeNum + "-" + item.storeName;
+          });
+          this.options = res.pageInfo.list;
+        } else {
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      })      
       }
     }
   };
diff --git a/src/pages/storeManage/storeParameters/component/store.vue b/src/pages/storeManage/storeParameters/component/store.vue
index 1c1e85a..f988924 100644
--- a/src/pages/storeManage/storeParameters/component/store.vue
+++ b/src/pages/storeManage/storeParameters/component/store.vue
@@ -7,7 +7,7 @@
   >
     <div>
         <el-select  ref="select" collapse-tags filterable default-first-option v-model="storeId" clearable @clear="getData" placeholder="请选择门店" @change="getData">
-          <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
+          <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.storeId">
           </el-option>
         </el-select>
     </div>
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { organizations,allStores } from "@/api/storeManage.js";
+import { organizations,allStores,SysRoleStore } from "@/api/storeManage.js";
 export default {
   watch:{
     showVisible:{
@@ -103,22 +103,25 @@ export default {
     },
     // 初始化门店
     init(){
-        organizations({ pageSize: 999 }).then((res) => {
-          if (res.code == "000000") {
-            res.rows.forEach((item) => {
-              item.label = item.storeNum + "-" + item.storeName;
-            });
-            this.options = res.rows;
-          } else {
-            this.$alert(res.message, "提示", {
-              confirmButtonText: "确定",
-              confirmButtonClass: "confirmbtnFalses",
-              type: "warning",
-              center: true,
-              callback: (action) => {},
-            });
-          }
-        });        
+      let params = {
+        roleId:JSON.parse(sessionStorage.getItem("userInfo")).roleId
+      }
+      SysRoleStore(params).then((res) => {
+        if (res.code == "000000") {
+          res.pageInfo.list.forEach((item) => {
+            item.label = item.storeNum + "-" + item.storeName;
+          });
+          this.options = res.pageInfo.list;
+        } else {
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      })       
     }
   }
 };
diff --git a/src/router/index.js b/src/router/index.js
index 60ac600..3b70162 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -781,7 +781,6 @@ const router = new VueRouter({
             index: "firmAnalyse"
           }
         },
-
         //关于我们
         {
           path: "/AboutUs",
diff --git a/src/style/app.css b/src/style/app.css
index 0f5c5e5..e0995eb 100644
--- a/src/style/app.css
+++ b/src/style/app.css
@@ -122,9 +122,9 @@ body {
 
 .el-header {
   /* 头部样式 */
-  /* background: linear-gradient(#fda1a1, #fd7b7b); */
-  /* background-color: #1873d4; */
-  /* background: linear-gradient(#6cb3ff, #1873d4); */
+  /* 代收 */
+  /* background: linear-gradient(#6cb3ff, #1873d4);  */
+  /* 常规 */
   background: linear-gradient(#6cb3ff, #008000);
   border-top: 2px solid linear-gradient(#f78989, #5e9af5);
   width: 100%;