e 3 years ago
commit c2783fca08
  1. 124
      package-lock.json
  2. 4
      package.json
  3. 4
      src/store/index.js
  4. 34
      src/utils/api.js
  5. 63
      src/views/customer/AddCustomer.vue
  6. 8
      src/views/customer/customer.vue
  7. 2
      src/views/oder/AddOrder.vue
  8. 2
      src/views/oder/Order.vue
  9. 262
      src/views/setting/Person.vue
  10. 2
      src/views/user/AddUser.vue
  11. 7
      src/views/user/User.vue

124
package-lock.json generated

@ -1019,9 +1019,9 @@
} }
}, },
"@types/json-schema": { "@types/json-schema": {
"version": "7.0.7", "version": "7.0.8",
"resolved": "https://registry.nlark.com/@types/json-schema/download/@types/json-schema-7.0.7.tgz", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
"integrity": "sha1-mKmTUWyFnrDVxMjwmDF6nqaNua0=" "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg=="
}, },
"@types/minimatch": { "@types/minimatch": {
"version": "3.0.3", "version": "3.0.3",
@ -1834,7 +1834,7 @@
}, },
"async-foreach": { "async-foreach": {
"version": "0.1.3", "version": "0.1.3",
"resolved": "https://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz", "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
"integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=" "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
}, },
"async-limiter": { "async-limiter": {
@ -2003,7 +2003,7 @@
}, },
"babel-plugin-syntax-dynamic-import": { "babel-plugin-syntax-dynamic-import": {
"version": "6.18.0", "version": "6.18.0",
"resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-dynamic-import/download/babel-plugin-syntax-dynamic-import-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=" "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo="
}, },
"babel-polyfill": { "babel-polyfill": {
@ -2137,7 +2137,7 @@
}, },
"block-stream": { "block-stream": {
"version": "0.0.9", "version": "0.0.9",
"resolved": "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
"requires": { "requires": {
"inherits": "~2.0.0" "inherits": "~2.0.0"
@ -2931,7 +2931,7 @@
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
}, },
"consolidate": { "consolidate": {
@ -3806,7 +3806,7 @@
}, },
"delegates": { "delegates": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
}, },
"depd": { "depd": {
@ -5475,7 +5475,7 @@
}, },
"gauge": { "gauge": {
"version": "2.7.4", "version": "2.7.4",
"resolved": "https://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"requires": { "requires": {
"aproba": "^1.0.3", "aproba": "^1.0.3",
@ -5490,12 +5490,12 @@
"dependencies": { "dependencies": {
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.nlark.com/ansi-regex/download/ansi-regex-2.1.1.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
}, },
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz?cache=0&sync_timestamp=1618552489864&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-fullwidth-code-point%2Fdownload%2Fis-fullwidth-code-point-1.0.0.tgz", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
@ -5503,7 +5503,7 @@
}, },
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.nlark.com/string-width/download/string-width-1.0.2.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
@ -5513,7 +5513,7 @@
}, },
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz?cache=0&sync_timestamp=1618553320591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-3.0.1.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
@ -6491,7 +6491,7 @@
}, },
"has-unicode": { "has-unicode": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
}, },
"has-value": { "has-value": {
@ -8377,7 +8377,7 @@
"dependencies": { "dependencies": {
"semver": { "semver": {
"version": "5.3.0", "version": "5.3.0",
"resolved": "https://registry.nlark.com/semver/download/semver-5.3.0.tgz?cache=0&sync_timestamp=1618847119601&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.3.0.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
} }
} }
@ -8475,17 +8475,17 @@
"dependencies": { "dependencies": {
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.nlark.com/ansi-regex/download/ansi-regex-2.1.1.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
}, },
"ansi-styles": { "ansi-styles": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
}, },
"chalk": { "chalk": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1618995367379&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": { "requires": {
"ansi-styles": "^2.2.1", "ansi-styles": "^2.2.1",
@ -8497,7 +8497,7 @@
}, },
"cross-spawn": { "cross-spawn": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
"integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
"requires": { "requires": {
"lru-cache": "^4.0.1", "lru-cache": "^4.0.1",
@ -8515,7 +8515,7 @@
}, },
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz?cache=0&sync_timestamp=1618553320591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-3.0.1.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
@ -8523,19 +8523,19 @@
}, },
"supports-color": { "supports-color": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.nlark.com/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1622293670728&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
}, },
"yallist": { "yallist": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/yallist/download/yallist-2.1.2.tgz", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
} }
} }
}, },
"nopt": { "nopt": {
"version": "3.0.6", "version": "3.0.6",
"resolved": "https://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz?cache=0&sync_timestamp=1597649905420&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnopt%2Fdownload%2Fnopt-3.0.6.tgz", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
"requires": { "requires": {
"abbrev": "1" "abbrev": "1"
@ -8884,7 +8884,7 @@
}, },
"os-tmpdir": { "os-tmpdir": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
}, },
"osenv": { "osenv": {
@ -9144,8 +9144,8 @@
}, },
"pdfjs-dist": { "pdfjs-dist": {
"version": "2.6.347", "version": "2.6.347",
"resolved": "https://registry.nlark.com/pdfjs-dist/download/pdfjs-dist-2.6.347.tgz", "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.6.347.tgz",
"integrity": "sha1-8lftZug76QDND9KFJKIYf7niXNU=" "integrity": "sha512-QC+h7hG2su9v/nU1wEI3SnpPIrqJODL7GTDFvR74ANKGq1AFJW16PH8VWnhpiTi9YcLSFV9xLeWSgq+ckHLdVQ=="
}, },
"performance-now": { "performance-now": {
"version": "2.1.0", "version": "2.1.0",
@ -10228,8 +10228,8 @@
}, },
"raw-loader": { "raw-loader": {
"version": "4.0.2", "version": "4.0.2",
"resolved": "https://registry.npm.taobao.org/raw-loader/download/raw-loader-4.0.2.tgz", "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
"integrity": "sha1-GqxrfRrRUB5m79rBUixz5ZpYTrY=", "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
"requires": { "requires": {
"loader-utils": "^2.0.0", "loader-utils": "^2.0.0",
"schema-utils": "^3.0.0" "schema-utils": "^3.0.0"
@ -10237,8 +10237,8 @@
"dependencies": { "dependencies": {
"ajv": { "ajv": {
"version": "6.12.6", "version": "6.12.6",
"resolved": "https://registry.nlark.com/ajv/download/ajv-6.12.6.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
"integrity": "sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ=", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
"requires": { "requires": {
"fast-deep-equal": "^3.1.1", "fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0", "fast-json-stable-stringify": "^2.0.0",
@ -10248,31 +10248,31 @@
}, },
"ajv-keywords": { "ajv-keywords": {
"version": "3.5.2", "version": "3.5.2",
"resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1616882441894&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
"integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=" "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
}, },
"emojis-list": { "emojis-list": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
"integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=" "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
}, },
"fast-deep-equal": { "fast-deep-equal": {
"version": "3.1.3", "version": "3.1.3",
"resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
"integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=" "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
}, },
"json5": { "json5": {
"version": "2.2.0", "version": "2.2.0",
"resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
"integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=", "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
"requires": { "requires": {
"minimist": "^1.2.5" "minimist": "^1.2.5"
} }
}, },
"loader-utils": { "loader-utils": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"requires": { "requires": {
"big.js": "^5.2.2", "big.js": "^5.2.2",
"emojis-list": "^3.0.0", "emojis-list": "^3.0.0",
@ -10281,15 +10281,15 @@
}, },
"minimist": { "minimist": {
"version": "1.2.5", "version": "1.2.5",
"resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1589682820731&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=" "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
}, },
"schema-utils": { "schema-utils": {
"version": "3.0.0", "version": "3.1.0",
"resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-3.0.0.tgz", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz",
"integrity": "sha1-Z1AvaqK2ai1AMrQnmilEl4oJE+8=", "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==",
"requires": { "requires": {
"@types/json-schema": "^7.0.6", "@types/json-schema": "^7.0.7",
"ajv": "^6.12.5", "ajv": "^6.12.5",
"ajv-keywords": "^3.5.2" "ajv-keywords": "^3.5.2"
} }
@ -10938,7 +10938,7 @@
}, },
"scss-tokenizer": { "scss-tokenizer": {
"version": "0.2.3", "version": "0.2.3",
"resolved": "https://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz", "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
"integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
"requires": { "requires": {
"js-base64": "^2.1.8", "js-base64": "^2.1.8",
@ -10947,7 +10947,7 @@
"dependencies": { "dependencies": {
"source-map": { "source-map": {
"version": "0.4.4", "version": "0.4.4",
"resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz?cache=0&sync_timestamp=1589682764497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.4.4.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"requires": { "requires": {
"amdefine": ">=0.0.4" "amdefine": ">=0.0.4"
@ -12629,8 +12629,8 @@
}, },
"vue-pdf": { "vue-pdf": {
"version": "4.3.0", "version": "4.3.0",
"resolved": "https://registry.nlark.com/vue-pdf/download/vue-pdf-4.3.0.tgz", "resolved": "https://registry.npmjs.org/vue-pdf/-/vue-pdf-4.3.0.tgz",
"integrity": "sha1-1feQ7nln57eqkIm5exGrFo4Z29A=", "integrity": "sha512-zd3lJj6CbtrawgaaDDciTDjkJMUKiLWtbEmBg5CvFn9Noe9oAO/GNy/fc5c59qGuFCJ14ibIV1baw4S07e5bSQ==",
"requires": { "requires": {
"babel-plugin-syntax-dynamic-import": "^6.18.0", "babel-plugin-syntax-dynamic-import": "^6.18.0",
"loader-utils": "^1.4.0", "loader-utils": "^1.4.0",
@ -12642,21 +12642,21 @@
"dependencies": { "dependencies": {
"emojis-list": { "emojis-list": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
"integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=" "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
}, },
"json5": { "json5": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
"integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=", "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
"requires": { "requires": {
"minimist": "^1.2.0" "minimist": "^1.2.0"
} }
}, },
"loader-utils": { "loader-utils": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.4.0.tgz", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
"integrity": "sha1-xXm140yzSxp07cbB+za/o3HVphM=", "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
"requires": { "requires": {
"big.js": "^5.2.2", "big.js": "^5.2.2",
"emojis-list": "^3.0.0", "emojis-list": "^3.0.0",
@ -12676,8 +12676,8 @@
}, },
"vue-resize-sensor": { "vue-resize-sensor": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/vue-resize-sensor/download/vue-resize-sensor-2.0.0.tgz", "resolved": "https://registry.npmjs.org/vue-resize-sensor/-/vue-resize-sensor-2.0.0.tgz",
"integrity": "sha1-Olh/1oAuFohwnPLFqtrnoAdZUr8=" "integrity": "sha512-W+y2EAI/BxS4Vlcca9scQv8ifeBFck56DRtSwWJ2H4Cw1GLNUYxiZxUHHkuzuI5JPW/cYtL1bPO5xPyEXx4LmQ=="
}, },
"vue-router": { "vue-router": {
"version": "3.5.2", "version": "3.5.2",
@ -13160,8 +13160,8 @@
}, },
"worker-loader": { "worker-loader": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/worker-loader/download/worker-loader-2.0.0.tgz", "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz",
"integrity": "sha1-Rf2j73asqBV3GokQc5nuQRm0MKw=", "integrity": "sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==",
"requires": { "requires": {
"loader-utils": "^1.0.0", "loader-utils": "^1.0.0",
"schema-utils": "^0.4.0" "schema-utils": "^0.4.0"
@ -13169,8 +13169,8 @@
"dependencies": { "dependencies": {
"schema-utils": { "schema-utils": {
"version": "0.4.7", "version": "0.4.7",
"resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
"integrity": "sha1-unT1l9K+LqiAExdG7hfQoJPGgYc=", "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
"requires": { "requires": {
"ajv": "^6.1.0", "ajv": "^6.1.0",
"ajv-keywords": "^3.1.0" "ajv-keywords": "^3.1.0"

@ -17,12 +17,12 @@
"px2rem-loader": "^0.1.9", "px2rem-loader": "^0.1.9",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-cropperjs": "^3.0.0", "vue-cropperjs": "^3.0.0",
"vue-pdf": "^4.3.0",
"vue-quill-editor": "^3.0.6", "vue-quill-editor": "^3.0.6",
"vue-router": "^3.5.1", "vue-router": "^3.5.1",
"vue-schart": "^2.0.0", "vue-schart": "^2.0.0",
"vuedraggable": "^2.17.0", "vuedraggable": "^2.17.0",
"vuex": "^3.1.2", "vuex": "^3.1.2"
"vue-pdf": "^4.2.0"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "^3.9.0", "@vue/cli-plugin-babel": "^3.9.0",

@ -3,6 +3,7 @@ import Vuex from 'vuex';
Vue.use(Vuex); Vue.use(Vuex);
const store = new Vuex.Store({ const store = new Vuex.Store({
state: { state: {
avatar: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
courseId:'', courseId:'',
userId: '', userId: '',
roleId: '', roleId: '',
@ -17,6 +18,9 @@ const store = new Vuex.Store({
loginToken: '' loginToken: ''
}, },
mutations:{ mutations:{
userAvatar(state,payload){
state.avatar = payload.avatar
},
userData (state, payload) { userData (state, payload) {
state.userId = payload.user_id state.userId = payload.user_id
}, },

@ -1,10 +1,9 @@
// let host = 'http://39.108.250.202' // let host = 'http://39.108.250.202'
// let host = 'http://192.168.31.151:9000' let host1 = 'http://192.168.31.151:9000'//榕
// let host = 'http://192.168.31.125:9000' let host2 = 'http://192.168.31.125:9000'//林
// let host = 'http://192.168.31.140:9000' let host3 = 'http://192.168.31.140:9000'//7
let host = 'http://192.168.31.137:9000'// 陈赓 let host = 'http://192.168.31.137:9000'// 陈赓
export default { export default {
logins: `${host}/users/user/login`, //登录 logins: `${host}/users/user/login`, //登录
@ -40,18 +39,18 @@ export default {
updateUserRoleId: `${host}/liuwanr/userInfo/updateUserRoleId`, //更新用户角色id接口 updateUserRoleId: `${host}/liuwanr/userInfo/updateUserRoleId`, //更新用户角色id接口
// 客户管理 // 客户管理
deleteCustomer: `${host}/nakadai/customer/delCustomer`, delCustomers: `${host3}/nakadai/customer/delCustomers`,
updateCustomer: `${host}/nakadai/customer/updateCustomer`, updateCustomer: `${host3}/nakadai/customer/updateCustomer`,
addCustomer: `${host}/nakadai/customer/addCustomer`, addCustomer: `${host3}/nakadai/customer/addCustomer`,
queryCustomer: `${host}/nakadai/customer/queryCustomer`, queryCustomer: `${host3}/nakadai/customer/queryCustomer`,
queryCustomerDetails: `${host}/nakadai/customer/queryCustomerDetails`, queryCustomerDetails: `${host3}/nakadai/customer/queryCustomerDetails`,
resetPwdCustomer: `${host}/nakadai/customer/resetPwd`, resetPwdCustomer: `${host3}/nakadai/customer/resetPwd`,
queryCustomerIsExists: `${host}/nakadai/customer/queryCustomerIsExists`, queryCustomerIsExists: `${host3}/nakadai/customer/queryCustomerIsExists`,
updateEnabled: `${host}/nakadai/customer/updateEnabled`, updateEnabled: `${host3}/nakadai/customer/updateEnabled`,
queryCustomerIndustryClass: `${host}/liuwanr/customer/queryCustomerIndustryClass`, queryCustomerIndustryClass: `${host3}/nakadai/hrIndustryClass/queryIndustryClass`,
queryCustomerIndustry: `${host}/liuwanr/customer/queryCustomerIndustry`, queryCustomerIndustry: `${host3}/nakadai/hrIndustry/queryIndustry`,
querySchoolData: `${host3}/nakadai/school/querySchool`,
queryPhone: `${host}/liuwanr/user/queryPhone`, queryPhone: `${host}/liuwanr/user/queryPhone`,
querySchoolData: `${host}/nakadai/school/querySchool`,
queryPlatform: `${host}/liuwanr/userInfo/queryPlatform`, queryPlatform: `${host}/liuwanr/userInfo/queryPlatform`,
// 用户管理 // 用户管理
@ -102,9 +101,8 @@ export default {
querySchool: `${host}/liuwanr/school/querySchool`, //查询学校 querySchool: `${host}/liuwanr/school/querySchool`, //查询学校
querySchoolDetails: `${host}/liuwanr/school/querySchoolDetails`, //查询学校详情 querySchoolDetails: `${host}/liuwanr/school/querySchoolDetails`, //查询学校详情
queryProvince: `${host}/liuwanr/province/queryProvince`, //查询省份 queryProvince: `${host3}/nakadai/province/queryProvince`, //查询省份
queryCity: `${host3}/nakadai/city/queryCity`, //查询城市
queryCity: `${host}/liuwanr/city/queryCity`, //查询城市
queryCourseDiscipline: `${host}/liuwanr/course/queryCourseDiscipline`, //查询课程学科 queryCourseDiscipline: `${host}/liuwanr/course/queryCourseDiscipline`, //查询课程学科
queryCourseProfessionalClass: `${host}/liuwanr/course/queryCourseProfessionalClass`, //查询专业类 queryCourseProfessionalClass: `${host}/liuwanr/course/queryCourseProfessionalClass`, //查询专业类

@ -83,7 +83,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="手机号"> <el-form-item prop="phone" label="手机号">
<el-input placeholder="请输入联系人手机号" v-model="form.phone" maxlength="11"></el-input> <el-input placeholder="请输入联系人手机号" v-model="form.phone" maxlength="11"></el-input>
</el-form-item> </el-form-item>
@ -107,11 +107,14 @@
</el-table-column> </el-table-column>
<el-table-column prop="courseName" label="课程名称" align="center"> <el-table-column prop="courseName" label="课程名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="usePeriod" label="使用期限" align="center"> <el-table-column prop="periodOfUse" label="使用期限" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="usePeriod" label="起止日期" align="center"> <el-table-column label="起止日期" align="center">
<template slot-scope="scope">
{{scope.row.startTime}}~{{scope.row.endTime}}
</template>
</el-table-column> </el-table-column>
<el-table-column prop="usePeriod" label="剩余期限" align="center"> <el-table-column prop="remainingPeriod" label="剩余期限" align="center">
</el-table-column> </el-table-column>
<el-table-column label="端口地址" align="center"> <el-table-column label="端口地址" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -120,14 +123,7 @@
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center"> <el-table-column label="状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch v-model="scope.row.isEnable" :active-value="1" :inactive-value="0" :active-text="scope.row.isEnable ? '启用' : '禁用'" @change="switchOff($event,scope.row,scope.$index)"></el-switch>
v-model="scope.row.isDeliverGoods"
:active-value="1"
:inactive-value="0"
active-text="启用"
inactive-text="禁用"
disabled>
</el-switch>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -140,14 +136,18 @@
<span>数据平台权限</span> <span>数据平台权限</span>
</div> </div>
<div> <div>
<el-table :data="coursePermissionss" class="orderTable" stripe header-align="center"> <el-table :data="dataPermissionss" class="orderTable" stripe header-align="center">
<el-table-column type="index" width="100" label="序号" align="center"> <el-table-column type="index" width="100" label="序号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="courseName" label="产品名称" align="center"></el-table-column> <el-table-column prop="productName" label="产品名称" align="center"></el-table-column>
<el-table-column prop="usePeriod" label="使用期限" align="center"></el-table-column> <el-table-column prop="periodOfUse" label="使用期限" align="center"></el-table-column>
<el-table-column prop="usePeriod" label="起止日期" align="center"></el-table-column> <el-table-column prop="usePeriod" label="起止日期" align="center">
<el-table-column prop="usePeriod" label="剩余期限" align="center"></el-table-column> <template slot-scope="scope">
<el-table-column prop="usePeriod" label="账号数" align="center"></el-table-column> {{scope.row.startTime}}~{{scope.row.endTime}}
</template>
</el-table-column>
<el-table-column prop="remainingPeriod" label="剩余期限" align="center"></el-table-column>
<el-table-column prop="accountNum" label="账号数" align="center"></el-table-column>
<el-table-column label="端口地址" align="center"> <el-table-column label="端口地址" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="configure(scope.row)">配置</el-button> <el-button @click="configure(scope.row)">配置</el-button>
@ -155,14 +155,7 @@
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center"> <el-table-column label="状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch v-model="scope.row.isEnable" :active-value="1" :inactive-value="0" :active-text="scope.row.isEnable ? '启用' : '禁用'" @change="switchOff($event,scope.row,scope.$index)"></el-switch>
v-model="scope.row.isDeliverGoods"
:active-value="1"
:inactive-value="0"
active-text="启用"
inactive-text="禁用"
disabled>
</el-switch>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -295,7 +288,7 @@ export default {
{ required: true, message: '请输入账号', trigger: 'blur' } { required: true, message: '请输入账号', trigger: 'blur' }
], ],
phone: [ phone: [
{ required: true, message: '请输入手机号', trigger: 'blur' }, // { required: true, message: '', trigger: 'blur' },
{ {
pattern: /^1[3456789]\d{9}$/, pattern: /^1[3456789]\d{9}$/,
message: '请输入正确的手机号', message: '请输入正确的手机号',
@ -342,6 +335,7 @@ export default {
schoolList: [], schoolList: [],
contractInformations: [], contractInformations: [],
coursePermissionss: [], coursePermissionss: [],
dataPermissionss: [],
ipVisible: false, ipVisible: false,
IPData: [{ IPData: [{
id: 1, id: 1,
@ -392,6 +386,7 @@ export default {
} }
this.contractInformations = res.result.contractInformations this.contractInformations = res.result.contractInformations
this.coursePermissionss = res.result.coursePermissionss this.coursePermissionss = res.result.coursePermissionss
this.dataPermissionss = res.result.dataPermissionss
this.getCityData() this.getCityData()
this.changIndustryData() this.changIndustryData()
this.getSchoolData() this.getSchoolData()
@ -407,7 +402,7 @@ export default {
provinceId: this.form.provinceId provinceId: this.form.provinceId
} }
this.$get(this.api.queryCity,data).then(res => { this.$get(this.api.queryCity,data).then(res => {
this.cityList = res.message this.cityList = res.list
}).catch(res => {}); }).catch(res => {});
}, },
// //
@ -453,7 +448,7 @@ export default {
// //
getIndustryClass(){ getIndustryClass(){
this.$get(this.api.queryCustomerIndustryClass).then(res => { this.$get(this.api.queryCustomerIndustryClass).then(res => {
this.IndustryClassList = res.message this.IndustryClassList = res.list
}).catch(res => {}); }).catch(res => {});
}, },
// //
@ -470,9 +465,17 @@ export default {
industryClassId: this.form.industryClassId industryClassId: this.form.industryClassId
} }
this.$get(this.api.queryCustomerIndustry,data).then(res => { this.$get(this.api.queryCustomerIndustry,data).then(res => {
this.industryList = res.message this.industryList = res.list
}).catch(res => {}); }).catch(res => {});
}, },
switchOff(val,row,index) {
this.$get(this.api.updateEnabled,{
id: row.id,
isEnable: val
}).then(res => {
this.$message.success(val ? '启用成功' : '禁用成功')
}).catch(res => {})
},
saveAdd(formName){ saveAdd(formName){
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {

@ -155,7 +155,7 @@ export default {
}, },
getProvince(){ getProvince(){
this.$get(this.api.queryProvince).then(res => { this.$get(this.api.queryProvince).then(res => {
this.provinceList = res.message this.provinceList = res.list
this.$store.commit("provinceData", { provinceList : this.provinceList}) this.$store.commit("provinceData", { provinceList : this.provinceList})
}).catch(res => {}) }).catch(res => {})
}, },
@ -173,7 +173,7 @@ export default {
provinceId: this.form.provinces provinceId: this.form.provinces
} }
this.$get(this.api.queryCity,data).then(res => { this.$get(this.api.queryCity,data).then(res => {
this.cityList = res.message this.cityList = res.list
}).catch(res => {}) }).catch(res => {})
}, },
permission(){ permission(){
@ -192,7 +192,7 @@ export default {
this.$confirm('确定要删除吗?', '提示', { this.$confirm('确定要删除吗?', '提示', {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$post(this.api.deleteCustomer,row.customerId).then(res => { this.$post(this.api.delCustomers,[row.customerId]).then(res => {
this.$message.success('删除成功') this.$message.success('删除成功')
this.getData() this.getData()
}).catch(res => {}) }).catch(res => {})
@ -210,7 +210,7 @@ export default {
this.$confirm('确定要删除吗?', '提示', { this.$confirm('确定要删除吗?', '提示', {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$post(this.api.deleteCustomer,data).then(res => { this.$post(this.api.delCustomers,delList).then(res => {
this.multipleSelection = []; this.multipleSelection = [];
this.$message.success('删除成功') this.$message.success('删除成功')
this.getData() this.getData()

@ -638,7 +638,7 @@ export default {
provinceId: this.form.provinceId provinceId: this.form.provinceId
} }
this.$get(this.api.queryCity,data).then(res => { this.$get(this.api.queryCity,data).then(res => {
this.cityList = res.message this.cityList = res.list
}).catch(res => {}); }).catch(res => {});
}, },
// //

@ -181,7 +181,7 @@ export default {
provinceId: this.form.provinces provinceId: this.form.provinces
} }
this.$get(this.api.queryCity,data).then(res => { this.$get(this.api.queryCity,data).then(res => {
this.cityList = res.message this.cityList = res.list
}).catch(res => {}); }).catch(res => {});
}, },
addOrder(){ addOrder(){

@ -8,7 +8,7 @@
:action="this.api.updateUserAvatars" :action="this.api.updateUserAvatars"
:data="{userId:this.userId}" :data="{userId:this.userId}"
name="file" name="file"
:limit="3" :limit="1"
:on-success="getRes" :on-success="getRes"
> >
<div>点击更改头像</div> <div>点击更改头像</div>
@ -28,12 +28,12 @@
<div class="line"> <div class="line">
<div class="item"> <div class="item">
<span>姓名</span> <span>姓名</span>
<input id="username" class="username" placeholder="请输入姓名" type="text" v-model="personalInformation.userName"/> <input id="username" class="username" placeholder="请输入姓名" type="text" v-model="form.userName"/>
</div> </div>
<div class="item"> <div class="item">
<span>所在国家</span> <span>所在国家</span>
<el-select <el-select
v-model="personalInformation.countries" v-model="form.countries"
placeholder placeholder
> >
<el-option <el-option
@ -49,15 +49,15 @@
<div class="item"> <div class="item">
<span>性别</span> <span>性别</span>
<div class="sexRadio"> <div class="sexRadio">
<el-radio v-model="personalInformation.sex" :label="1"></el-radio> <el-radio v-model="form.sex" :label="1"></el-radio>
<el-radio v-model="personalInformation.sex" :label="2"></el-radio> <el-radio v-model="form.sex" :label="2"></el-radio>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<span>所在地</span> <span>所在地</span>
<div class="selects"> <div class="selects">
<el-select <el-select
v-model="personalInformation.countries" v-model="form.countries"
placeholder placeholder
> >
<el-option <el-option
@ -68,7 +68,7 @@
></el-option> ></el-option>
</el-select> </el-select>
<el-select <el-select
v-model="personalInformation.provinceId" v-model="form.provinceId"
placeholder placeholder
@change="id => getCity(id,1)" @change="id => getCity(id,1)"
> >
@ -80,9 +80,9 @@
></el-option> ></el-option>
</el-select> </el-select>
<el-select <el-select
v-model="personalInformation.cityId" v-model="form.cityId"
placeholder placeholder
:disabled="personalInformation.provinceId ? false : true" :disabled="form.provinceId ? false : true"
> >
<el-option <el-option
v-for="item in cityList" v-for="item in cityList"
@ -98,7 +98,7 @@
<div class="item"> <div class="item">
<span>出生年月日</span> <span>出生年月日</span>
<el-date-picker <el-date-picker
v-model="personalInformation.dateBirth" v-model="form.dateBirth"
:clearable="false" :clearable="false"
class="block-right" class="block-right"
type="date"> type="date">
@ -106,14 +106,14 @@
</div> </div>
<div class="item"> <div class="item">
<span>证件</span> <span>证件</span>
<input onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" id="idnumber" class="idnumber" placeholder="请输入证件" type="text" v-model="personalInformation.idNumber"/> <input onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" id="idnumber" class="idnumber" placeholder="请输入证件" type="text" v-model="form.idNumber"/>
</div> </div>
</div> </div>
<div class="line"> <div class="line">
<div class="item"> <div class="item">
<span>教育程度</span> <span>教育程度</span>
<el-select <el-select
v-model="personalInformation.educationDegree" v-model="form.educationDegree"
placeholder="请选择教育程度" placeholder="请选择教育程度"
> >
<el-option <el-option
@ -125,8 +125,43 @@
</el-select> </el-select>
</div> </div>
<div class="item"> <div class="item">
<span>当前所在学校</span> <span>所在学校</span>
<input id="schoolName" class="school" disabled placeholder="所在学校" type="text" v-model="personalInformation.schoolName"/> <el-select
v-model="form.schoolId"
filterable
placeholder="请选择所在学校"
>
<el-option
v-for="item in schoolList"
:key="item.value"
:label="item.schoolName"
:value="item.schoolId"
></el-option>
</el-select>
</div>
</div>
<div class="line">
<div class="item">
<span>手机号</span>
<div class="btns flex-between">
<span>{{form.phone}}</span>
<el-button v-if="form.phone" type="primary" size="small" @click="bindPhone">更换</el-button>
<el-button v-else type="primary" size="small" @click="bindPhone">绑定</el-button>
</div>
</div>
<div class="item">
<span>邮箱</span>
<div class="btns flex-between">
<span>{{form.email}}</span>
<el-button v-if="form.email" type="primary" size="small" @click="bindEmail">更换</el-button>
<el-button v-else type="primary" size="small" @click="bindEmail">绑定</el-button>
</div>
</div>
</div>
<div class="line">
<div class="item">
<span>微信号</span>
<input type="text" class="username" placeholder="请输入微信号" v-model="form.wechatId"/>
</div> </div>
</div> </div>
@ -156,7 +191,7 @@
<div class="item"> <div class="item">
<span>国家</span> <span>国家</span>
<el-select <el-select
v-model="personalInformation.countries" v-model="form.countries"
placeholder placeholder
> >
<el-option <el-option
@ -257,27 +292,9 @@
id="account" id="account"
type="text" type="text"
class="username" placeholder="请输入用户账号" class="username" placeholder="请输入用户账号"
v-model="personalInformation.account" v-model="form.account"
/> />
</div> </div>
<div class="item">
<span>手机号</span>
<div class="btns flex-between">
<span>{{personalInformation.phone}}</span>
<el-button v-if="personalInformation.phone" type="primary" size="small" @click="bindPhone">更换</el-button>
<el-button v-else type="primary" size="small" @click="bindPhone">绑定</el-button>
</div>
</div>
</div>
<div class="line">
<div class="item">
<span>邮箱</span>
<div class="btns flex-between">
<span>{{personalInformation.email}}</span>
<el-button v-if="personalInformation.email" type="primary" size="small" @click="bindEmail">更换</el-button>
<el-button v-else type="primary" size="small" @click="bindEmail">绑定</el-button>
</div>
</div>
<div class="item"> <div class="item">
<span>密码</span> <span>密码</span>
<div class="btns flex-between"> <div class="btns flex-between">
@ -290,7 +307,7 @@
</div> </div>
<el-dialog <el-dialog
:title="personalInformation.email ? '更换邮箱' : '绑定邮箱'" :title="form.email ? '更换邮箱' : '绑定邮箱'"
:visible.sync="emailVisible" :visible.sync="emailVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
@close="closeEmail" @close="closeEmail"
@ -313,7 +330,7 @@
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:title="personalInformation.phone ? '更换手机号' : '绑定手机号'" :title="form.phone ? '更换手机号' : '绑定手机号'"
:visible.sync="phoneVisible" :visible.sync="phoneVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
@close="closePhone" @close="closePhone"
@ -365,7 +382,7 @@ export default {
data() { data() {
return { return {
userId: this.$store.state.userLoginId, userId: this.$store.state.userLoginId,
personalInformation: { form: {
name:'', name:'',
workNumber:'', workNumber:'',
password:"", password:"",
@ -482,7 +499,7 @@ export default {
}; };
}, },
mounted() { mounted() {
this.getdata(); this.getdata()
this.getProvince() this.getProvince()
this.getSchoolData() this.getSchoolData()
this.getSubject() this.getSubject()
@ -490,15 +507,15 @@ export default {
methods: { methods: {
getProvince(){ getProvince(){
this.$get(this.api.queryProvince).then(res => { this.$get(this.api.queryProvince).then(res => {
this.provinceList = res.message this.provinceList = res.list
this.$store.commit("provinceData", { provinceList : this.provinceList}); this.$store.commit("provinceData", { provinceList : this.provinceList});
}).catch(res => {}); }).catch(res => {});
}, },
// //
getCity(id,type,index){ getCity(id,type,index){
if(type == 1){ if(type == 1){
if(this.personalInformation.provinceId){ if(this.form.provinceId){
this.personalInformation.cityId = 1 this.form.cityId = 1
this.getCityData(type,index) this.getCityData(type,index)
} }
}else{ }else{
@ -510,12 +527,12 @@ export default {
} }
}, },
getCityData(type,index){ getCityData(type,index){
let provinceId = type == 1 ? this.personalInformation.provinceId : this.archivesList[index].provinceId let provinceId = type == 1 ? this.form.provinceId : this.archivesList[index].provinceId
this.$get(this.api.queryCity,{provinceId}).then(res => { this.$get(this.api.queryCity,{provinceId}).then(res => {
if(type == 1){ if(type == 1){
this.cityList = res.message this.cityList = res.list
}else{ }else{
this.archivesList[index].cityList = res.message this.archivesList[index].cityList = res.list
} }
}).catch(res => {}); }).catch(res => {});
}, },
@ -532,10 +549,10 @@ export default {
}).catch(res => {}); }).catch(res => {});
}, },
async accountChange(){ async accountChange(){
if(this.originAccount != this.personalInformation.account){ if(this.originAccount != this.form.account){
let res = await this.$get(this.api.queryAccountIsExist, { let res = await this.$get(this.api.queryAccountIsExist, {
account: this.personalInformation.account, account: this.form.account,
schoolId: this.personalInformation.schoolId schoolId: this.form.schoolId
}); });
if(res.message.user.length){ if(res.message.user.length){
this.$message.warning('该账号已存在'); this.$message.warning('该账号已存在');
@ -553,12 +570,16 @@ export default {
}, },
getdata() { getdata() {
this.$get(this.api.queryUserInfoDetails,{ userId: this.userId }).then(res => { this.$get(this.api.queryUserInfoDetails,{ userId: this.userId }).then(res => {
this.personalInformation = res.data.userInfo[0] let userInfo = res.result.hrUserInfo
this.personalInformation.idNumber = this.personalInformation.IDNumber let schoolId = userInfo.schoolId
this.originAccount = this.personalInformation.account this.form = Object.assign(userInfo,res.result.userAccountList[0])
this.archivesList = res.data.userPersonalFile this.form.schoolId = schoolId
this.form.accountId = userInfo.id
console.log(11,this.form)
this.originAccount = this.form.account
this.archivesList = res.result.personalFileList
this.$nextTick(() => { this.$nextTick(() => {
if(this.personalInformation.provinceId){ if(this.form.provinceId){
this.getCityData(1) this.getCityData(1)
} }
if(this.archivesList.length != 0){ if(this.archivesList.length != 0){
@ -600,24 +621,23 @@ export default {
this.concatArch(1) this.concatArch(1)
} }
}) })
}) }).catch(err => {})
.catch(err => {})
}, },
concatArch(isLoadData) { concatArch(isLoadData) {
this.archivesList = this.archivesList.concat({ this.archivesList = this.archivesList.concat({
isNew: true, isNew: true,
personalCareerId: '', // personalCareerId: '',
schoolId: '', // schoolId: '',
schoolName: '', // schoolName: '',
subjectList: this.subjectList, // subjectList: this.subjectList,
disciplineId: '', // disciplineId: '',
disciplineName: '', // disciplineName: '',
ProfessionalClassList: [], // ProfessionalClassList: [],
professionalClassId: '', // professionalClassId: '',
professionalClassName: '', // professionalClassName: '',
ProfessionalList: [], // ProfessionalList: [],
professionalId: '', // professionalId: '',
professionalName: '', // professionalName: '',
userId: this.userId, userId: this.userId,
personalFileId: '' personalFileId: ''
}) })
@ -633,16 +653,16 @@ export default {
this.archivesList.forEach((n,k) => { this.archivesList.forEach((n,k) => {
if(!n.personalCareerId) isEmpty = true if(!n.personalCareerId) isEmpty = true
}) })
if(isEmpty) return this.$message.warning('请选择职业'); if(isEmpty) return this.$message.warning('请选择职业')
this.showArch = true this.showArch = true
this.concatArch() this.concatArch()
}, },
bindEmail() { bindEmail() {
this.email = this.personalInformation.email this.email = this.form.email
this.emailVisible = true this.emailVisible = true
}, },
bindPhone() { bindPhone() {
this.phone = this.personalInformation.phone this.phone = this.form.phone
this.phoneVisible = true this.phoneVisible = true
}, },
bindPassword() { bindPassword() {
@ -658,16 +678,12 @@ export default {
let data = this.passwordForm let data = this.passwordForm
data.userid = this.userId data.userid = this.userId
this.$post(this.api.examinePassword,data) this.$post(this.api.examinePassword,data).then(res => {
.then(res => {
if(res.errmessage == 'success'){ if(res.errmessage == 'success'){
this.$message.success('更换成功') this.$message.success('更换成功')
this.passwordVisible = false this.passwordVisible = false
} }
}) }).catch(err => {})
.catch(err => {
console.log(err);
});
}, },
closePassword() { closePassword() {
this.passwordForm = { this.passwordForm = {
@ -687,7 +703,7 @@ export default {
getSubject(){ getSubject(){
this.$get(this.api.queryCourseDiscipline).then(res => { this.$get(this.api.queryCourseDiscipline).then(res => {
this.subjectList = res.message this.subjectList = res.message
}).catch(res => {}); }).catch(res => {})
}, },
// //
clearClass(){ clearClass(){
@ -698,9 +714,9 @@ export default {
getProfessionalClass(val){ getProfessionalClass(val){
this.clearClass() this.clearClass()
if(val){ if(val){
let obj = {}; let obj = {}
obj = this.subjectList.find((item)=>{ obj = this.subjectList.find((item)=>{
return item.disciplineId === val; return item.disciplineId === val
}); });
this.archivesForm.disciplineName = obj.disciplineName this.archivesForm.disciplineName = obj.disciplineName
this.getProfessionalClassData(val) this.getProfessionalClassData(val)
@ -723,9 +739,9 @@ export default {
getItemProfessionalClass(item,index){ getItemProfessionalClass(item,index){
this.clearItemClass(index) this.clearItemClass(index)
if(item){ if(item){
let obj = {}; let obj = {}
obj = this.subjectList.find(r =>{ obj = this.subjectList.find(r =>{
return r.disciplineId === item; return r.disciplineId === item
}); });
this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: item }).then(res => { this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: item }).then(res => {
this.archivesList.map(e =>{ this.archivesList.map(e =>{
@ -734,13 +750,13 @@ export default {
e.disciplineName = obj.disciplineName e.disciplineName = obj.disciplineName
} }
}) })
}).catch(res => {}); }).catch(res => {})
} }
}, },
getProfessionalClassData(value){ getProfessionalClassData(value){
this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: value }).then(res => { this.$get(this.api.queryCourseProfessionalClass,{ disciplineId: value }).then(res => {
this.ProfessionalClassList = res.message this.ProfessionalClassList = res.message
}).catch(res => {}); }).catch(res => {})
}, },
// //
clearProfess(){ clearProfess(){
@ -750,10 +766,10 @@ export default {
getProfessional(val){ getProfessional(val){
this.clearProfess() this.clearProfess()
if(val){ if(val){
let obj = {}; let obj = {}
obj = this.ProfessionalClassList.find((item)=>{ obj = this.ProfessionalClassList.find((item)=>{
return item.professionalClassId === val; return item.professionalClassId === val
}); })
this.archivesForm.professionalClassName = obj.professionalClassName this.archivesForm.professionalClassName = obj.professionalClassName
this.getProfessionalData(val) this.getProfessionalData(val)
} }
@ -774,29 +790,29 @@ export default {
this.$get(this.api.queryCourseProfessional,{ professionalClassId: item }).then(res => { this.$get(this.api.queryCourseProfessional,{ professionalClassId: item }).then(res => {
this.archivesList.map(e =>{ this.archivesList.map(e =>{
if(e.professionalClassId == item){ if(e.professionalClassId == item){
let obj = {}; let obj = {}
obj = e.ProfessionalClassList.find(r =>{ obj = e.ProfessionalClassList.find(r =>{
return r.professionalClassId === item; return r.professionalClassId === item
}); })
e.ProfessionalList = res.message e.ProfessionalList = res.message
e.professionalClassName = obj.professionalClassName e.professionalClassName = obj.professionalClassName
} }
}) })
}).catch(res => {}); }).catch(res => {})
} }
}, },
getProfessionalData(value){ getProfessionalData(value){
this.$get(this.api.queryCourseProfessional,{professionalClassId: value}).then(res => { this.$get(this.api.queryCourseProfessional,{professionalClassId: value}).then(res => {
this.ProfessionalList = res.message this.ProfessionalList = res.message
}).catch(res => {}); }).catch(res => {})
}, },
// //
getStuGrade(val){ getStuGrade(val){
if(val){ if(val){
let obj = {}; let obj = {}
obj = this.ProfessionalList.find(r =>{ obj = this.ProfessionalList.find(r =>{
return r.professionalId === val; return r.professionalId === val;
}); })
this.archivesForm.professionalName = obj.professionalName this.archivesForm.professionalName = obj.professionalName
} }
}, },
@ -804,10 +820,10 @@ export default {
if(item){ if(item){
this.archivesList.map(e =>{ this.archivesList.map(e =>{
if(e.professionalId == item){ if(e.professionalId == item){
let obj = {}; let obj = {}
obj = e.ProfessionalList.find(r =>{ obj = e.ProfessionalList.find(r =>{
return r.professionalId === item; return r.professionalId === item;
}); })
e.professionalName = obj.professionalName e.professionalName = obj.professionalName
} }
}) })
@ -821,32 +837,12 @@ export default {
}) })
if(isEmpty) return this.$message.warning('请选择职业') if(isEmpty) return this.$message.warning('请选择职业')
if(this.accountReapeat) return this.$message.warning('该账号已存在') if(this.accountReapeat) return this.$message.warning('该账号已存在')
if(this.personalInformation.idNumber && !/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)/.test(this.personalInformation.idNumber)) return this.$message.warning('请输入正确的证件号码') if(this.form.idNumber && !/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)/.test(this.form.idNumber)) return this.$message.warning('请输入正确的证件号码')
if(this.personalInformation.phone && !/^1[3456789]\d{9}$/.test(this.personalInformation.phone)) return this.$message.warning('请输入正确的手机号') // this.form.userId = this.userId
if(this.personalInformation.email && !/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(this.personalInformation.email)) return this.$message.warning('请输入正确的邮箱') let form = this.form
// this.personalInformation.userId = this.userId let personalFileList = []
let personalInformation = this.personalInformation
let userInfoEntity = {
idNumber: personalInformation.idNumber,
account: personalInformation.account,
cityId: personalInformation.cityId,
countries: personalInformation.countries,
dateBirth: personalInformation.dateBirth,
educationDegree: personalInformation.educationDegree,
email: personalInformation.email,
phone: personalInformation.phone,
provinceId: personalInformation.provinceId,
schoolId: personalInformation.schoolId,
sex: personalInformation.sex,
userId: personalInformation.userId,
userName: personalInformation.userName,
weChatID: personalInformation.weChatID,
}
let personalFileEntities = []
this.archivesList.forEach((n,k) => { this.archivesList.forEach((n,k) => {
personalFileEntities.push({ personalFileList.push({
cityId: n.cityId,
cityName: n.cityName,
disciplineId: n.disciplineId, disciplineId: n.disciplineId,
disciplineName: n.disciplineName, disciplineName: n.disciplineName,
personalCareerId: n.personalCareerId, personalCareerId: n.personalCareerId,
@ -863,12 +859,28 @@ export default {
}) })
}) })
let data = { let data = {
userInfoEntity, userId: this.userId,
personalFileEntities userAccountList: [{
id: form.accountId,
account: form.account,
userId: form.userId,
}],
hrUserInfo: {
cityId: form.cityId,
countries: form.countries,
dateBirth: form.dateBirth,
educationDegree: form.educationDegree,
idNumber: form.idNumber,
schoolId: form.schoolId,
sex: form.sex,
userId: this.userId,
userName: form.userName,
},
personalFileList,
} }
this.$put(this.api.userinfoUpdate,data).then(res => { this.$post(this.api.updatePersonCenter,data).then(res => {
this.$message.success('提交成功!') this.$message.success('提交成功!')
}).catch(res => {}); }).catch(res => {})
}, },
emailCountdown(){ emailCountdown(){
let count = 60 let count = 60
@ -940,7 +952,7 @@ export default {
this.$put(this.api.bingEmail,data).then(res => { this.$put(this.api.bingEmail,data).then(res => {
if(res.errmessage == 'success'){ if(res.errmessage == 'success'){
this.$message.success('绑定成功') this.$message.success('绑定成功')
this.personalInformation.email = this.email this.form.email = this.email
this.emailVisible = false this.emailVisible = false
} }
}).catch(res => {}); }).catch(res => {});
@ -979,7 +991,7 @@ export default {
this.$put(this.api.bindPhone,data).then(res => { this.$put(this.api.bindPhone,data).then(res => {
if(res.errmessage == 'success'){ if(res.errmessage == 'success'){
this.$message.success('绑定成功') this.$message.success('绑定成功')
this.personalInformation.phone = this.phone this.form.phone = this.phone
this.phoneVisible = false this.phoneVisible = false
} }
}).catch(res => {}); }).catch(res => {});

@ -645,7 +645,7 @@ export default {
}, },
getCityData(){ getCityData(){
this.$get(this.api.queryCity,{provinceId: this.form.provinceId}).then(res => { this.$get(this.api.queryCity,{provinceId: this.form.provinceId}).then(res => {
this.cityList = res.message this.cityList = res.list
}).catch(res => {}); }).catch(res => {});
}, },
// //

@ -264,7 +264,7 @@ export default {
provinceId: this.form.provinces provinceId: this.form.provinces
} }
this.$get(this.api.queryCity,data).then(res => { this.$get(this.api.queryCity,data).then(res => {
this.cityList = res.message this.cityList = res.list
}).catch(res => {}) }).catch(res => {})
}, },
// //
@ -322,11 +322,10 @@ export default {
resetPassword(row){ resetPassword(row){
this.$confirm(`重置后的密码为:${this.$config.initialPassword},确定重置?`, '提示', { this.$confirm(`重置后的密码为:${this.$config.initialPassword},确定重置?`, '提示', {
}).then(() => { }).then(() => {
let data = { this.$get(this.api.resetPwd,{
newPwd: this.$config.initialPassword, newPwd: this.$config.initialPassword,
userId: row.userId, userId: row.userId,
} }).then(res => {
this.$get(this.api.resetPwd,data).then(res => {
if(res.message == 'success'){ if(res.message == 'success'){
this.$message.success('重置成功') this.$message.success('重置成功')
}else{ }else{

Loading…
Cancel
Save