From 71569a19529abf02cacee7fa95be99af0f5452ab Mon Sep 17 00:00:00 2001 From: "DESKTOP-CUI7KST\\HXGK" <1501216501@qq.com> Date: Sun, 3 Mar 2024 10:22:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node_modules/.bin/JSONStream | 6 +- node_modules/.bin/acorn | 6 +- node_modules/.bin/atob | 6 +- node_modules/.bin/autoprefixer | 6 +- node_modules/.bin/browserslist | 6 +- node_modules/.bin/commitizen | 6 +- node_modules/.bin/commitlint | 6 +- node_modules/.bin/conventional-commits-parser | 6 +- node_modules/.bin/css-beautify | 6 +- node_modules/.bin/cssesc | 6 +- node_modules/.bin/cz | 6 +- node_modules/.bin/editorconfig | 6 +- node_modules/.bin/esbuild | 6 +- node_modules/.bin/eslint | 6 +- node_modules/.bin/eslint-config-prettier | 6 +- node_modules/.bin/git-cz | 6 +- node_modules/.bin/git-raw-commits | 6 +- node_modules/.bin/he | 6 +- node_modules/.bin/html-beautify | 6 +- node_modules/.bin/husky | 6 +- node_modules/.bin/image-size | 6 +- node_modules/.bin/jiti | 6 +- node_modules/.bin/js-beautify | 6 +- node_modules/.bin/js-yaml | 6 +- node_modules/.bin/json5 | 6 +- node_modules/.bin/lint-staged | 6 +- node_modules/.bin/nanoid | 6 +- node_modules/.bin/node-which | 6 +- node_modules/.bin/nopt | 6 +- node_modules/.bin/parser | 6 +- node_modules/.bin/pidtree | 6 +- node_modules/.bin/prettier | 6 +- node_modules/.bin/resolve | 6 +- node_modules/.bin/rimraf | 6 +- node_modules/.bin/rollup | 6 +- node_modules/.bin/sass | 6 +- node_modules/.bin/semver | 6 +- node_modules/.bin/stylelint | 6 +- node_modules/.bin/svgo | 6 +- node_modules/.bin/ts-node | 6 +- node_modules/.bin/ts-node-cwd | 6 +- node_modules/.bin/ts-node-esm | 6 +- node_modules/.bin/ts-node-script | 6 +- node_modules/.bin/ts-node-transpile-only | 6 +- node_modules/.bin/ts-script | 6 +- node_modules/.bin/tsc | 6 +- node_modules/.bin/tsserver | 6 +- node_modules/.bin/unocss | 6 +- node_modules/.bin/update-browserslist-db | 6 +- node_modules/.bin/vite | 6 +- node_modules/.bin/vue-tsc | 6 +- .../core/node_modules/.bin/vue-demi-fix | 6 +- .../core/node_modules/.bin/vue-demi-switch | 6 +- .../shared/node_modules/.bin/vue-demi-fix | 6 +- .../shared/node_modules/.bin/vue-demi-switch | 6 +- .../core/node_modules/.bin/vue-demi-fix | 6 +- .../core/node_modules/.bin/vue-demi-switch | 6 +- .../shared/node_modules/.bin/vue-demi-fix | 6 +- .../shared/node_modules/.bin/vue-demi-switch | 6 +- .../global-prefix/node_modules/.bin/which | 6 +- .../pinia/node_modules/.bin/vue-demi-fix | 6 +- .../pinia/node_modules/.bin/vue-demi-switch | 6 +- .../read-pkg/node_modules/.bin/semver | 6 +- .../stylelint/node_modules/.bin/which | 6 +- src/api/hr/people/datacont.ts | 663 +++++++------- src/api/hr/people/index.ts | 283 +++--- src/api/hr/people/type.ts | 850 +++++++++--------- src/types/components.d.ts | 25 - src/views/hr/archives/archivescont.vue | 380 ++++---- .../basicinformation/appraisalrecord.vue | 3 + .../basicinformation/appraisalrecordadd.vue | 3 + .../basicinformation/appraisalrecordedit.vue | 3 + .../basicinformation/charactercolor.vue | 68 ++ .../hr/archives/basicinformation/content.vue | 166 ++-- .../archives/basicinformation/editcontent.vue | 459 +++++----- .../basicinformation/emergencycontact.vue | 100 +-- .../basicinformation/emergencycontactadd.vue | 73 +- .../basicinformation/emergencycontactedit.vue | 95 +- .../basicinformation/familymembersadd.vue | 3 - .../rewardsandpunishments.vue | 8 + .../rewardsandpunishmentsadd.vue | 3 + .../rewardsandpunishmentsedit.vue | 3 + .../basicinformation/workingcouple.vue | 110 +-- .../basicinformation/workingcoupleadd.vue | 109 ++- .../basicinformation/workingcoupleedit.vue | 103 ++- 85 files changed, 2134 insertions(+), 1760 deletions(-) create mode 100644 src/views/hr/archives/basicinformation/appraisalrecord.vue create mode 100644 src/views/hr/archives/basicinformation/appraisalrecordadd.vue create mode 100644 src/views/hr/archives/basicinformation/appraisalrecordedit.vue create mode 100644 src/views/hr/archives/basicinformation/charactercolor.vue create mode 100644 src/views/hr/archives/basicinformation/rewardsandpunishments.vue create mode 100644 src/views/hr/archives/basicinformation/rewardsandpunishmentsadd.vue create mode 100644 src/views/hr/archives/basicinformation/rewardsandpunishmentsedit.vue diff --git a/node_modules/.bin/JSONStream b/node_modules/.bin/JSONStream index 32d1fef1b..936e297cf 100644 --- a/node_modules/.bin/JSONStream +++ b/node_modules/.bin/JSONStream @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/acorn b/node_modules/.bin/acorn index 46a3e61a1..679bd163c 100644 --- a/node_modules/.bin/acorn +++ b/node_modules/.bin/acorn @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/atob b/node_modules/.bin/atob index 6d8ec0eef..bcdbad117 100644 --- a/node_modules/.bin/atob +++ b/node_modules/.bin/atob @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/autoprefixer b/node_modules/.bin/autoprefixer index c6bc975db..2d2ee7011 100644 --- a/node_modules/.bin/autoprefixer +++ b/node_modules/.bin/autoprefixer @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/browserslist b/node_modules/.bin/browserslist index 68dd69d49..60e71ad87 100644 --- a/node_modules/.bin/browserslist +++ b/node_modules/.bin/browserslist @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/commitizen b/node_modules/.bin/commitizen index 19fc36603..765e57e5a 100644 --- a/node_modules/.bin/commitizen +++ b/node_modules/.bin/commitizen @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/commitlint b/node_modules/.bin/commitlint index 032c6d86a..6a09cda83 100644 --- a/node_modules/.bin/commitlint +++ b/node_modules/.bin/commitlint @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/conventional-commits-parser b/node_modules/.bin/conventional-commits-parser index 7bd47e2c5..0ade29a00 100644 --- a/node_modules/.bin/conventional-commits-parser +++ b/node_modules/.bin/conventional-commits-parser @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/css-beautify b/node_modules/.bin/css-beautify index d2660ca53..8d4975eb6 100644 --- a/node_modules/.bin/css-beautify +++ b/node_modules/.bin/css-beautify @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/cssesc b/node_modules/.bin/cssesc index c9b52142b..5dd9699c8 100644 --- a/node_modules/.bin/cssesc +++ b/node_modules/.bin/cssesc @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/cz b/node_modules/.bin/cz index df7a5955f..854af6006 100644 --- a/node_modules/.bin/cz +++ b/node_modules/.bin/cz @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/editorconfig b/node_modules/.bin/editorconfig index 6ff1a81ea..3af117c2a 100644 --- a/node_modules/.bin/editorconfig +++ b/node_modules/.bin/editorconfig @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/esbuild b/node_modules/.bin/esbuild index 26bef5477..63bb6d40f 100644 --- a/node_modules/.bin/esbuild +++ b/node_modules/.bin/esbuild @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/eslint b/node_modules/.bin/eslint index 4e7c1c901..d450ee1f9 100644 --- a/node_modules/.bin/eslint +++ b/node_modules/.bin/eslint @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/eslint-config-prettier b/node_modules/.bin/eslint-config-prettier index 913590dc7..478b3ef7a 100644 --- a/node_modules/.bin/eslint-config-prettier +++ b/node_modules/.bin/eslint-config-prettier @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/git-cz b/node_modules/.bin/git-cz index df7a5955f..854af6006 100644 --- a/node_modules/.bin/git-cz +++ b/node_modules/.bin/git-cz @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/git-raw-commits b/node_modules/.bin/git-raw-commits index 51a1eb15e..a780b8191 100644 --- a/node_modules/.bin/git-raw-commits +++ b/node_modules/.bin/git-raw-commits @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/he b/node_modules/.bin/he index 70e18de98..441322aab 100644 --- a/node_modules/.bin/he +++ b/node_modules/.bin/he @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/html-beautify b/node_modules/.bin/html-beautify index 771a682a7..01bb13a43 100644 --- a/node_modules/.bin/html-beautify +++ b/node_modules/.bin/html-beautify @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/husky b/node_modules/.bin/husky index 4f96c887e..bf8fd8791 100644 --- a/node_modules/.bin/husky +++ b/node_modules/.bin/husky @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/image-size b/node_modules/.bin/image-size index ae4ce4c9e..c806c7598 100644 --- a/node_modules/.bin/image-size +++ b/node_modules/.bin/image-size @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/jiti b/node_modules/.bin/jiti index c37115ae6..4b9f4a770 100644 --- a/node_modules/.bin/jiti +++ b/node_modules/.bin/jiti @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/js-beautify b/node_modules/.bin/js-beautify index 132eb19f9..b6e88af45 100644 --- a/node_modules/.bin/js-beautify +++ b/node_modules/.bin/js-beautify @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/js-yaml b/node_modules/.bin/js-yaml index ed78a8682..82416ef1f 100644 --- a/node_modules/.bin/js-yaml +++ b/node_modules/.bin/js-yaml @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/json5 b/node_modules/.bin/json5 index 977b75071..abf72a4ec 100644 --- a/node_modules/.bin/json5 +++ b/node_modules/.bin/json5 @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/lint-staged b/node_modules/.bin/lint-staged index 070f62db0..f5b5bd716 100644 --- a/node_modules/.bin/lint-staged +++ b/node_modules/.bin/lint-staged @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/nanoid b/node_modules/.bin/nanoid index 23254eb22..46220bdb5 100644 --- a/node_modules/.bin/nanoid +++ b/node_modules/.bin/nanoid @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/node-which b/node_modules/.bin/node-which index aece73531..b49b03f7d 100644 --- a/node_modules/.bin/node-which +++ b/node_modules/.bin/node-which @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/nopt b/node_modules/.bin/nopt index f1ec43bc2..0808130fb 100644 --- a/node_modules/.bin/nopt +++ b/node_modules/.bin/nopt @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/parser b/node_modules/.bin/parser index cb5b10d8a..7696ad41d 100644 --- a/node_modules/.bin/parser +++ b/node_modules/.bin/parser @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/pidtree b/node_modules/.bin/pidtree index 1b484992f..05eec73a7 100644 --- a/node_modules/.bin/pidtree +++ b/node_modules/.bin/pidtree @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/prettier b/node_modules/.bin/prettier index 3e9eb4b94..a41581b9f 100644 --- a/node_modules/.bin/prettier +++ b/node_modules/.bin/prettier @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/resolve b/node_modules/.bin/resolve index 757d454aa..c043cba00 100644 --- a/node_modules/.bin/resolve +++ b/node_modules/.bin/resolve @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/rimraf b/node_modules/.bin/rimraf index b81682550..6d6240a87 100644 --- a/node_modules/.bin/rimraf +++ b/node_modules/.bin/rimraf @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/rollup b/node_modules/.bin/rollup index 11bd86d07..998fc164c 100644 --- a/node_modules/.bin/rollup +++ b/node_modules/.bin/rollup @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/sass b/node_modules/.bin/sass index 44ba6e9e9..dde84001a 100644 --- a/node_modules/.bin/sass +++ b/node_modules/.bin/sass @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/semver b/node_modules/.bin/semver index 77443e787..97c53279f 100644 --- a/node_modules/.bin/semver +++ b/node_modules/.bin/semver @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/stylelint b/node_modules/.bin/stylelint index 734343ffb..071a48d27 100644 --- a/node_modules/.bin/stylelint +++ b/node_modules/.bin/stylelint @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/svgo b/node_modules/.bin/svgo index 96eb5601b..15092ee60 100644 --- a/node_modules/.bin/svgo +++ b/node_modules/.bin/svgo @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/ts-node b/node_modules/.bin/ts-node index 54276ecc8..f3d4faba0 100644 --- a/node_modules/.bin/ts-node +++ b/node_modules/.bin/ts-node @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/ts-node-cwd b/node_modules/.bin/ts-node-cwd index ecea815ce..ae68e8588 100644 --- a/node_modules/.bin/ts-node-cwd +++ b/node_modules/.bin/ts-node-cwd @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/ts-node-esm b/node_modules/.bin/ts-node-esm index 6ecbb8e08..19ea759fa 100644 --- a/node_modules/.bin/ts-node-esm +++ b/node_modules/.bin/ts-node-esm @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/ts-node-script b/node_modules/.bin/ts-node-script index 82fbad1c3..14c2f67c4 100644 --- a/node_modules/.bin/ts-node-script +++ b/node_modules/.bin/ts-node-script @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/ts-node-transpile-only b/node_modules/.bin/ts-node-transpile-only index a7fc92abc..d3d4c0c9d 100644 --- a/node_modules/.bin/ts-node-transpile-only +++ b/node_modules/.bin/ts-node-transpile-only @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/ts-script b/node_modules/.bin/ts-script index d776b64f8..8f65f364d 100644 --- a/node_modules/.bin/ts-script +++ b/node_modules/.bin/ts-script @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/tsc b/node_modules/.bin/tsc index 49798517b..c4864b9a0 100644 --- a/node_modules/.bin/tsc +++ b/node_modules/.bin/tsc @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/tsserver b/node_modules/.bin/tsserver index cc53aac9e..6c19ce3d4 100644 --- a/node_modules/.bin/tsserver +++ b/node_modules/.bin/tsserver @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/unocss b/node_modules/.bin/unocss index f4282e313..1b71fe011 100644 --- a/node_modules/.bin/unocss +++ b/node_modules/.bin/unocss @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/update-browserslist-db b/node_modules/.bin/update-browserslist-db index 8cde7e333..cced63c46 100644 --- a/node_modules/.bin/update-browserslist-db +++ b/node_modules/.bin/update-browserslist-db @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/vite b/node_modules/.bin/vite index a85d325d8..014463f96 100644 --- a/node_modules/.bin/vite +++ b/node_modules/.bin/vite @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/.bin/vue-tsc b/node_modules/.bin/vue-tsc index 73e5a9b20..9a2bbad29 100644 --- a/node_modules/.bin/vue-tsc +++ b/node_modules/.bin/vue-tsc @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/@vueuse/core/node_modules/.bin/vue-demi-fix b/node_modules/@vueuse/core/node_modules/.bin/vue-demi-fix index dba27714b..a4fe91dca 100644 --- a/node_modules/@vueuse/core/node_modules/.bin/vue-demi-fix +++ b/node_modules/@vueuse/core/node_modules/.bin/vue-demi-fix @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/@vueuse/core/node_modules/.bin/vue-demi-switch b/node_modules/@vueuse/core/node_modules/.bin/vue-demi-switch index 458c052b6..2bcb66e0c 100644 --- a/node_modules/@vueuse/core/node_modules/.bin/vue-demi-switch +++ b/node_modules/@vueuse/core/node_modules/.bin/vue-demi-switch @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-fix b/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-fix index dba27714b..a4fe91dca 100644 --- a/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-fix +++ b/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-fix @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-switch b/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-switch index 458c052b6..2bcb66e0c 100644 --- a/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-switch +++ b/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-switch @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/element-plus/node_modules/@vueuse/core/node_modules/.bin/vue-demi-fix b/node_modules/element-plus/node_modules/@vueuse/core/node_modules/.bin/vue-demi-fix index dba27714b..a4fe91dca 100644 --- a/node_modules/element-plus/node_modules/@vueuse/core/node_modules/.bin/vue-demi-fix +++ b/node_modules/element-plus/node_modules/@vueuse/core/node_modules/.bin/vue-demi-fix @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/element-plus/node_modules/@vueuse/core/node_modules/.bin/vue-demi-switch b/node_modules/element-plus/node_modules/@vueuse/core/node_modules/.bin/vue-demi-switch index 458c052b6..2bcb66e0c 100644 --- a/node_modules/element-plus/node_modules/@vueuse/core/node_modules/.bin/vue-demi-switch +++ b/node_modules/element-plus/node_modules/@vueuse/core/node_modules/.bin/vue-demi-switch @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/element-plus/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-fix b/node_modules/element-plus/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-fix index dba27714b..a4fe91dca 100644 --- a/node_modules/element-plus/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-fix +++ b/node_modules/element-plus/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-fix @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/element-plus/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-switch b/node_modules/element-plus/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-switch index 458c052b6..2bcb66e0c 100644 --- a/node_modules/element-plus/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-switch +++ b/node_modules/element-plus/node_modules/@vueuse/shared/node_modules/.bin/vue-demi-switch @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/global-prefix/node_modules/.bin/which b/node_modules/global-prefix/node_modules/.bin/which index c51820f2f..cf23e6563 100644 --- a/node_modules/global-prefix/node_modules/.bin/which +++ b/node_modules/global-prefix/node_modules/.bin/which @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/pinia/node_modules/.bin/vue-demi-fix b/node_modules/pinia/node_modules/.bin/vue-demi-fix index dba27714b..a4fe91dca 100644 --- a/node_modules/pinia/node_modules/.bin/vue-demi-fix +++ b/node_modules/pinia/node_modules/.bin/vue-demi-fix @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/pinia/node_modules/.bin/vue-demi-switch b/node_modules/pinia/node_modules/.bin/vue-demi-switch index 458c052b6..2bcb66e0c 100644 --- a/node_modules/pinia/node_modules/.bin/vue-demi-switch +++ b/node_modules/pinia/node_modules/.bin/vue-demi-switch @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/read-pkg/node_modules/.bin/semver b/node_modules/read-pkg/node_modules/.bin/semver index 86cee84b6..384db49d8 100644 --- a/node_modules/read-pkg/node_modules/.bin/semver +++ b/node_modules/read-pkg/node_modules/.bin/semver @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/node_modules/stylelint/node_modules/.bin/which b/node_modules/stylelint/node_modules/.bin/which index c51820f2f..cf23e6563 100644 --- a/node_modules/stylelint/node_modules/.bin/which +++ b/node_modules/stylelint/node_modules/.bin/which @@ -2,7 +2,11 @@ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") case `uname` in - *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;; + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; esac if [ -x "$basedir/node" ]; then diff --git a/src/api/hr/people/datacont.ts b/src/api/hr/people/datacont.ts index 889d7e838..397cd82d2 100644 --- a/src/api/hr/people/datacont.ts +++ b/src/api/hr/people/datacont.ts @@ -2,549 +2,562 @@ * 用工关系（1:临时工 , 2:编外人员 ;3:实习&实习生;4：试用员工；5：待分配；6：待岗；7：临时调入；8：正式员工；9：长期病假；10：停薪留职；11：退休；12：辞职；13：辞退；14：离职）', `company` 入职公司', */ - export const emptypeOptions =[ +export const emptypeOptions = [ { - id:1, - name:"临时工" + id: 1, + name: "临时工" }, { - id:2, - name:"编外人员" + id: 2, + name: "编外人员" }, { - id:3, - name:"实习&实习生" + id: 3, + name: "实习&实习生" }, { - id:4, - name:"试用员工" + id: 4, + name: "试用员工" }, { - id:5, - name:"待分配" + id: 5, + name: "待分配" }, { - id:6, - name:"待岗" + id: 6, + name: "待岗" }, { - id:7, - name:"临时调入" + id: 7, + name: "临时调入" }, { - id:8, - name:"正式员工" + id: 8, + name: "正式员工" }, { - id:9, - name:"长期病假" + id: 9, + name: "长期病假" }, { - id:10, - name:"停薪留职" + id: 10, + name: "停薪留职" } ]; -export const emptypeOptionsFalse = [ +export const emptypeOptionsFalse = [ { - id:11, - name:"退休" + id: 11, + name: "退休" }, { - id:12, - name:"辞职" + id: 12, + name: "辞职" }, { - id:13, - name:"辞退" + id: 13, + name: "辞退" }, { - id:14, - name:"离职" + id: 14, + name: "离职" } ]; /** * 性别 */ - export const userGender = [ +export const userGender = [ { - id:1, - name:"男" + id: 1, + name: "男" }, { - id:2, - name:"女" + id: 2, + name: "女" }, { - id:3, - name:"中性" + id: 3, + name: "中性" } ]; export const healthStates = [ { - id:1, - name:"良好" + id: 1, + name: "良好" }, { - id:2, - name:"一般" + id: 2, + name: "一般" }, { - id:3, - name:"较弱" + id: 3, + name: "较弱" }, { - id:4, - name:"有生理缺陷" + id: 4, + name: "有生理缺陷" }, { - id:5, - name:"残废" + id: 5, + name: "残废" } ]; /** * 婚姻状况 */ - export const userMaritalstatus = [ +export const userMaritalstatus = [ { - id:1, - name:"未婚" + id: 1, + name: "未婚" }, { - id:2, - name:"已婚" + id: 2, + name: "已婚" }, { - id:3, - name:"丧偶" + id: 3, + name: "丧偶" }, { - id:4, - name:"离异" + id: 4, + name: "离异" } ]; /** * 政治面貌 */ - export const userPoliticaloutloo =[ +export const userPoliticaloutloo = [ { - id:1, - name:"群众" + id: 1, + name: "群众" }, { - id:2, - name:"无党派" + id: 2, + name: "无党派" }, { - id:3, - name:"台盟会员" + id: 3, + name: "台盟会员" }, { - id:4, - name:"九三社员" + id: 4, + name: "九三社员" }, { - id:5, - name:"致公党员" + id: 5, + name: "致公党员" }, { - id:6, - name:"农工党员" + id: 6, + name: "农工党员" }, { - id:7, - name:"民进会员" + id: 7, + name: "民进会员" }, { - id:8, - name:"民建会员" + id: 8, + name: "民建会员" }, { - id:9, - name:"民盟盟员" + id: 9, + name: "民盟盟员" }, { - id:10, - name:"民革会员" + id: 10, + name: "民革会员" }, { - id:11, - name:"共青团员" + id: 11, + name: "共青团员" }, { - id:12, - name:"预备党员" + id: 12, + name: "预备党员" }, { - id:13, - name:"中共党员" + id: 13, + name: "中共党员" } ]; /** * 星座 */ - export const userConstellationing =[ +export const userConstellationing = [ { - id:1, - name:"白羊座" + id: 1, + name: "白羊座" }, { - id:2, - name:"金牛座" + id: 2, + name: "金牛座" }, { - id:3, - name:"双子座" + id: 3, + name: "双子座" }, { - id:4, - name:"巨蟹座" + id: 4, + name: "巨蟹座" }, { - id:5, - name:"狮子座" + id: 5, + name: "狮子座" }, { - id:6, - name:"处女座" + id: 6, + name: "处女座" }, { - id:7, - name:"天枰座" + id: 7, + name: "天枰座" }, { - id:8, - name:"天蝎座" + id: 8, + name: "天蝎座" }, { - id:9, - name:"射手座" + id: 9, + name: "射手座" }, { - id:10, - name:"摩羯座" + id: 10, + name: "摩羯座" }, { - id:11, - name:"水瓶座" + id: 11, + name: "水瓶座" }, { - id:12, - name:"双鱼座" + id: 12, + name: "双鱼座" } ]; /** * 雇佣类型 */ - export const userHireclass = [ +export const userHireclass = [ { - id:1, - name:"雇佣入职" + id: 1, + name: "雇佣入职" }, { - id:2, - name:"再入职" + id: 2, + name: "再入职" } ]; /** * 用工关系（1:临时工 , 2:编外人员 ;3:实习&实习生;4：试用员工；5：待分配；6：待岗；7：临时调入；8：正式员工；9：长期病假；10：停薪留职；11：退休；12：辞职；13：辞退；14：离职）', `company` 入职公司', */ - export const emptypeOptionsAll =[ +export const emptypeOptionsAll = [ { - id:1, - name:"临时工" + id: 1, + name: "临时工" }, { - id:2, - name:"编外人员" + id: 2, + name: "编外人员" }, { - id:3, - name:"实习&实习生" + id: 3, + name: "实习&实习生" }, { - id:4, - name:"试用员工" + id: 4, + name: "试用员工" }, { - id:5, - name:"待分配" + id: 5, + name: "待分配" }, { - id:6, - name:"待岗" + id: 6, + name: "待岗" }, { - id:7, - name:"临时调入" + id: 7, + name: "临时调入" }, { - id:8, - name:"正式员工" + id: 8, + name: "正式员工" }, { - id:9, - name:"长期病假" + id: 9, + name: "长期病假" }, { - id:10, - name:"停薪留职" + id: 10, + name: "停薪留职" }, { - id:11, - name:"退休" + id: 11, + name: "退休" }, { - id:12, - name:"辞职" + id: 12, + name: "辞职" }, { - id:13, - name:"辞退" + id: 13, + name: "辞退" }, { - id:14, - name:"离职" + id: 14, + name: "离职" } ]; /** * 是否 */ - export const yesOrno = [ +export const yesOrno = [ { - id:1, - name:"是" + id: 1, + name: "是" }, { - id:2, - name:"否" + id: 2, + name: "否" + } +]; +/** + * 户口性质 + */ +export const Householdregistration = [ + { + id: 1, + name: "农业户口" + }, + { + id: 2, + name: "非农业户口" } ]; /** * 学历 */ -export const education =[ +export const education = [ { - id:1, - name:'初中及以下' + id: 1, + name: '初中及以下' }, { - id:2, - name:'中专' + id: 2, + name: '中专' }, { - id:3, - name:'高中' + id: 3, + name: '高中' }, { - id:4, - name:'中技' + id: 4, + name: '中技' }, { - id:5, - name:'高技' + id: 5, + name: '高技' }, { - id:6, - name:'函数专科' + id: 6, + name: '函数专科' }, { - id:7, - name:'大学专科' + id: 7, + name: '大学专科' }, { - id:8, - name:'函数本科' + id: 8, + name: '函数本科' }, { - id:9, - name:'大学本科' + id: 9, + name: '大学本科' }, { - id:10, - name:'硕士研究生' + id: 10, + name: '硕士研究生' }, { - id:11, - name:'博士研究生' + id: 11, + name: '博士研究生' }, { - id:12, - name:'专家、教授' + id: 12, + name: '专家、教授' }, ]; //入职等级 export const positiongrade = [ - { - id:10000, - name:'无' - }, - { - id:1, - name:'一级' - }, - { - id:2, - name:'二级' - }, - { - id:3, - name:'三级' - } + { + id: 10000, + name: '无' + }, + { + id: 1, + name: '一级' + }, + { + id: 2, + name: '二级' + }, + { + id: 3, + name: '三级' + } ]; //学位 export const academicDegree = [ - { - id:1, - name:'无' - }, - { - id:2, - name:'学士' - }, - { - id:3, - name:'硕士' - }, - { - id:4, - name:'博士' - }, - { - id:5, - name:'教育学学位' - } + { + id: 1, + name: '无' + }, + { + id: 2, + name: '学士' + }, + { + id: 3, + name: '硕士' + }, + { + id: 4, + name: '博士' + }, + { + id: 5, + name: '教育学学位' + } ]; //主职与兼职 export const mainAndPartTimeJobs = [ - { - id:1, - name:'主职' - }, - { - id:2, - name:'兼职' - } + { + id: 1, + name: '主职' + }, + { + id: 2, + name: '兼职' + } ]; // 职位变动类型 -export const postChangeType=[ - { - id:1, - name:'预入职' - }, - { - id:2, - name:'雇佣入职' - }, - { - id:3, - name:'转正' - }, - { - id:4, - name:'晋升' - }, - { - id:5, - name:'降级' - }, - { - id:6, - name:'职等调整' - }, - { - id:7, - name:'调动调入' - }, - { - id:8, - name:'跨公司调动调入' - }, - { - id:9, - name:'借调' - }, - { - id:10, - name:'平调' - }, - { - id:11, - name:'兼职' - }, - { - id:12, - name:'预离职' - }, - { - id:13, - name:'离职' - }, - { - id:14, - name:'退休' - }, - { - id:15, - name:'返聘' - }, - { - id:16, - name:'员工初始化' - }, - { - id:17, - name:'擅自离职' - }, - { - id:18, - name:'即辞即走' - }, - { - id:19, - name:'组织调整' - }, - { - id:20, - name:'辞退' - }, - { - id:21, - name:'跨公司借调调出' - }, - { - id:22, - name:'跨公司借调调入' - }, - { - id:23, - name:'培训期间离职' - }, - { - id:24, - name:'合同到期' - }, - { - id:25, - name:'实习结束' - } - +export const postChangeType = [ + { + id: 1, + name: '预入职' + }, + { + id: 2, + name: '雇佣入职' + }, + { + id: 3, + name: '转正' + }, + { + id: 4, + name: '晋升' + }, + { + id: 5, + name: '降级' + }, + { + id: 6, + name: '职等调整' + }, + { + id: 7, + name: '调动调入' + }, + { + id: 8, + name: '跨公司调动调入' + }, + { + id: 9, + name: '借调' + }, + { + id: 10, + name: '平调' + }, + { + id: 11, + name: '兼职' + }, + { + id: 12, + name: '预离职' + }, + { + id: 13, + name: '离职' + }, + { + id: 14, + name: '退休' + }, + { + id: 15, + name: '返聘' + }, + { + id: 16, + name: '员工初始化' + }, + { + id: 17, + name: '擅自离职' + }, + { + id: 18, + name: '即辞即走' + }, + { + id: 19, + name: '组织调整' + }, + { + id: 20, + name: '辞退' + }, + { + id: 21, + name: '跨公司借调调出' + }, + { + id: 22, + name: '跨公司借调调入' + }, + { + id: 23, + name: '培训期间离职' + }, + { + id: 24, + name: '合同到期' + }, + { + id: 25, + name: '实习结束' + } + ]; /** * 学历性质 */ - export const xuliClass = [ +export const xuliClass = [ { - id:1, - name:"普通" + id: 1, + name: "普通" }, { - id:2, - name:"第一学历" + id: 2, + name: "第一学历" }, { - id:3, - name:"最高学历" + id: 3, + name: "最高学历" } ] diff --git a/src/api/hr/people/index.ts b/src/api/hr/people/index.ts index 372d30bf9..d395c2043 100644 --- a/src/api/hr/people/index.ts +++ b/src/api/hr/people/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { +import { archivesList, searchCriteriaForPeople, contId, @@ -27,342 +27,351 @@ import { /** * 获取人员档案 */ - export function getArchivesListPage(data?: searchCriteriaForPeople): AxiosPromise { +export function getArchivesListPage(data?: searchCriteriaForPeople): AxiosPromise { return request({ - url: '/hrapi/staff/archiveslistcont', - method: 'post', - data: data + url: '/hrapi/staff/archiveslistcont', + method: 'post', + data: data }); } /** * 获取人员行政组织关系 */ - export function getPeopleAboutOrg(data?: contId) { +export function getPeopleAboutOrg(data?: contId) { return request({ - url: '/hrapi/staff/useraboutorglist', - method: 'post', - data: data + url: '/hrapi/staff/useraboutorglist', + method: 'post', + data: data }); } /** * 获取紧急联系人 */ - export function getEmergencyContact(data?: contId) { +export function getEmergencyContact(data?: contId) { return request({ - url: '/hrapi/staff/emergencycontactlist', - method: 'post', - data: data + url: '/hrapi/staff/emergencycontactlist', + method: 'post', + data: data }); } /** * 获双职工 */ - export function getWorkingCouple(data?: contId) { +export function getWorkingCouple(data?: contId) { return request({ - url: '/hrapi/staff/doubleworkerlist', - method: 'post', - data: data + url: '/hrapi/staff/doubleworkerlist', + method: 'post', + data: data }); } /** * 获双家庭成员 */ - export function getFamilyMembers(data?: contId) { +export function getFamilyMembers(data?: contId) { return request({ - url: '/hrapi/staff/familymemberslist', - method: 'post', - data: data + url: '/hrapi/staff/familymemberslist', + method: 'post', + data: data }); } /** * 获取教育经历 */ - export function getEducationalExperience(data?: contId) { +export function getEducationalExperience(data?: contId) { return request({ - url: '/hrapi/staff/personneleducationlist', - method: 'post', - data: data + url: '/hrapi/staff/personneleducationlist', + method: 'post', + data: data }); } /** * 获取集团内部工作经历 */ - export function getInnerWork(data?: contId) { +export function getInnerWork(data?: contId) { return request({ - url: '/hrapi/staff/getinsideworkhistorylist', - method: 'post', - data: data + url: '/hrapi/staff/getinsideworkhistorylist', + method: 'post', + data: data }); } /** * 获取集团内部工作经历 */ - export function getoOutsideWork(data?: contId) { +export function getoOutsideWork(data?: contId) { return request({ - url: '/hrapi/staff/workhistorylist', - method: 'post', - data: data + url: '/hrapi/staff/workhistorylist', + method: 'post', + data: data }); } /** * 获取集团内部工作经历 */ - export function editUserPwd(data?: editPwdCont) { +export function editUserPwd(data?: editPwdCont) { return request({ - url: '/hrapi/staff/editpassword', - method: 'post', - data: data + url: '/hrapi/staff/editpassword', + method: 'post', + data: data }); } /** * 获取个人相信信息 */ - export function getMyInfoing(data?: contIdes) { +export function getMyInfoing(data?: contIdes) { return request({ - url: '/hrapi/staff/get_archives_cont', - method: 'post', - data: data + url: '/hrapi/staff/get_archives_cont', + method: 'post', + data: data }); } /** * 修改个人头像 */ - export function editMyInfoIcon(data: editUserIcon) { +export function editMyInfoIcon(data: editUserIcon) { return request({ - url: '/hrapi/staff/edit_people_icon', - method: 'post', - data: data + url: '/hrapi/staff/edit_people_icon', + method: 'post', + data: data }); } /** * 编辑人员行政组织关系 */ - export function editMyOrgUndertake(data: editUserAboutOrg) { +export function editMyOrgUndertake(data: editUserAboutOrg) { return request({ - url: '/hrapi/staff/edit_man_org_cont', - method: 'post', - data: data + url: '/hrapi/staff/edit_man_org_cont', + method: 'post', + data: data }); } /** * 编辑个人相信信息 */ - export function editMyInfoing(data?: userManOrFucont) { +export function editMyInfoing(data?: userManOrFucont) { return request({ - url: '/hrapi/staff/edit_manmain_cont', - method: 'post', - data: data + url: '/hrapi/staff/edit_manmain_cont', + method: 'post', + data: data }); } /** * 添加紧急联系人 */ - export function addEmergencyContactInfo(data?: emergencyContactAdd) { +export function addEmergencyContactInfo(data?: emergencyContactAdd) { return request({ - url: '/hrapi/staff/addemercycall', - method: 'post', - data: data + url: '/hrapi/staff/addemercycall', + method: 'post', + data: data }); } /** * 编辑紧急联系人 */ - export function editEmergencyContactInfo(data?: emergencyContactInfo) { +export function editEmergencyContactInfo(data?: emergencyContactInfo) { return request({ - url: '/hrapi/staff/editemercycall', - method: 'post', - data: data + url: '/hrapi/staff/editemercycall', + method: 'post', + data: data }); } /** * 编辑紧急联系人状态 */ - export function editEmergencyContactState(data?: delJjlxr) { +export function editEmergencyContactState(data?: delJjlxr) { return request({ - url: '/hrapi/staff/editemercycallstate', - method: 'post', - data: data + url: '/hrapi/staff/editemercycallstate', + method: 'post', + data: data }); } /** * 添加双职工 */ - export function addDoubleWorkCont(data?: doubleWorkCont) { +export function addDoubleWorkCont(data?: doubleWorkCont) { return request({ - url: '/hrapi/staff/adddoubleworker', - method: 'post', - data: data + url: '/hrapi/staff/adddoubleworker', + method: 'post', + data: data }); } /** * 编辑双职工内容 */ - export function editDoubleWorkCont(data?: doubleWorkCont) { +export function editDoubleWorkCont(data?: doubleWorkCont) { return request({ - url: '/hrapi/staff/eidtdoubleworker', - method: 'post', - data: data + url: '/hrapi/staff/eidtdoubleworker', + method: 'post', + data: data }); } /** * 编辑双职工状态 */ - export function editDoubleWorkState(data?: delJjlxr) { +export function editDoubleWorkState(data?: delJjlxr) { return request({ - url: '/hrapi/staff/eidtdoubleworkerstate', - method: 'post', - data: data + url: '/hrapi/staff/eidtdoubleworkerstate', + method: 'post', + data: data }); } /** * 添加家庭成员 */ - export function addFamilyMembersCont(data?: familyMembersContAdd) { +export function addFamilyMembersCont(data?: familyMembersContAdd) { return request({ - url: '/hrapi/staff/addfamilymembers', - method: 'post', - data: data + url: '/hrapi/staff/addfamilymembers', + method: 'post', + data: data }); } /** * 编辑家庭成员 */ - export function editFamilyMembersCont(data?: familyMembersContEdit) { +export function editFamilyMembersCont(data?: familyMembersContEdit) { return request({ - url: '/hrapi/staff/editfamilymembers', - method: 'post', - data: data + url: '/hrapi/staff/editfamilymembers', + method: 'post', + data: data }); } /** * 编辑家庭成员状态 */ - export function editFamilyMembersContState(data?: delJjlxr) { +export function editFamilyMembersContState(data?: delJjlxr) { return request({ - url: '/hrapi/staff/editfamilymemberssatte', - method: 'post', - data: data + url: '/hrapi/staff/editfamilymemberssatte', + method: 'post', + data: data }); } /** * 添加教育经历 */ - export function addEducExpCont(data?: addEducExpInfoing) { +export function addEducExpCont(data?: addEducExpInfoing) { return request({ - url: '/hrapi/staff/addeducationalexperience', - method: 'post', - data: data + url: '/hrapi/staff/addeducationalexperience', + method: 'post', + data: data }); } /** * 编辑教育经历 */ - export function editEducExpCont(data?: editEducExpInfoing) { +export function editEducExpCont(data?: editEducExpInfoing) { return request({ - url: '/hrapi/staff/editeducationalexperience', - method: 'post', - data: data + url: '/hrapi/staff/editeducationalexperience', + method: 'post', + data: data }); } /** * 编辑教育经历状态 */ - export function editEducExpState(data?: delJjlxr) { +export function editEducExpState(data?: delJjlxr) { return request({ - url: '/hrapi/staff/editeduexpstate', - method: 'post', - data: data + url: '/hrapi/staff/editeduexpstate', + method: 'post', + data: data }); } /** * 添加集团外部工作经历 */ - export function addGroupExternalWork(data?: addGroupExternalWorkCont) { +export function addGroupExternalWork(data?: addGroupExternalWorkCont) { return request({ - url: '/hrapi/staff/addworkhistorycont', - method: 'post', - data: data + url: '/hrapi/staff/addworkhistorycont', + method: 'post', + data: data }); } /** * 编辑集团外部工作经历 */ - export function editGroupExternalWork(data?: editGroupExternalWorkCont) { +export function editGroupExternalWork(data?: editGroupExternalWorkCont) { return request({ - url: '/hrapi/staff/editworkhistorycont', - method: 'post', - data: data + url: '/hrapi/staff/editworkhistorycont', + method: 'post', + data: data }); } /** * 编辑集团外部工作经历 */ - export function editGroupExternalWorkState(data?: delJjlxr) { +export function editGroupExternalWorkState(data?: delJjlxr) { return request({ - url: '/hrapi/staff/editworkhistorystate', - method: 'post', - data: data + url: '/hrapi/staff/editworkhistorystate', + method: 'post', + data: data }); } /** * 添加集团内部工作经历 */ - export function addGroupInnerWork(data?: groupInnerWorkCont) { +export function addGroupInnerWork(data?: groupInnerWorkCont) { return request({ - url: '/hrapi/staff/addinsidehistory', - method: 'post', - data: data + url: '/hrapi/staff/addinsidehistory', + method: 'post', + data: data }); } /** * 编辑集团内部工作经历 */ - export function editGroupInnerWork(data?: groupInnerWorkCont) { +export function editGroupInnerWork(data?: groupInnerWorkCont) { return request({ - url: '/hrapi/staff/eidtinsidehistoryworkcont', - method: 'post', - data: data + url: '/hrapi/staff/eidtinsidehistoryworkcont', + method: 'post', + data: data }); } /** * 编辑集团内部工作经历 */ - export function editGroupInnerWorkState(data?: delJjlxr) { +export function editGroupInnerWorkState(data?: delJjlxr) { return request({ - url: '/hrapi/staff/editordelinsideworkhistorystate', - method: 'post', - data: data + url: '/hrapi/staff/editordelinsideworkhistorystate', + method: 'post', + data: data }); } /** * 获取工作时间列表 */ - export function haveTeamTimeList(data: teamClassQueay) { +export function haveTeamTimeList(data: teamClassQueay) { return request({ - url: '/hrapi/rostering/team_time_list', - method: 'post', - data: data + url: '/hrapi/rostering/team_time_list', + method: 'post', + data: data }); } /** * 搜索成员 */ - export function searchUserCont(data: searchPeoleCont): AxiosPromise>{ +export function searchUserCont(data: searchPeoleCont): AxiosPromise> { return request({ - url: '/kpiapi/powerpc/search_people', - method: 'post', - data: data + url: '/kpiapi/powerpc/search_people', + method: 'post', + data: data }); } /** * 获取人员档案 */ - export function analysisRedisExelect(data?: any): AxiosPromise { +export function analysisRedisExelect(data?: any): AxiosPromise { return request({ - url: '/hrapi/staff/analysisRedisExelect', - method: 'post', - data: data + url: '/hrapi/staff/analysisRedisExelect', + method: 'post', + data: data }); } + + +// export function xxxxxx(data?: contId) { 括号后无具体内容，则提交数据时，then内直接写data，且要打印出来检查，若有内容，则直接加花括号即可 +// return request({ contId:集成前面的Id +// url: '/hrapi/staff/useraboutorglist', +// method: 'post', +// data: data +// }); +// } diff --git a/src/api/hr/people/type.ts b/src/api/hr/people/type.ts index 60ddc2f03..5451183c4 100644 --- a/src/api/hr/people/type.ts +++ b/src/api/hr/people/type.ts @@ -1,387 +1,403 @@ /** * 搜索条件 */ -export interface searchCriteriaForPeople extends PageQuery{ - keywords?:string; //关键字 - adminorg?:number; //行政组织 - emptype?:number[]; //用工关系 +export interface searchCriteriaForPeople extends PageQuery { + keywords?: string; //关键字 + adminorg?: number; //行政组织 + emptype?: number[]; //用工关系 } /** * 人员基本信息 */ -export interface archivesCont{ - id?:number //2909; - number?:string //"201218"; - name?:string //"苏振"; - icon?:string //""; - hireclass?:number //1; - emptype?:number //8; - company?:number //296; - maindeparment?:number //32; - sunmaindeparment?:number //0; - deparment?:string //""; - adminorg?:number //32; - teamid?:number//0; - position?:number //117; - jobclass?:number //3; - jobid?:number //25; - jobleve?:number //0; - time?:number //1657002602; - eitetime?:number //1657002602; - wechat?:string //""; - workwechat?:string //""; - state?:number //1; - key?:number //4929995352838144; - isadmin?:number //0; - password?:string //"8d135342fcc70ab05332f560031a6112"; - role?:string //""; - idcardno?:string //"370481197603084270"; - passportno?:string //""; - globalroaming?:string //""; - mobilephone?:string //"15020711996"; - email?:string //""; - gender?:number //1; - birthday?:number //195062400; - myfolk?:string //"汉族"; - nativeplace?:string //"济宁高新区恒信公馆"; - idcardstartdate?:number //1173801600; - idcardenddate?:number //1804953600; - idcardaddress?:string //""; - idcardIssued?:string //""; - health?:number //1; - maritalstatus?:number //2; - internaltelephone?:string //""; - currentresidence?:string //"滕州市西岗镇柴里矿生活去10排8号"; - constellationing?:number //12; - isdoubleworker?:number //2; - isveterans?:number //2; - veteransnumber?:string //""; - jobstartdate?:number //825609600; - entrydate?:number //0; - probationperiod:number //0; - planformaldate?:number //0; - politicaloutlook?:number //1; - nameusedbefore?:string //""; - ruleid?:number //0; - iconphoto?:string //""; - responsibledepartment?:string //""; - responsibledepartmentjson?:string //""; - companyname?:string //"山东荣信集团有限公司"; - maindeparmentname?:string //"甲醇分厂"; - sunmaindeparmentname?:string //""; - workpostname?:string //""; - positionname?:string //"副厂长"; - keystr?:string //"4929995352838144"; - teamname?:string //""; - personincharge?:number // 2 +export interface archivesCont { + id?: number //2909; + number?: string //"201218"; + name?: string //"苏振"; + icon?: string //""; + hireclass?: number //1; + emptype?: number //8; + company?: number //296; + maindeparment?: number //32; + sunmaindeparment?: number //0; + deparment?: string //""; + adminorg?: number //32; + teamid?: number//0; + position?: number //117; + jobclass?: number //3; + jobid?: number //25; + jobleve?: number //0; + time?: number //1657002602; + eitetime?: number //1657002602; + wechat?: string //""; + workwechat?: string //""; + interests?: string + state?: number //1; + key?: number //4929995352838144; + isadmin?: number //0; + password?: string //"8d135342fcc70ab05332f560031a6112"; + role?: string //""; + idcardno?: string //"370481197603084270"; + passportno?: string //""; + globalroaming?: string //""; + mobilephone?: string //"15020711996"; + email?: string //""; + gender?: number //1; + birthday?: number //195062400; + myfolk?: string //"汉族"; + bloodtype?: string + nativeplace?: string //"济宁高新区恒信公馆"; + idcardstartdate?: number //1173801600; + idcardenddate?: number //1804953600; + idcardaddress?: string //""; + idcardIssued?: string //""; + health?: number //1; + maritalstatus?: number //2; + internaltelephone?: string //""; + currentresidence?: string //"滕州市西岗镇柴里矿生活去10排8号"; + constellationing?: number //12; + isdoubleworker?: number //2; + isveterans?: number //2; + natureofAccount?: number + veteransnumber?: string //""; + jobstartdate?: number //825609600; + entrydate?: number //0; + probationperiod: number //0; + planformaldate?: number //0; + politicaloutlook?: number //1; + nameusedbefore?: string //""; + ruleid?: number //0; + iconphoto?: string //""; + responsibledepartment?: string //""; + responsibledepartmentjson?: string //""; + companyname?: string //"山东荣信集团有限公司"; + maindeparmentname?: string //"甲醇分厂"; + sunmaindeparmentname?: string //""; + workpostname?: string //""; + positionname?: string //"副厂长"; + keystr?: string //"4929995352838144"; + teamname?: string //""; + personincharge?: number // 2 } /** * 员工列表 */ - export type archivesList = PageResult +export type archivesList = PageResult /** * id */ export interface contId { - id:string + id: string } /** * 人员与行政组织关系 */ -export interface peopleAboutOrg{ - id?:number - key?:number - group?:number - company?:number - department?:number - workshop?:number - workshopsection?:number - position?:number - gradepositions?:number - starttime?:number - endtime?:number - team?:number - changetype?:number - time?:number - state?:number - assigntype?:number - jobid?:number - orgallname?:string - postname?:string - starttimeing?:string - endtimeing?:string +export interface peopleAboutOrg { + id?: number + key?: number + group?: number + company?: number + department?: number + workshop?: number + workshopsection?: number + position?: number + gradepositions?: number + starttime?: number + endtime?: number + team?: number + changetype?: number + time?: number + state?: number + assigntype?: number + jobid?: number + orgallname?: string + postname?: string + starttimeing?: string + endtimeing?: string } /** * 人员与行政组织关系列表 */ - export type peopleAboutOrgList = PageResult +export type peopleAboutOrgList = PageResult /** * 紧急联系人 */ -export interface emergencyContact{ - id:number - number?:string - name?:string - relationship?:string - tel?:string - time?:number - state?:number - key?:number +export interface emergencyContact { + id: number + number?: string + name?: string + relationship?: string + tel?: string + time?: number + state?: number + key?: number } /** * 双职工 */ -export interface shuangzhigong{ - id:number - number?:string - name?:string - company?:string - department?:string - position?:string - tel?:string - time?:number - state?:number - key?:number +export interface shuangzhigong { + id: number + number?: string + workcouple?: string + name?: string + company?: string + department?: string + section?: string + job?: string + level?: string + mobilephone?: number + position?: string + tel?: string + time?: number + state?: number + key?: number } /** * 家庭成员 */ -export interface jiatingchengyuan{ - id:number - number?:string - relationship?:string - name?:string - company?:string - deparment?:string - postnme?:string - tel?:string - politicaloutlook?:number - time?:number - key?:number - state?:number - politicaloutlookcn?:string +export interface jiatingchengyuan { + id: number + number?: string + relationship?: string + name?: string + company?: string + deparment?: string + postnme?: string + tel?: string + politicaloutlook?: number + time?: number + key?: number + state?: number + politicaloutlookcn?: string } /** * 教育经历 */ -export interface jiaoyujingli{ - id:number - number?:string - education?:number - graduationschool?:string - subject?:string - admissiontime?:number - graduationtime?:number - time?:number - level?:number - academicdegree?:number - key?:number - state?:number - academicdegreecn?:string - educationcn?:string - admissiontimestr?:string - graduationtimestr?:string +export interface jiaoyujingli { + id: number + number?: string + education?: number + graduationschool?: string + subject?: string + admissiontime?: number + graduationtime?: number + time?: number + level?: number + academicdegree?: number + key?: number + state?: number + academicdegreecn?: string + educationcn?: string + admissiontimestr?: string + graduationtimestr?: string } /** * 集团内部工作 */ -export interface innerWorkCont{ - id:string - starttimg?:string - endtimg?:string - allorgname?:string - orgid?:number - postid?:number - postname?:string - postnlevel?:number - teamid?:number - teamname?:string - changetype?:number - changetypename?:string - assigntype?:number - superiorpostname?:string - superiormanname?:null - subordinatescount?:number - jobid?:number - jobname?:string +export interface innerWorkCont { + id: string + starttimg?: string + endtimg?: string + allorgname?: string + orgid?: number + postid?: number + postname?: string + postnlevel?: number + teamid?: number + teamname?: string + changetype?: number + changetypename?: string + assigntype?: number + superiorpostname?: string + superiormanname?: null + subordinatescount?: number + jobid?: number + jobname?: string } /** * 集团外部工作经历 */ -export interface outsideWork{ - id:number - number:string - key:number - company:string - deparment:string - job:string - entrytime:number - leavedate:number - witness:string - witnesstel:string - remarks:string - time:number - state:number - starttimg:string - endtimg:string +export interface outsideWork { + id: number + number: string + key: number + company: string + deparment: string + job: string + entrytime: number + leavedate: number + witness: string + witnesstel: string + remarks: string + time: number + state: number + starttimg: string + endtimg: string } /** * 修改密码 */ -export interface editPwdCont extends contId{ - pwd:string - pwdes:string +export interface editPwdCont extends contId { + pwd: string + pwdes: string } /** * 获取个人信息详情 */ -export interface myinfostruct{ - id?:number //78, - number?:string //"300450", - name?:string //"秦东", - icon?:string //"https://wework.qpic.cn/wwhead/duc2TvpEgSTPk74IwG7BswsATgrfz6BGVPpX5QU5uvaCiaxk3ReIlRhdUwIeiaBBazzCLiaHI8VuA4/0", - hireclass?:number //1, - emptype?:number //8, - company?:number //309, - maindeparment?:number //102, - sunmaindeparment?:number //272, - deparment?:string //"", - adminorg?:number //272, - teamid?:number //1, - position?:number //2184, - jobclass?:number //5, - jobid?:number //36, - jobleve?:number //3, - time?:number //1656984567, - eitetime?:number //1671160648, - wechat?:string //"", - workwechat?:string //"KaiXinGuo", - state?:number //1, - key?:number //15993815826844528, - isadmin?:number //4, - password?:string //"ecffe8715d2d3c2743bab6abc90e1331", - role?:string //"1", - idcardno?:string //"370921198810151515", - passportno?:string //"", - globalroaming?:string //"", - mobilephone?:string //"15069130853", - email?:string //"", - gender?:number //1, - birthday?:number //592848000, - myfolk?:string //"汉族", - nativeplace?:string //"山东省宁阳县华丰镇白土厂村15号", - idcardstartdate?:number //0, - idcardenddate?:number //0, - idcardaddress?: string//"", - idcardIssued?:string //"", - health?:number //2, - maritalstatus?:number //2, - internaltelephone?:string //"", - currentresidence?:string //"山东省宁阳县华丰镇矿区花园小区1号楼1单元302室", - constellationing?:number //1, - isdoubleworker?:number //2, - isveterans?:number //2, - veteransnumber?:string //"", - jobstartdate?:number //0, - entrydate?:number //0, - probationperiod:number //0, - planformaldate?:number //0, - politicaloutlook?:number //1, - nameusedbefore?:string //"", - iconphoto?:string //"data:image/jpeg;base64,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", - responsibledepartment?:string //"", - responsibledepartmentjson?:string //"", - birthdaytime?:string //"1988-10-15", - idcardstarttimedata?:string //"", - idcardendtimedata?:string //"", - entrydatetime:string //"", - planformaldatetime?:string //"", - doubleworkerlist?:any //null, - educationalexperience?:any //null, - emergencycontact?:any //null, - memberoffamily?:any //null, - workhistorylist?:any //null, - groupworkhistorylist?:any //null, - idstr?:string //"78", - companyname?:string //"山东恒信高科能源有限公司", - maindeparmentname?:string //"企管部", - adminorgname?:string //"", - positionname?:string //"开发主管", - jobclassname?:string //"基层管理", - jobidname?:string //"主管", - politicaloutlookname?:string //"群众", - jobstartdatestr?:string //"", - entrydatestr?:string //"", - personincharge?:number //2, - sunmaindeparmentname?:string //"企管", - workpostname?:string //"", - teamname?:string //"长白班", - allorglist?:number[][] //[309,102,272], - ruleid?:string //"0", - rulename?:string //"", - orgreslist?:any //null - keystr?:string // +export interface myinfostruct { + id?: number //78, + number?: string //"300450", + name?: string //"秦东", + icon?: string //"https://wework.qpic.cn/wwhead/duc2TvpEgSTPk74IwG7BswsATgrfz6BGVPpX5QU5uvaCiaxk3ReIlRhdUwIeiaBBazzCLiaHI8VuA4/0", + hireclass?: number //1, + emptype?: number //8, + company?: number //309, + maindeparment?: number //102, + sunmaindeparment?: number //272, + deparment?: string //"", + adminorg?: number //272, + teamid?: number //1, + position?: number //2184, + jobclass?: number //5, + jobid?: number //36, + jobleve?: number //3, + time?: number //1656984567, + eitetime?: number //1671160648, + wechat?: string //"", + workwechat?: string //"KaiXinGuo", + interests?: string + state?: number //1, + key?: number //15993815826844528, + isadmin?: number //4, + password?: string //"ecffe8715d2d3c2743bab6abc90e1331", + role?: string //"1", + idcardno?: string //"370921198810151515", + passportno?: string //"", + globalroaming?: string //"", + mobilephone?: string //"15069130853", + email?: string //"", + gender?: number //1, + birthday?: number //592848000, + myfolk?: string //"汉族", + bloodtype?: string + nativeplace?: string //"山东省宁阳县华丰镇白土厂村15号", + idcardstartdate?: number //0, + idcardenddate?: number //0, + idcardaddress?: string//"", + idcardIssued?: string //"", + health?: number //2, + maritalstatus?: number //2, + internaltelephone?: string //"", + currentresidence?: string //"山东省宁阳县华丰镇矿区花园小区1号楼1单元302室", + constellationing?: number //1, + isdoubleworker?: number //2, + isveterans?: number //2, + natureofAccount?: number + veteransnumber?: string //"", + jobstartdate?: number //0, + entrydate?: number //0, + probationperiod: number //0, + planformaldate?: number //0, + politicaloutlook?: number //1, + nameusedbefore?: string //"", + iconphoto?: string //"data:image/jpeg;base64,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", + responsibledepartment?: string //"", + responsibledepartmentjson?: string //"", + birthdaytime?: string //"1988-10-15", + idcardstarttimedata?: string //"", + idcardendtimedata?: string //"", + entrydatetime: string //"", + planformaldatetime?: string //"", + doubleworkerlist?: any //null, + educationalexperience?: any //null, + emergencycontact?: any //null, + memberoffamily?: any //null, + workhistorylist?: any //null, + groupworkhistorylist?: any //null, + idstr?: string //"78", + companyname?: string //"山东恒信高科能源有限公司", + maindeparmentname?: string //"企管部", + adminorgname?: string //"", + positionname?: string //"开发主管", + jobclassname?: string //"基层管理", + jobidname?: string //"主管", + politicaloutlookname?: string //"群众", + jobstartdatestr?: string //"", + entrydatestr?: string //"", + personincharge?: number //2, + sunmaindeparmentname?: string //"企管", + workpostname?: string //"", + teamname?: string //"长白班", + allorglist?: number[][] //[309,102,272], + ruleid?: string //"0", + rulename?: string //"", + orgreslist?: any //null + keystr?: string // } /** * 多重Id */ export interface contIdes { - id:number; - idstr:string; + id: number; + idstr: string; } /** * 提交修改人员主副信息 */ -export interface userManOrFucont{ +export interface userManOrFucont { id?: string name?: string - mobilephone?: string - idcardno?: string - entrydatetime?: string - probationperiod?: number - confirmationdate?: string - jobstartdatestr?: string - nameusedbefore?: string - gender?: number - myfolk?: string - politicaloutlook?: number - health?: number - birthdaytime?: string - idcardstarttimedata?: string - idcardendtimedata?: string - idcardaddress?: string - idcardIssued?: string - currentresidence?: string - nativeplace?: string - email?: string - internaltelephone?: string - hireclass?: number - emptype?: number - isveterans?: number - veteransnumber?: string - passportno?: string - globalroaming?: string - wechat?: string - workwechat?: string - constellationing?: number - maritalstatus?: number + mobilephone?: string + idcardno?: string + entrydatetime?: string + probationperiod?: number + confirmationdate?: string + jobstartdatestr?: string + nameusedbefore?: string + gender?: number + myfolk?: string + politicaloutlook?: number + health?: number + birthdaytime?: string + idcardstarttimedata?: string + idcardendtimedata?: string + idcardaddress?: string + idcardIssued?: string + currentresidence?: string + bloodtype?: string + nativeplace?: string + email?: string + internaltelephone?: string + hireclass?: number + emptype?: number + isveterans?: number + natureofAccount?: number + veteransnumber?: string + passportno?: string + globalroaming?: string + wechat?: string + workwechat?: string + interests?: string + constellationing?: number + maritalstatus?: number } /** * 编辑紧急联系人 */ -export interface emergencyContactInfo extends contId{ +export interface emergencyContactInfo extends contId { name?: string relationship?: string mobilephone?: string + political?: string + company?: string } /** * 添加紧急联系人 */ -export interface emergencyContactAdd extends contId{ - list?:emergencyContactCont[] +export interface emergencyContactAdd extends contId { + list?: emergencyContactCont[] } -export interface emergencyContactCont{ +export interface emergencyContactCont { name?: string relationship?: string mobilephone?: string @@ -389,180 +405,198 @@ export interface emergencyContactCont{ /** * 删除紧急联系人 */ -export interface delJjlxr extends contId{ - state:number; - isdel:number; +export interface delJjlxr extends contId { + state: number; + isdel: number; } /** * 双职工 */ -export interface doubleWorkCont extends contId{ - name?:string - company?:string - department?:string - position?:string - mobilephone?:string +export interface doubleWorkCont extends contId { + name?: string + workcouple?: string + company?: string + department?: string + section?: string + job?: string + level?: string + position?: string + time?: string + mobilephone?: string } /** * 家庭成员 */ -export interface familyMembersCont{ - id?:string +export interface familyMembersCont { + id?: string name?: string relationship?: string mobilephone?: string company?: string - department?:string + department?: string politicaloutlook?: number } /** * 添加家庭成员 */ - export interface familyMembersContAdd extends contId{ - list?:familyMembersCont[] +export interface familyMembersContAdd extends contId { + list?: familyMembersCont[] } /** * 编辑家庭成员 */ - export interface familyMembersContEdit extends familyMembersCont{ +export interface familyMembersContEdit extends familyMembersCont { id?: string - } +} /** * 教育经历基础参数 */ -export interface educExpInfo{ - graduationschool?:string //"宁阳实验高中", - subject?:string //"理科", - education?:number//3, - admissiontime?:string //"2005-09-09", - graduationtime?:string //"2008-06-06", - academicdegree?:string //"1", - level?:string //"1" +export interface educExpInfo { + graduationschool?: string //"宁阳实验高中", + subject?: string //"理科", + education?: number//3, + admissiontime?: string //"2005-09-09", + graduationtime?: string //"2008-06-06", + academicdegree?: string //"1", + level?: string //"1" } /** * 编辑教育经历 */ - export interface editEducExpInfoing extends educExpInfo{ - id:string - } +export interface editEducExpInfoing extends educExpInfo { + id: string +} /** * 添加教育经历 */ - export interface addEducExpInfoing extends contId{ - list?:educExpInfo[] +export interface addEducExpInfoing extends contId { + list?: educExpInfo[] } /** * 集团外部工作经历 */ -export interface groupExternalWork{ - company?:string //"济南易搜集团", - department?:string //"技术部", - position?:string //"程序员", - entrytime?:string //"2010-10-09", - leavedate?:string //"2013-12-06", - witness?:string //"石娟柯", - witnesstel?:string //"15069130853", - remarks?:string //"看看手机打开" +export interface groupExternalWork { + company?: string //"济南易搜集团", + department?: string //"技术部", + position?: string //"程序员", + entrytime?: string //"2010-10-09", + leavedate?: string //"2013-12-06", + witness?: string //"石娟柯", + witnesstel?: string //"15069130853", + remarks?: string //"看看手机打开" } /** * 编辑外部工作经历 */ - export interface editGroupExternalWorkCont extends groupExternalWork{ - id:string - } +export interface editGroupExternalWorkCont extends groupExternalWork { + id: string +} /** * 添加外部工作经历 */ - export interface addGroupExternalWorkCont extends contId{ - list?:groupExternalWork[] +export interface addGroupExternalWorkCont extends contId { + list?: groupExternalWork[] } /** * 添加集团内部工作履历 */ -export interface groupInnerWorkCont extends contId{ - orgid?:string - position?:string - gradepositions?:number - starttime?:string - endtime?:string - changetype?:number - assigntype?:number - team?:string - jobid?:string +export interface groupInnerWorkCont extends contId { + orgid?: string + position?: string + gradepositions?: number + starttime?: string + endtime?: string + changetype?: number + assigntype?: number + team?: string + jobid?: string } /** * 修改头像 */ -export interface editUserIcon{ - id:number; - iconpath:string; +export interface editUserIcon { + id: number; + iconpath: string; } /** * 编辑人员行政组织关系 */ -export interface editUserAboutOrg{ - id:string; - orgid?:number; - position?:number; - teamid?:number; - jobid?:number; - jobleve?:number; - ruleid?:string; - personInCharge:any; - orgreslist?:any; - resallorg?:any; +export interface editUserAboutOrg { + id: string; + orgid?: number; + position?: number; + teamid?: number; + jobid?: number; + jobleve?: number; + ruleid?: string; + personInCharge: any; + orgreslist?: any; + resallorg?: any; } /** * 排版类型 */ -export interface teamClassQueay{ - name?:"" +export interface teamClassQueay { + name?: "" } -export interface teamRule{ - id:string; - sort:number; - teamid:string; +export interface teamRule { + id: string; + sort: number; + teamid: string; } -export interface teamList{ - id:string; - title:string; - startTime:string; - endTime:string; +export interface teamList { + id: string; + title: string; + startTime: string; + endTime: string; } /** * 排班类型模板 */ -export interface teamClassCont{ - id:string; - state?:number; - states:boolean; - rulename:string; - name:string; - rule:teamRule[]; - list:teamList[]; +export interface teamClassCont { + id: string; + state?: number; + states: boolean; + rulename: string; + name: string; + rule: teamRule[]; + list: teamList[]; } /** * 搜索成员条件 */ - export interface searchPeoleCont extends PageQuery{ - name?:number|string; //关键字 +export interface searchPeoleCont extends PageQuery { + name?: number | string; //关键字 } /** * 搜索成员结果 */ -export interface queryPeopleCont{ - id:string // "15993815826844528", - employeeName:string // "秦东", - isLeave:string // "0", - open:boolean // "false", - icon:string // "https://wework.qpic.cn/wwhead/duc2TvpEgSTPk74IwG7BswsATgrfz6BGVPpX5QU5uvaCiaxk3ReIlRhdUwIeiaBBazzCLiaHI8VuA4/0", - iconToBase64:string // - wechat:string // "KaiXinGuo", - departmentid:number // 102, - departmentname:string // "企管部", - postid:number // 794, - postname:string // "主管", - tema:number // 1, - temaname:string // "长白班" +export interface queryPeopleCont { + id: string // "15993815826844528", + employeeName: string // "秦东", + isLeave: string // "0", + open: boolean // "false", + icon: string // "https://wework.qpic.cn/wwhead/duc2TvpEgSTPk74IwG7BswsATgrfz6BGVPpX5QU5uvaCiaxk3ReIlRhdUwIeiaBBazzCLiaHI8VuA4/0", + iconToBase64: string // + wechat: string // "KaiXinGuo", + departmentid: number // 102, + departmentname: string // "企管部", + postid: number // 794, + postname: string // "主管", + tema: number // 1, + temaname: string // "长白班" } + +/** + * 奖惩记录 + */ +export interface RewardsAndPunishments { + id?: string + level?: string + type?: string + content?: string + time?: string + department?: string + politicaloutlook?: number +} \ No newline at end of file diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 0029c5f4f..26c1fb141 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -18,17 +18,12 @@ declare module '@vue/runtime-core' { CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default'] DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default'] DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default'] - ElAffix: typeof import('element-plus/es')['ElAffix'] - ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] - ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] ElCard: typeof import('element-plus/es')['ElCard'] - ElCarousel: typeof import('element-plus/es')['ElCarousel'] - ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] @@ -52,7 +47,6 @@ declare module '@vue/runtime-core' { ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] - ElLink: typeof import('element-plus/es')['ElLink'] ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] @@ -61,14 +55,10 @@ declare module '@vue/runtime-core' { ElPopover: typeof import('element-plus/es')['ElPopover'] ElProgress: typeof import('element-plus/es')['ElProgress'] ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSpace: typeof import('element-plus/es')['ElSpace'] - ElStep: typeof import('element-plus/es')['ElStep'] - ElSteps: typeof import('element-plus/es')['ElSteps'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] @@ -77,11 +67,8 @@ declare module '@vue/runtime-core' { ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] ElText: typeof import('element-plus/es')['ElText'] - ElTimeline: typeof import('element-plus/es')['ElTimeline'] - ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTransfer: typeof import('element-plus/es')['ElTransfer'] ElTree: typeof import('element-plus/es')['ElTree'] ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] ElUpload: typeof import('element-plus/es')['ElUpload'] @@ -104,25 +91,13 @@ declare module '@vue/runtime-core' { HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] - IEpCaretTop: typeof import('~icons/ep/caret-top')['default'] IEpClose: typeof import('~icons/ep/close')['default'] - IEpCollection: typeof import('~icons/ep/collection')['default'] IEpDelete: typeof import('~icons/ep/delete')['default'] - IEpDownload: typeof import('~icons/ep/download')['default'] IEpEdit: typeof import('~icons/ep/edit')['default'] - IEpMessageBox: typeof import('~icons/ep/message-box')['default'] - IEpMinus: typeof import('~icons/ep/minus')['default'] - IEpOperation: typeof import('~icons/ep/operation')['default'] - IEpPicture: typeof import('~icons/ep/picture')['default'] IEpPlus: typeof import('~icons/ep/plus')['default'] - IEpPosition: typeof import('~icons/ep/position')['default'] IEpRefresh: typeof import('~icons/ep/refresh')['default'] - IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default'] IEpSearch: typeof import('~icons/ep/search')['default'] IEpSetting: typeof import('~icons/ep/setting')['default'] - IEpTop: typeof import('~icons/ep/top')['default'] - IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default'] - IEpUser: typeof import('~icons/ep/user')['default'] IEpView: typeof import('~icons/ep/view')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default'] diff --git a/src/views/hr/archives/archivescont.vue b/src/views/hr/archives/archivescont.vue index f73878350..ed092b7a2 100644 --- a/src/views/hr/archives/archivescont.vue +++ b/src/views/hr/archives/archivescont.vue @@ -9,13 +9,16 @@ */ import UserContent from '@/views/hr/archives/basicinformation/content.vue' import EditUserContent from '@/views/hr/archives/basicinformation/editcontent.vue' +import CharacterColor from '@/views/hr/archives/basicinformation/charactercolor.vue' import OrgNexus from '@/views/hr/archives/basicinformation/orgnexus.vue' import EmergencyContactPage from '@/views/hr/archives/basicinformation/emergencycontact.vue' import WorkingCouplePage from '@/views/hr/archives/basicinformation/workingcouple.vue' import FamilyMembers from '@/views/hr/archives/basicinformation/familymembers.vue' -import EducationalExperience from '@/views/hr/archives/basicinformation/educationalexperience.vue' +import EducationalExperience from '@/views/hr/archives/basicinformation/educationalexperience.vue' import InnerWork from '@/views/hr/archives/basicinformation/innerwork.vue' import OutsideWork from '@/views/hr/archives/basicinformation/outsideWork.vue' +import Rewardsandpunishments from '@/views/hr/archives/basicinformation/rewardsandpunishments.vue' +import Appraisalrecord from '@/views/hr/archives/basicinformation/appraisalrecord.vue' import Editpwd from '@/views/hr/archives/basicinformation/editpwd.vue' import EditOrg from '@/views/hr/archives/basicinformation/editorg.vue' @@ -25,36 +28,36 @@ import SvgIcon from '@/components/SvgIcon/index.vue'; import UserRole from '@/assets/icons/user.svg' import { myinfostruct } from '@/api/hr/people/type' -import { getMyInfoing,editMyInfoIcon } from '@/api/hr/people/index' +import { getMyInfoing, editMyInfoIcon } from '@/api/hr/people/index' import type { UploadProps } from 'element-plus' const props = defineProps({ - isShow:{ - type:Boolean, - default:false + isShow: { + type: Boolean, + default: false }, - archivesdata:{ - type:Object, - default(){ + archivesdata: { + type: Object, + default() { return {} } } }); -const emits = defineEmits(["update:isShow","updatemyconting","getarchivespageclick"]); //操作父级数据 +const emits = defineEmits(["update:isShow", "updatemyconting", "getarchivespageclick"]); //操作父级数据 const boxTitle = ref(); //弹出框标题 const userIcon = ref(); //人员内容 const activeName = ref("1") const editMyCont = ref(false); // const userConting = ref(); -const userConting = reactive({entrydatetime:"",probationperiod:1}); +const userConting = reactive({ entrydatetime: "", probationperiod: 1 }); const rowLoading = ref(false) -const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown" +const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API + "/api/upordown" const editMyOrgCont = ref(false); /** * 弹窗显示控制 */ - const boxShow = computed({ +const boxShow = computed({ get: () => props.isShow, set: (val) => { emits("update:isShow", val); @@ -63,127 +66,130 @@ const editMyOrgCont = ref(false); /** * 获取人员数据 */ - function getjtcyList(){ +function getjtcyList() { rowLoading.value = true; - getMyInfoing({id:props.archivesdata.id,idstr:props.archivesdata.idstr}) - .then(( data )=>{ + getMyInfoing({ id: props.archivesdata.id, idstr: props.archivesdata.idstr }) + .then((data) => { // userConting.value = data.data userConting.id = data.data.id - userConting.number = data.data.number //"300450", - userConting.name = data.data.name //"秦东", - userConting.icon = data.data.icon // - userConting.hireclass = data.data.hireclass //1, - userConting.emptype = data.data.emptype //8, - userConting.company = data.data.company //309, - userConting.maindeparment = data.data.maindeparment //102, - userConting.sunmaindeparment = data.data.sunmaindeparment //272, - userConting.deparment = data.data.deparment //"", - userConting.adminorg = data.data.adminorg //272, - userConting.teamid = data.data.teamid //1, - userConting.position = data.data.position //2184, - userConting.jobclass = data.data.jobclass //5, - userConting.jobid = data.data.jobid //36, - userConting.jobleve = data.data.jobleve //3, - userConting.time = data.data.time //1656984567, - userConting.eitetime = data.data.eitetime //1671160648, - userConting.wechat = data.data.wechat //"", - userConting.workwechat = data.data.workwechat //"KaiXinGuo", - userConting.state = data.data.state //1, - userConting.key = data.data.key //15993815826844528, - userConting.isadmin = data.data.isadmin //4, - userConting.password = data.data.password //"ecffe8715d2d3c2743bab6abc90e1331", - userConting.role = data.data.role //"1", - userConting.idcardno = data.data.idcardno //"370921198810151515", - userConting.passportno = data.data.passportno //"", - userConting.globalroaming = data.data.globalroaming //"", - userConting.mobilephone = data.data.mobilephone //"15069130853", - userConting.email = data.data.email //"", - userConting.gender = data.data.gender //1, - userConting.birthday = data.data.birthday //592848000, - userConting.myfolk = data.data.myfolk //"汉族", - userConting.nativeplace = data.data.nativeplace //"山东省宁阳县华丰镇白土厂村15号", - userConting.idcardstartdate = data.data.idcardstartdate //0, - userConting.idcardenddate = data.data.idcardenddate //0, - userConting.idcardaddress = data.data.idcardaddress //"", - userConting.idcardIssued = data.data.idcardIssued //"", - userConting.health = data.data.health //2, - userConting.maritalstatus = data.data.maritalstatus //2, - userConting.internaltelephone = data.data.internaltelephone //"", - userConting.currentresidence = data.data.currentresidence //"山东省宁阳县华丰镇矿区花园小区1号楼1单元302室", - userConting.constellationing = data.data.constellationing //1, - userConting.isdoubleworker = data.data.isdoubleworker //2, - userConting.isveterans = data.data.isveterans //2, - userConting.veteransnumber = data.data.veteransnumber //"", - userConting.jobstartdate = data.data.jobstartdate //0, - userConting.entrydate = data.data.entrydate //0, - userConting.probationperiod = data.data.probationperiod //0, - userConting.planformaldate = data.data.planformaldate //0, - userConting.politicaloutlook = data.data.politicaloutlook //1, - userConting.nameusedbefore = data.data.nameusedbefore //"", - userConting.iconphoto = data.data.iconphoto //" - userConting.responsibledepartment = data.data.responsibledepartment //"", - userConting.responsibledepartmentjson = data.data.responsibledepartmentjson //"", - userConting.birthdaytime = data.data.birthdaytime //"1988-10-15", - userConting.idcardstarttimedata = data.data.idcardstarttimedata //"", - userConting.idcardendtimedata = data.data.idcardendtimedata //"", - userConting.entrydatetime = data.data.entrydatetime //"", - userConting.planformaldatetime = data.data.planformaldatetime //"", - userConting.doubleworkerlist = data.data.doubleworkerlist //null, - userConting.educationalexperience = data.data.educationalexperience //null, - userConting.emergencycontact = data.data.emergencycontact //null, - userConting.memberoffamily = data.data.memberoffamily //null, - userConting.workhistorylist = data.data.workhistorylist //null, - userConting.groupworkhistorylist = data.data.groupworkhistorylist //null, - userConting.idstr = data.data.idstr //"78", - userConting.companyname = data.data.companyname //"山东恒信高科能源有限公司", - userConting.maindeparmentname = data.data.maindeparmentname //"企管部", - userConting.adminorgname = data.data.adminorgname //"", - userConting.positionname = data.data.positionname //"开发主管", - userConting.jobclassname = data.data.jobclassname //"基层管理", - userConting.jobidname = data.data.jobidname //"主管", - userConting.politicaloutlookname = data.data.politicaloutlookname //"群众", - userConting.jobstartdatestr = data.data.jobstartdatestr //"", - userConting.entrydatestr = data.data.entrydatestr //"", - userConting.personincharge = data.data.personincharge //2, - userConting.sunmaindeparmentname = data.data.sunmaindeparmentname //"企管", - userConting.workpostname = data.data.workpostname //"", - userConting.teamname = data.data.teamname //"长白班", - userConting.allorglist = data.data.allorglist //[309,102,272], - userConting.ruleid = data.data.ruleid //"0", - userConting.rulename = data.data.rulename //"", - userConting.orgreslist = data.data.orgreslist //null - userConting.keystr = data.data.keystr // + userConting.number = data.data.number //"300450", + userConting.name = data.data.name //"秦东", + userConting.icon = data.data.icon // + userConting.hireclass = data.data.hireclass //1, + userConting.emptype = data.data.emptype //8, + userConting.company = data.data.company //309, + userConting.maindeparment = data.data.maindeparment //102, + userConting.sunmaindeparment = data.data.sunmaindeparment //272, + userConting.deparment = data.data.deparment //"", + userConting.adminorg = data.data.adminorg //272, + userConting.teamid = data.data.teamid //1, + userConting.position = data.data.position //2184, + userConting.jobclass = data.data.jobclass //5, + userConting.jobid = data.data.jobid //36, + userConting.jobleve = data.data.jobleve //3, + userConting.time = data.data.time //1656984567, + userConting.eitetime = data.data.eitetime //1671160648, + userConting.wechat = data.data.wechat //"", + userConting.workwechat = data.data.workwechat //"KaiXinGuo", + userConting.interests = data.data.interests + userConting.state = data.data.state //1, + userConting.key = data.data.key //15993815826844528, + userConting.isadmin = data.data.isadmin //4, + userConting.password = data.data.password //"ecffe8715d2d3c2743bab6abc90e1331", + userConting.role = data.data.role //"1", + userConting.idcardno = data.data.idcardno //"370921198810151515", + userConting.passportno = data.data.passportno //"", + userConting.globalroaming = data.data.globalroaming //"", + userConting.mobilephone = data.data.mobilephone //"15069130853", + userConting.email = data.data.email //"", + userConting.gender = data.data.gender //1, + userConting.birthday = data.data.birthday //592848000, + userConting.myfolk = data.data.myfolk //"汉族", + userConting.bloodtype = data.data.bloodtype + userConting.nativeplace = data.data.nativeplace //"山东省宁阳县华丰镇白土厂村15号", + userConting.idcardstartdate = data.data.idcardstartdate //0, + userConting.idcardenddate = data.data.idcardenddate //0, + userConting.idcardaddress = data.data.idcardaddress //"", + userConting.idcardIssued = data.data.idcardIssued //"", + userConting.health = data.data.health //2, + userConting.maritalstatus = data.data.maritalstatus //2, + userConting.internaltelephone = data.data.internaltelephone //"", + userConting.currentresidence = data.data.currentresidence //"山东省宁阳县华丰镇矿区花园小区1号楼1单元302室", + userConting.constellationing = data.data.constellationing //1, + userConting.isdoubleworker = data.data.isdoubleworker //2, + userConting.isveterans = data.data.isveterans //2, + userConting.natureofAccount = data.data.natureofAccount + userConting.veteransnumber = data.data.veteransnumber //"", + userConting.jobstartdate = data.data.jobstartdate //0, + userConting.entrydate = data.data.entrydate //0, + userConting.probationperiod = data.data.probationperiod //0, + userConting.planformaldate = data.data.planformaldate //0, + userConting.politicaloutlook = data.data.politicaloutlook //1, + userConting.nameusedbefore = data.data.nameusedbefore //"", + userConting.iconphoto = data.data.iconphoto //" + userConting.responsibledepartment = data.data.responsibledepartment //"", + userConting.responsibledepartmentjson = data.data.responsibledepartmentjson //"", + userConting.birthdaytime = data.data.birthdaytime //"1988-10-15", + userConting.idcardstarttimedata = data.data.idcardstarttimedata //"", + userConting.idcardendtimedata = data.data.idcardendtimedata //"", + userConting.entrydatetime = data.data.entrydatetime //"", + userConting.planformaldatetime = data.data.planformaldatetime //"", + userConting.doubleworkerlist = data.data.doubleworkerlist //null, + userConting.educationalexperience = data.data.educationalexperience //null, + userConting.emergencycontact = data.data.emergencycontact //null, + userConting.memberoffamily = data.data.memberoffamily //null, + userConting.workhistorylist = data.data.workhistorylist //null, + userConting.groupworkhistorylist = data.data.groupworkhistorylist //null, + userConting.idstr = data.data.idstr //"78", + userConting.companyname = data.data.companyname //"山东恒信高科能源有限公司", + userConting.maindeparmentname = data.data.maindeparmentname //"企管部", + userConting.adminorgname = data.data.adminorgname //"", + userConting.positionname = data.data.positionname //"开发主管", + userConting.jobclassname = data.data.jobclassname //"基层管理", + userConting.jobidname = data.data.jobidname //"主管", + userConting.politicaloutlookname = data.data.politicaloutlookname //"群众", + userConting.jobstartdatestr = data.data.jobstartdatestr //"", + userConting.entrydatestr = data.data.entrydatestr //"", + userConting.personincharge = data.data.personincharge //2, + userConting.sunmaindeparmentname = data.data.sunmaindeparmentname //"企管", + userConting.workpostname = data.data.workpostname //"", + userConting.teamname = data.data.teamname //"长白班", + userConting.allorglist = data.data.allorglist //[309,102,272], + userConting.ruleid = data.data.ruleid //"0", + userConting.rulename = data.data.rulename //"", + userConting.orgreslist = data.data.orgreslist //null + userConting.keystr = data.data.keystr // }) - .finally(()=>{rowLoading.value = false;}) + .finally(() => { rowLoading.value = false; }) } /** * 关闭弹窗 */ -function closeArchivesBox(){ +function closeArchivesBox() { emits("update:isShow", false); activeName.value = "1"; - editMyCont.value=false; + editMyCont.value = false; } /** * 选项卡翻页 */ const handleClickUser = (tab: any, event: Event) => { -// console.log(tab, event) + // console.log(tab, event) } /** * 监听数据 */ -watch(() => props.isShow,() => { +watch(() => props.isShow, () => { // console.log("监听数据",props.archivesdata ) - if(props.isShow){ + if (props.isShow) { getjtcyList(); - boxTitle.value = "查看 "+ props.archivesdata.name + "(工号："+ props.archivesdata.number +")" +" 详情"; - if(props.archivesdata.icon != ""){ + boxTitle.value = "查看 " + props.archivesdata.name + "(工号：" + props.archivesdata.number + ")" + " 详情"; + if (props.archivesdata.icon != "") { userIcon.value = props.archivesdata.icon - }else if(props.archivesdata.iconphoto !=""){ + } else if (props.archivesdata.iconphoto != "") { userIcon.value = props.archivesdata.iconphoto - }else{ - userIcon.value =UserRole + } else { + userIcon.value = UserRole } } }) @@ -192,7 +198,7 @@ watch(() => props.isShow,() => { /** * 刷新编辑页面 */ -function refreshContPage(cont:archivesCont){ +function refreshContPage(cont: archivesCont) { emits("updatemyconting", cont); getjtcyList(); // console.log("刷新编辑页面",cont) @@ -285,13 +291,13 @@ function refreshContPage(cont:archivesCont){ // userConting.keystr = cont.keystr // getjtcyList(); } -const handleAvatarSuccess: UploadProps['onSuccess'] = (response,uploadFile,uploadFiles) => { +const handleAvatarSuccess: UploadProps['onSuccess'] = (response, uploadFile, uploadFiles) => { userIcon.value = URL.createObjectURL(uploadFile.raw!) // console.log("上传后数据---1--->",response) // console.log("上传后数据---2--->",uploadFile) // console.log("上传后数据----3-->",uploadFiles) - editMyInfoIcon({id:props.archivesdata.id,iconpath:response.data.url}) - .then(( data )=>{ + editMyInfoIcon({ id: props.archivesdata.id, iconpath: response.data.url }) + .then((data) => { // userConting.value = data.data ElMessage.success("编辑成功"); emits("getarchivespageclick"); @@ -300,27 +306,23 @@ const handleAvatarSuccess: UploadProps['onSuccess'] = (response,uploadFile,uploa const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => { // console.log("上传前判断------>",rawFile) } -function editmvorg(){ +function editmvorg() { editMyOrgCont.value = true; } diff --git a/src/views/hr/archives/basicinformation/appraisalrecord.vue b/src/views/hr/archives/basicinformation/appraisalrecord.vue new file mode 100644 index 000000000..2b0cb1746 --- /dev/null +++ b/src/views/hr/archives/basicinformation/appraisalrecord.vue @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/views/hr/archives/basicinformation/appraisalrecordadd.vue b/src/views/hr/archives/basicinformation/appraisalrecordadd.vue new file mode 100644 index 000000000..2b0cb1746 --- /dev/null +++ b/src/views/hr/archives/basicinformation/appraisalrecordadd.vue @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/views/hr/archives/basicinformation/appraisalrecordedit.vue b/src/views/hr/archives/basicinformation/appraisalrecordedit.vue new file mode 100644 index 000000000..2b0cb1746 --- /dev/null +++ b/src/views/hr/archives/basicinformation/appraisalrecordedit.vue @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/views/hr/archives/basicinformation/charactercolor.vue b/src/views/hr/archives/basicinformation/charactercolor.vue new file mode 100644 index 000000000..cba8e93b5 --- /dev/null +++ b/src/views/hr/archives/basicinformation/charactercolor.vue @@ -0,0 +1,68 @@ + + + + \ No newline at end of file diff --git a/src/views/hr/archives/basicinformation/content.vue b/src/views/hr/archives/basicinformation/content.vue index 6d5354f17..dfef82829 100644 --- a/src/views/hr/archives/basicinformation/content.vue +++ b/src/views/hr/archives/basicinformation/content.vue @@ -6,22 +6,22 @@ {{ props.usercont.internaltelephone }}  - + + + + {{ props.usercont.bloodtype }}  + + + @@ -185,43 +189,43 @@ function editCont(){ - 金牛座 - 双子座 - 巨蟹座 - 狮子座 - 处女座 - 天枰座 - 天蝎座 - 射手座 - 摩羯座 - 水瓶座 - 双鱼座 + 金牛座 + 双子座 + 巨蟹座 + 狮子座 + 处女座 + 天枰座 + 天蝎座 + 射手座 + 摩羯座 + 水瓶座 + 双鱼座 白羊座  - 再入职 + 再入职 雇佣入职  - 编外人员 - 实习&实习生 - 试用员工 - 待分配 - 待岗 - 临时调入 - 正式员工 - 长期病假 - 停薪留职 - 退休 - 辞职 - 辞退 - 离职 + 编外人员 + 实习&实习生 + 试用员工 + 待分配 + 待岗 + 临时调入 + 正式员工 + 长期病假 + 停薪留职 + 退休 + 辞职 + 辞退 + 离职 临时工  @@ -252,7 +256,7 @@ function editCont(){ - 否 + 否 是  @@ -273,7 +277,17 @@ function editCont(){ {{ props.usercont.globalroaming }}  - + + + + 农业户口 + 非农业户口  + + {{ props.usercont.workwechat }}  - + + + + {{ props.usercont.interests }}  + + +   - + diff --git a/src/views/hr/archives/basicinformation/editcontent.vue b/src/views/hr/archives/basicinformation/editcontent.vue index 4b5dd1e03..693a6fedb 100644 --- a/src/views/hr/archives/basicinformation/editcontent.vue +++ b/src/views/hr/archives/basicinformation/editcontent.vue @@ -4,45 +4,45 @@ @ 备注: 编辑员工信息 --> - + @@ -292,34 +274,24 @@ const computingClickTime = (value: string) => { - + - + @@ -329,32 +301,18 @@ const computingClickTime = (value: string) => { - - + + - - + + @@ -383,9 +341,10 @@ const computingClickTime = (value: string) => { - + @@ -393,7 +352,7 @@ const computingClickTime = (value: string) => { - + @@ -401,15 +360,27 @@ const computingClickTime = (value: string) => { - + - + + + + + + + + + - + @@ -427,42 +398,30 @@ const computingClickTime = (value: string) => { - + - + - + - + @@ -471,24 +430,18 @@ const computingClickTime = (value: string) => { 入职日期* - + - + @@ -496,15 +449,8 @@ const computingClickTime = (value: string) => { 预计转正日期 - + @@ -512,15 +458,8 @@ const computingClickTime = (value: string) => { 参加工作日期 - + @@ -529,12 +468,7 @@ const computingClickTime = (value: string) => { - + @@ -562,7 +496,21 @@ const computingClickTime = (value: string) => { - + + + + + + + + + + + diff --git a/src/views/hr/archives/basicinformation/emergencycontactadd.vue b/src/views/hr/archives/basicinformation/emergencycontactadd.vue index 24e4ba431..c070937c2 100644 --- a/src/views/hr/archives/basicinformation/emergencycontactadd.vue +++ b/src/views/hr/archives/basicinformation/emergencycontactadd.vue @@ -4,23 +4,24 @@ @ 备注: 新增紧急联系人 --> - + diff --git a/src/views/hr/archives/basicinformation/emergencycontactedit.vue b/src/views/hr/archives/basicinformation/emergencycontactedit.vue index fb6e8f9fd..4aadbe565 100644 --- a/src/views/hr/archives/basicinformation/emergencycontactedit.vue +++ b/src/views/hr/archives/basicinformation/emergencycontactedit.vue @@ -4,28 +4,29 @@ @ 备注: 编辑紧急联系人 --> - + diff --git a/src/views/hr/archives/basicinformation/familymembersadd.vue b/src/views/hr/archives/basicinformation/familymembersadd.vue index 454dd1ac4..786f315d5 100644 --- a/src/views/hr/archives/basicinformation/familymembersadd.vue +++ b/src/views/hr/archives/basicinformation/familymembersadd.vue @@ -96,9 +96,6 @@ function clostAddBoxJtcy(){ - - - diff --git a/src/views/hr/archives/basicinformation/rewardsandpunishments.vue b/src/views/hr/archives/basicinformation/rewardsandpunishments.vue new file mode 100644 index 000000000..52bfc1d6e --- /dev/null +++ b/src/views/hr/archives/basicinformation/rewardsandpunishments.vue @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/src/views/hr/archives/basicinformation/rewardsandpunishmentsadd.vue b/src/views/hr/archives/basicinformation/rewardsandpunishmentsadd.vue new file mode 100644 index 000000000..2b0cb1746 --- /dev/null +++ b/src/views/hr/archives/basicinformation/rewardsandpunishmentsadd.vue @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/views/hr/archives/basicinformation/rewardsandpunishmentsedit.vue b/src/views/hr/archives/basicinformation/rewardsandpunishmentsedit.vue new file mode 100644 index 000000000..2b0cb1746 --- /dev/null +++ b/src/views/hr/archives/basicinformation/rewardsandpunishmentsedit.vue @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/views/hr/archives/basicinformation/workingcouple.vue b/src/views/hr/archives/basicinformation/workingcouple.vue index e54efcd62..5b1e5b291 100644 --- a/src/views/hr/archives/basicinformation/workingcouple.vue +++ b/src/views/hr/archives/basicinformation/workingcouple.vue @@ -5,22 +5,22 @@ --> - + diff --git a/src/views/hr/archives/basicinformation/workingcoupleadd.vue b/src/views/hr/archives/basicinformation/workingcoupleadd.vue index 40acb0f5d..39c1a4823 100644 --- a/src/views/hr/archives/basicinformation/workingcoupleadd.vue +++ b/src/views/hr/archives/basicinformation/workingcoupleadd.vue @@ -7,23 +7,23 @@ import { doubleWorkCont } from '@/api/hr/people/type' import { addDoubleWorkCont } from '@/api/hr/people/index' const props = defineProps({ - addisshow:{ - type:Boolean, - default:false + addisshow: { + type: Boolean, + default: false }, - keyval:{ - type:String, - default:"" + keyval: { + type: String, + default: "" } }); const addLoading = ref(false) -const emits = defineEmits(["update:addisshow","restdata"]); //操作父级数据 +const emits = defineEmits(["update:addisshow", "restdata"]); //操作父级数据 const addSzgFormRef = ref(ElForm); //编辑表单 -const szgFormData = reactive({id:""}); +const szgFormData = reactive({ id: "" }); /** * 弹窗显示控制 */ - const addshow = computed({ +const addshow = computed({ get: () => props.addisshow, set: (val) => { emits("update:addisshow", val); @@ -32,65 +32,67 @@ const szgFormData = reactive({id:""}); /** * 表单验证规则 */ - const addszgRules = reactive({ - name: [{ required: true, message: "请输入姓名", trigger: "blur" }], - mobilephone: [{ required: true, message: "请输入联系电话", trigger: "blur" }], - company: [{ required: true, message: "请输入公司", trigger: "blur" }], - department: [{ required: true, message: "请输入所在部门", trigger: "blur" }], -}); -/** - * 关闭弹窗 - */ -function clostAddBoxSzg(){ +const addszgRules = reactive({ + workcouple: [{ required: true, message: "请输入是或否", trigger: "blur" }], + // name: [{ required: false, message: "请输入配偶姓名", trigger: "blur" }], + // company: [{ required: false, message: "请输入所在公司", trigger: "blur" }], + // department: [{ required: false, message: "请输入所在部门", trigger: "blur" }], + // section: [{ required: false, message: "请输入工段", trigger: "blur" }], + // job: [{ required: false, message: "请输入职位", trigger: "blur" }], + // level: [{ required: false, message: "请输入职等", trigger: "blur" }], + // time: [{ required: false, message: "请输入入职时间", trigger: "blur" }], + // mobilephone: [{ required: false, message: "请输入联系方式", trigger: "blur" }], +}) + + +const clostAddBoxSzg = () => { emits("update:addisshow", false); initJjlxrData() } + + +/** + * 关闭弹窗 + */ +// function clostAddBoxSzg(){ +// emits("update:addisshow", false); +// initJjlxrData() +// } /** * 初始化数据 */ - function initJjlxrData(){ +function initJjlxrData() { addSzgFormRef.value.resetFields(); addLoading.value = false; } /** * 提交数据 */ - function submitAddSzg(){ +function submitAddSzg() { // console.log("提交数据",szgFormData) // addLoading.value = true; addSzgFormRef.value.validate((isValid: boolean) => { if (isValid) { - szgFormData.id=props.keyval + szgFormData.id = props.keyval addDoubleWorkCont(szgFormData) - .then(() =>{ + .then(() => { ElMessage.success("新增成功"); clostAddBoxSzg(); emits('restdata'); }) - .finally(() =>{addLoading.value = false;}) + .finally(() => { addLoading.value = false; }) } }); } - + diff --git a/src/views/hr/archives/basicinformation/workingcoupleedit.vue b/src/views/hr/archives/basicinformation/workingcoupleedit.vue index e35a7326e..589036488 100644 --- a/src/views/hr/archives/basicinformation/workingcoupleedit.vue +++ b/src/views/hr/archives/basicinformation/workingcoupleedit.vue @@ -7,29 +7,29 @@ import { doubleWorkCont } from '@/api/hr/people/type' import { editDoubleWorkCont } from '@/api/hr/people/index' const props = defineProps({ - editisshow:{ - type:Boolean, - default:false + editisshow: { + type: Boolean, + default: false }, - keyval:{ - type:String, - default:"" + keyval: { + type: String, + default: "" }, - datacont:{ - type:Object, - default(){ + datacont: { + type: Object, + default() { return {} } } }); const editLoading = ref(false) -const emits = defineEmits(["update:editisshow","restdata"]); //操作父级数据 +const emits = defineEmits(["update:editisshow", "restdata"]); //操作父级数据 const editSzgFormRef = ref(ElForm); //编辑表单 -const szgFormData = reactive({id:""}); +const szgFormData = reactive({ id: "" }); /** * 弹窗显示控制 */ - const editshow = computed({ +const editshow = computed({ get: () => props.editisshow, set: (val) => { emits("update:editisshow", val); @@ -38,79 +38,73 @@ const szgFormData = reactive({id:""}); /** * 表单验证规则 */ - const editszgRules = reactive({ - name: [{ required: true, message: "请输入姓名", trigger: "blur" }], - mobilephone: [{ required: true, message: "请输入联系电话", trigger: "blur" }], - company: [{ required: true, message: "请输入公司", trigger: "blur" }], +const editszgRules = reactive({ + workcouple: [{ required: true, message: "请输入是或否", trigger: "blur" }], + name: [{ required: true, message: "请输入配偶姓名", trigger: "blur" }], + company: [{ required: true, message: "请输入所在公司", trigger: "blur" }], department: [{ required: true, message: "请输入所在部门", trigger: "blur" }], + section: [{ required: true, message: "请输入工段", trigger: "blur" }], + job: [{ required: true, message: "请输入职位", trigger: "blur" }], + level: [{ required: true, message: "请输入职等", trigger: "blur" }], + time: [{ required: true, message: "请输入入职时间", trigger: "blur" }], + mobilephone: [{ required: true, message: "请输入联系方式", trigger: "blur" }], }); /** * 关闭弹窗 */ -function clostEditBoxSzg(){ +function clostEditBoxSzg() { emits("update:editisshow", false); initJjlxrData() } /** * 初始化数据 */ - function initJjlxrData(){ +function initJjlxrData() { editSzgFormRef.value.resetFields(); editLoading.value = false; } /** * 提交数据 */ - function submitEditSzg(){ +function submitEditSzg() { // console.log("提交数据",szgFormData) // editLoading.value = true; editSzgFormRef.value.validate((isValid: boolean) => { if (isValid) { editDoubleWorkCont(szgFormData) - .then(() =>{ + .then(() => { ElMessage.success("编辑成功"); clostEditBoxSzg(); emits('restdata'); }) - .finally(() =>{editLoading.value = false;}) + .finally(() => { editLoading.value = false; }) } }); } /** * 监听数据 */ - watch(() => props.editisshow,() => { +watch(() => props.editisshow, () => { // console.log("watch--------->",props.editisshow,props.datacont) - if(props.editisshow){ - szgFormData.id= props.datacont.id.toString(); + if (props.editisshow) { + szgFormData.id = props.datacont.id.toString(); szgFormData.name = props.datacont.name; szgFormData.mobilephone = props.datacont.tel; szgFormData.company = props.datacont.company; szgFormData.department = props.datacont.department; szgFormData.position = props.datacont.position; } - + }) - +