同步

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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,
+		id: 1,
-		name:"临时工"
+		name: "临时工"
 	},
 	{
-		id:2,
+		id: 2,
-		name:"编外人员"
+		name: "编外人员"
 	},
 	{
-		id:3,
+		id: 3,
-		name:"实习&实习生"
+		name: "实习&实习生"
 	},
 	{
-		id:4,
+		id: 4,
-		name:"试用员工"
+		name: "试用员工"
 	},
 	{
-		id:5,
+		id: 5,
-		name:"待分配"
+		name: "待分配"
 	},
 	{
-		id:6,
+		id: 6,
-		name:"待岗"
+		name: "待岗"
 	},
 	{
-		id:7,
+		id: 7,
-		name:"临时调入"
+		name: "临时调入"
 	},
 	{
-		id:8,
+		id: 8,
-		name:"正式员工"
+		name: "正式员工"
 	},
 	{
-		id:9,
+		id: 9,
-		name:"长期病假"
+		name: "长期病假"
 	},
 	{
-		id:10,
+		id: 10,
-		name:"停薪留职"
+		name: "停薪留职"
 	}
 ];
 
 export const emptypeOptionsFalse = [
 	{
-		id:11,
+		id: 11,
-		name:"退休"
+		name: "退休"
 	},
 	{
-		id:12,
+		id: 12,
-		name:"辞职"
+		name: "辞职"
 	},
 	{
-		id:13,
+		id: 13,
-		name:"辞退"
+		name: "辞退"
 	},
 	{
-		id:14,
+		id: 14,
-		name:"离职"
+		name: "离职"
 	}
 ];
 /**
  * 性别
  */
- export const userGender = [
+export const userGender = [
 	{
-		id:1,
+		id: 1,
-		name:"男"
+		name: "男"
 	},
 	{
-		id:2,
+		id: 2,
-		name:"女"
+		name: "女"
 	},
 	{
-		id:3,
+		id: 3,
-		name:"中性"
+		name: "中性"
 	}
 ];
 export const healthStates = [
 	{
-		id:1,
+		id: 1,
-		name:"良好"
+		name: "良好"
 	},
 	{
-		id:2,
+		id: 2,
-		name:"一般"
+		name: "一般"
 	},
 	{
-		id:3,
+		id: 3,
-		name:"较弱"
+		name: "较弱"
 	},
 	{
-		id:4,
+		id: 4,
-		name:"有生理缺陷"
+		name: "有生理缺陷"
 	},
 	{
-		id:5,
+		id: 5,
-		name:"残废"
+		name: "残废"
 	}
 ];
 /**
  * 婚姻状况
  */
- export const userMaritalstatus = [
+export const userMaritalstatus = [
 	{
-		id:1,
+		id: 1,
-		name:"未婚"
+		name: "未婚"
 	},
 	{
-		id:2,
+		id: 2,
-		name:"已婚"
+		name: "已婚"
 	},
 	{
-		id:3,
+		id: 3,
-		name:"丧偶"
+		name: "丧偶"
 	},
 	{
-		id:4,
+		id: 4,
-		name:"离异"
+		name: "离异"
 	}
 ];
 /**
  * 政治面貌
  */
- export const userPoliticaloutloo =[
+export const userPoliticaloutloo = [
 	{
-		id:1,
+		id: 1,
-		name:"群众"
+		name: "群众"
 	},
 	{
-		id:2,
+		id: 2,
-		name:"无党派"
+		name: "无党派"
 	},
 	{
-		id:3,
+		id: 3,
-		name:"台盟会员"
+		name: "台盟会员"
 	},
 	{
-		id:4,
+		id: 4,
-		name:"九三社员"
+		name: "九三社员"
 	},
 	{
-		id:5,
+		id: 5,
-		name:"致公党员"
+		name: "致公党员"
 	},
 	{
-		id:6,
+		id: 6,
-		name:"农工党员"
+		name: "农工党员"
 	},
 	{
-		id:7,
+		id: 7,
-		name:"民进会员"
+		name: "民进会员"
 	},
 	{
-		id:8,
+		id: 8,
-		name:"民建会员"
+		name: "民建会员"
 	},
 	{
-		id:9,
+		id: 9,
-		name:"民盟盟员"
+		name: "民盟盟员"
 	},
 	{
-		id:10,
+		id: 10,
-		name:"民革会员"
+		name: "民革会员"
 	},
 	{
-		id:11,
+		id: 11,
-		name:"共青团员"
+		name: "共青团员"
 	},
 	{
-		id:12,
+		id: 12,
-		name:"预备党员"
+		name: "预备党员"
 	},
 	{
-		id:13,
+		id: 13,
-		name:"中共党员"
+		name: "中共党员"
 	}
 ];
 /**
  * 星座
  */
- export const userConstellationing =[
+export const userConstellationing = [
 	{
-		id:1,
+		id: 1,
-		name:"白羊座"
+		name: "白羊座"
 	},
 	{
-		id:2,
+		id: 2,
-		name:"金牛座"
+		name: "金牛座"
 	},
 	{
-		id:3,
+		id: 3,
-		name:"双子座"
+		name: "双子座"
 	},
 	{
-		id:4,
+		id: 4,
-		name:"巨蟹座"
+		name: "巨蟹座"
 	},
 	{
-		id:5,
+		id: 5,
-		name:"狮子座"
+		name: "狮子座"
 	},
 	{
-		id:6,
+		id: 6,
-		name:"处女座"
+		name: "处女座"
 	},
 	{
-		id:7,
+		id: 7,
-		name:"天枰座"
+		name: "天枰座"
 	},
 	{
-		id:8,
+		id: 8,
-		name:"天蝎座"
+		name: "天蝎座"
 	},
 	{
-		id:9,
+		id: 9,
-		name:"射手座"
+		name: "射手座"
 	},
 	{
-		id:10,
+		id: 10,
-		name:"摩羯座"
+		name: "摩羯座"
 	},
 	{
-		id:11,
+		id: 11,
-		name:"水瓶座"
+		name: "水瓶座"
 	},
 	{
-		id:12,
+		id: 12,
-		name:"双鱼座"
+		name: "双鱼座"
 	}
 ];
 /**
  * 雇佣类型
  */
- export const userHireclass = [
+export const userHireclass = [
 	{
-		id:1,
+		id: 1,
-		name:"雇佣入职"
+		name: "雇佣入职"
 	},
 	{
-		id:2,
+		id: 2,
-		name:"再入职"
+		name: "再入职"
 	}
 ];
 /**
  * 用工关系（1:临时工 , 2:编外人员 ;3:实习&实习生;4：试用员工；5：待分配；6：待岗；7：临时调入；8：正式员工；9：长期病假；10：停薪留职；11：退休；12：辞职；13：辞退；14：离职）',
   `company` 入职公司',
  */
-  export const emptypeOptionsAll =[
+export const emptypeOptionsAll = [
 	{
-		id:1,
+		id: 1,
-		name:"临时工"
+		name: "临时工"
 	},
 	{
-		id:2,
+		id: 2,
-		name:"编外人员"
+		name: "编外人员"
 	},
 	{
-		id:3,
+		id: 3,
-		name:"实习&实习生"
+		name: "实习&实习生"
 	},
 	{
-		id:4,
+		id: 4,
-		name:"试用员工"
+		name: "试用员工"
 	},
 	{
-		id:5,
+		id: 5,
-		name:"待分配"
+		name: "待分配"
 	},
 	{
-		id:6,
+		id: 6,
-		name:"待岗"
+		name: "待岗"
 	},
 	{
-		id:7,
+		id: 7,
-		name:"临时调入"
+		name: "临时调入"
 	},
 	{
-		id:8,
+		id: 8,
-		name:"正式员工"
+		name: "正式员工"
 	},
 	{
-		id:9,
+		id: 9,
-		name:"长期病假"
+		name: "长期病假"
 	},
 	{
-		id:10,
+		id: 10,
-		name:"停薪留职"
+		name: "停薪留职"
 	},
 	{
-		id:11,
+		id: 11,
-		name:"退休"
+		name: "退休"
 	},
 	{
-		id:12,
+		id: 12,
-		name:"辞职"
+		name: "辞职"
 	},
 	{
-		id:13,
+		id: 13,
-		name:"辞退"
+		name: "辞退"
 	},
 	{
-		id:14,
+		id: 14,
-		name:"离职"
+		name: "离职"
 	}
 ];
 /**
  * 是否
  */
- export const yesOrno = [
+export const yesOrno = [
 	{
-		id:1,
+		id: 1,
-		name:"是"
+		name: "是"
 	},
 	{
-		id:2,
+		id: 2,
-		name:"否"
+		name: "否"
+	}
+];
+/**
+ * 户口性质
+ */
+export const Householdregistration = [
+	{
+		id: 1,
+		name: "农业户口"
+	},
+	{
+		id: 2,
+		name: "非农业户口"
 	}
 ];
 /**
  * 学历
  */
-export const education =[
+export const education = [
 	{
-		id:1,
+		id: 1,
-		name:'初中及以下'
+		name: '初中及以下'
 	},
 	{
-		id:2,
+		id: 2,
-		name:'中专'
+		name: '中专'
 	},
 	{
-		id:3,
+		id: 3,
-		name:'高中'
+		name: '高中'
 	},
 	{
-		id:4,
+		id: 4,
-		name:'中技'
+		name: '中技'
 	},
 	{
-		id:5,
+		id: 5,
-		name:'高技'
+		name: '高技'
 	},
 	{
-		id:6,
+		id: 6,
-		name:'函数专科'
+		name: '函数专科'
 	},
 	{
-		id:7,
+		id: 7,
-		name:'大学专科'
+		name: '大学专科'
 	},
 	{
-		id:8,
+		id: 8,
-		name:'函数本科'
+		name: '函数本科'
 	},
 	{
-		id:9,
+		id: 9,
-		name:'大学本科'
+		name: '大学本科'
 	},
 	{
-		id:10,
+		id: 10,
-		name:'硕士研究生'
+		name: '硕士研究生'
 	},
 	{
-		id:11,
+		id: 11,
-		name:'博士研究生'
+		name: '博士研究生'
 	},
 	{
-		id:12,
+		id: 12,
-		name:'专家、教授'
+		name: '专家、教授'
 	},
 ];
 //入职等级
 export const positiongrade = [
 	{
-        id:10000,
+		id: 10000,
-        name:'无'
+		name: '无'
 	},
 	{
-        id:1,
+		id: 1,
-        name:'一级'
+		name: '一级'
 	},
 	{
-        id:2,
+		id: 2,
-        name:'二级'
+		name: '二级'
 	},
 	{
-        id:3,
+		id: 3,
-        name:'三级'
+		name: '三级'
 	}
 ];
 //学位
 export const academicDegree = [
 	{
-        id:1,
+		id: 1,
-        name:'无'
+		name: '无'
 	},
 	{
-        id:2,
+		id: 2,
-        name:'学士'
+		name: '学士'
 	},
 	{
-        id:3,
+		id: 3,
-        name:'硕士'
+		name: '硕士'
 	},
 	{
-        id:4,
+		id: 4,
-        name:'博士'
+		name: '博士'
 	},
 	{
-        id:5,
+		id: 5,
-        name:'教育学学位'
+		name: '教育学学位'
 	}
 ];
 //主职与兼职
 export const mainAndPartTimeJobs = [
 	{
-        id:1,
+		id: 1,
-        name:'主职'
+		name: '主职'
 	},
 	{
-        id:2,
+		id: 2,
-        name:'兼职'
+		name: '兼职'
 	}
 ];
 // 职位变动类型
-export const   postChangeType=[
+export const postChangeType = [
 	{
-        id:1,
+		id: 1,
-        name:'预入职'
+		name: '预入职'
 	},
 	{
-        id:2,
+		id: 2,
-        name:'雇佣入职'
+		name: '雇佣入职'
 	},
 	{
-        id:3,
+		id: 3,
-        name:'转正'
+		name: '转正'
 	},
 	{
-        id:4,
+		id: 4,
-        name:'晋升'
+		name: '晋升'
 	},
 	{
-        id:5,
+		id: 5,
-        name:'降级'
+		name: '降级'
 	},
 	{
-        id:6,
+		id: 6,
-        name:'职等调整'
+		name: '职等调整'
 	},
 	{
-        id:7,
+		id: 7,
-        name:'调动调入'
+		name: '调动调入'
 	},
 	{
-        id:8,
+		id: 8,
-        name:'跨公司调动调入'
+		name: '跨公司调动调入'
 	},
 	{
-        id:9,
+		id: 9,
-        name:'借调'
+		name: '借调'
 	},
 	{
-        id:10,
+		id: 10,
-        name:'平调'
+		name: '平调'
 	},
 	{
-        id:11,
+		id: 11,
-        name:'兼职'
+		name: '兼职'
 	},
 	{
-        id:12,
+		id: 12,
-        name:'预离职'
+		name: '预离职'
 	},
 	{
-        id:13,
+		id: 13,
-        name:'离职'
+		name: '离职'
 	},
 	{
-        id:14,
+		id: 14,
-        name:'退休'
+		name: '退休'
 	},
 	{
-        id:15,
+		id: 15,
-        name:'返聘'
+		name: '返聘'
 	},
 	{
-        id:16,
+		id: 16,
-        name:'员工初始化'
+		name: '员工初始化'
 	},
 	{
-        id:17,
+		id: 17,
-        name:'擅自离职'
+		name: '擅自离职'
 	},
 	{
-        id:18,
+		id: 18,
-        name:'即辞即走'
+		name: '即辞即走'
 	},
 	{
-        id:19,
+		id: 19,
-        name:'组织调整'
+		name: '组织调整'
 	},
 	{
-        id:20,
+		id: 20,
-        name:'辞退'
+		name: '辞退'
 	},
 	{
-        id:21,
+		id: 21,
-        name:'跨公司借调调出'
+		name: '跨公司借调调出'
 	},
 	{
-        id:22,
+		id: 22,
-        name:'跨公司借调调入'
+		name: '跨公司借调调入'
 	},
 	{
-        id:23,
+		id: 23,
-        name:'培训期间离职'
+		name: '培训期间离职'
 	},
 	{
-        id:24,
+		id: 24,
-        name:'合同到期'
+		name: '合同到期'
 	},
 	{
-        id:25,
+		id: 25,
-        name:'实习结束'
+		name: '实习结束'
 	}
 
 ];
 /**
  * 学历性质
  */
- export const xuliClass = [
+export const xuliClass = [
 	{
-		id:1,
+		id: 1,
-		name:"普通"
+		name: "普通"
 	},
 	{
-		id:2,
+		id: 2,
-		name:"第一学历"
+		name: "第一学历"
 	},
 	{
-		id:3,
+		id: 3,
-		name:"最高学历"
+		name: "最高学历"
 	}
 ]

src/api/hr/people/index.ts

@@ -27,7 +27,7 @@ import {
 /**
  * 获取人员档案
  */
- export function getArchivesListPage(data?: searchCriteriaForPeople): AxiosPromise<archivesList> {
+export function getArchivesListPage(data?: searchCriteriaForPeople): AxiosPromise<archivesList> {
 	return request({
 		url: '/hrapi/staff/archiveslistcont',
 		method: 'post',
@@ -37,7 +37,7 @@ import {
 /**
  * 获取人员行政组织关系
  */
- export function getPeopleAboutOrg(data?: contId) {
+export function getPeopleAboutOrg(data?: contId) {
 	return request({
 		url: '/hrapi/staff/useraboutorglist',
 		method: 'post',
@@ -47,7 +47,7 @@ import {
 /**
  * 获取紧急联系人
  */
- export function getEmergencyContact(data?: contId) {
+export function getEmergencyContact(data?: contId) {
 	return request({
 		url: '/hrapi/staff/emergencycontactlist',
 		method: 'post',
@@ -57,7 +57,7 @@ import {
 /**
  * 获双职工
  */
- export function getWorkingCouple(data?: contId) {
+export function getWorkingCouple(data?: contId) {
 	return request({
 		url: '/hrapi/staff/doubleworkerlist',
 		method: 'post',
@@ -67,7 +67,7 @@ import {
 /**
  * 获双家庭成员
  */
- export function getFamilyMembers(data?: contId) {
+export function getFamilyMembers(data?: contId) {
 	return request({
 		url: '/hrapi/staff/familymemberslist',
 		method: 'post',
@@ -77,7 +77,7 @@ import {
 /**
  * 获取教育经历
  */
- export function getEducationalExperience(data?: contId) {
+export function getEducationalExperience(data?: contId) {
 	return request({
 		url: '/hrapi/staff/personneleducationlist',
 		method: 'post',
@@ -87,7 +87,7 @@ import {
 /**
  * 获取集团内部工作经历
  */
- export function getInnerWork(data?: contId) {
+export function getInnerWork(data?: contId) {
 	return request({
 		url: '/hrapi/staff/getinsideworkhistorylist',
 		method: 'post',
@@ -97,7 +97,7 @@ import {
 /**
  * 获取集团内部工作经历
  */
- export function getoOutsideWork(data?: contId) {
+export function getoOutsideWork(data?: contId) {
 	return request({
 		url: '/hrapi/staff/workhistorylist',
 		method: 'post',
@@ -107,7 +107,7 @@ import {
 /**
  * 获取集团内部工作经历
  */
- export function editUserPwd(data?: editPwdCont) {
+export function editUserPwd(data?: editPwdCont) {
 	return request({
 		url: '/hrapi/staff/editpassword',
 		method: 'post',
@@ -117,7 +117,7 @@ import {
 /**
  * 获取个人相信信息
  */
- export function getMyInfoing(data?: contIdes) {
+export function getMyInfoing(data?: contIdes) {
 	return request({
 		url: '/hrapi/staff/get_archives_cont',
 		method: 'post',
@@ -127,7 +127,7 @@ import {
 /**
  * 修改个人头像
  */
- export function editMyInfoIcon(data: editUserIcon) {
+export function editMyInfoIcon(data: editUserIcon) {
 	return request({
 		url: '/hrapi/staff/edit_people_icon',
 		method: 'post',
@@ -137,7 +137,7 @@ import {
 /**
  * 编辑人员行政组织关系
  */
- export function editMyOrgUndertake(data: editUserAboutOrg) {
+export function editMyOrgUndertake(data: editUserAboutOrg) {
 	return request({
 		url: '/hrapi/staff/edit_man_org_cont',
 		method: 'post',
@@ -147,7 +147,7 @@ import {
 /**
  * 编辑个人相信信息
  */
- export function editMyInfoing(data?: userManOrFucont) {
+export function editMyInfoing(data?: userManOrFucont) {
 	return request({
 		url: '/hrapi/staff/edit_manmain_cont',
 		method: 'post',
@@ -157,7 +157,7 @@ import {
 /**
  * 添加紧急联系人
  */
- export function addEmergencyContactInfo(data?: emergencyContactAdd) {
+export function addEmergencyContactInfo(data?: emergencyContactAdd) {
 	return request({
 		url: '/hrapi/staff/addemercycall',
 		method: 'post',
@@ -167,7 +167,7 @@ import {
 /**
  * 编辑紧急联系人
  */
- export function editEmergencyContactInfo(data?: emergencyContactInfo) {
+export function editEmergencyContactInfo(data?: emergencyContactInfo) {
 	return request({
 		url: '/hrapi/staff/editemercycall',
 		method: 'post',
@@ -177,7 +177,7 @@ import {
 /**
  * 编辑紧急联系人状态
  */
- export function editEmergencyContactState(data?: delJjlxr) {
+export function editEmergencyContactState(data?: delJjlxr) {
 	return request({
 		url: '/hrapi/staff/editemercycallstate',
 		method: 'post',
@@ -187,7 +187,7 @@ import {
 /**
  * 添加双职工
  */
- export function addDoubleWorkCont(data?: doubleWorkCont) {
+export function addDoubleWorkCont(data?: doubleWorkCont) {
 	return request({
 		url: '/hrapi/staff/adddoubleworker',
 		method: 'post',
@@ -197,7 +197,7 @@ import {
 /**
  * 编辑双职工内容
  */
- export function editDoubleWorkCont(data?: doubleWorkCont) {
+export function editDoubleWorkCont(data?: doubleWorkCont) {
 	return request({
 		url: '/hrapi/staff/eidtdoubleworker',
 		method: 'post',
@@ -207,7 +207,7 @@ import {
 /**
  * 编辑双职工状态
  */
- export function editDoubleWorkState(data?: delJjlxr) {
+export function editDoubleWorkState(data?: delJjlxr) {
 	return request({
 		url: '/hrapi/staff/eidtdoubleworkerstate',
 		method: 'post',
@@ -217,7 +217,7 @@ import {
 /**
  * 添加家庭成员
  */
- export function addFamilyMembersCont(data?: familyMembersContAdd) {
+export function addFamilyMembersCont(data?: familyMembersContAdd) {
 	return request({
 		url: '/hrapi/staff/addfamilymembers',
 		method: 'post',
@@ -227,7 +227,7 @@ import {
 /**
  * 编辑家庭成员
  */
- export function editFamilyMembersCont(data?: familyMembersContEdit) {
+export function editFamilyMembersCont(data?: familyMembersContEdit) {
 	return request({
 		url: '/hrapi/staff/editfamilymembers',
 		method: 'post',
@@ -237,7 +237,7 @@ import {
 /**
  * 编辑家庭成员状态
  */
- export function editFamilyMembersContState(data?: delJjlxr) {
+export function editFamilyMembersContState(data?: delJjlxr) {
 	return request({
 		url: '/hrapi/staff/editfamilymemberssatte',
 		method: 'post',
@@ -247,7 +247,7 @@ import {
 /**
  * 添加教育经历
  */
- export function addEducExpCont(data?: addEducExpInfoing) {
+export function addEducExpCont(data?: addEducExpInfoing) {
 	return request({
 		url: '/hrapi/staff/addeducationalexperience',
 		method: 'post',
@@ -257,7 +257,7 @@ import {
 /**
  * 编辑教育经历
  */
- export function editEducExpCont(data?: editEducExpInfoing) {
+export function editEducExpCont(data?: editEducExpInfoing) {
 	return request({
 		url: '/hrapi/staff/editeducationalexperience',
 		method: 'post',
@@ -267,7 +267,7 @@ import {
 /**
  * 编辑教育经历状态
  */
- export function editEducExpState(data?: delJjlxr) {
+export function editEducExpState(data?: delJjlxr) {
 	return request({
 		url: '/hrapi/staff/editeduexpstate',
 		method: 'post',
@@ -278,7 +278,7 @@ import {
 /**
  * 添加集团外部工作经历
  */
- export function addGroupExternalWork(data?: addGroupExternalWorkCont) {
+export function addGroupExternalWork(data?: addGroupExternalWorkCont) {
 	return request({
 		url: '/hrapi/staff/addworkhistorycont',
 		method: 'post',
@@ -288,7 +288,7 @@ import {
 /**
  * 编辑集团外部工作经历
  */
- export function editGroupExternalWork(data?: editGroupExternalWorkCont) {
+export function editGroupExternalWork(data?: editGroupExternalWorkCont) {
 	return request({
 		url: '/hrapi/staff/editworkhistorycont',
 		method: 'post',
@@ -298,7 +298,7 @@ import {
 /**
  * 编辑集团外部工作经历
  */
- export function editGroupExternalWorkState(data?: delJjlxr) {
+export function editGroupExternalWorkState(data?: delJjlxr) {
 	return request({
 		url: '/hrapi/staff/editworkhistorystate',
 		method: 'post',
@@ -308,7 +308,7 @@ import {
 /**
  * 添加集团内部工作经历
  */
- export function addGroupInnerWork(data?: groupInnerWorkCont) {
+export function addGroupInnerWork(data?: groupInnerWorkCont) {
 	return request({
 		url: '/hrapi/staff/addinsidehistory',
 		method: 'post',
@@ -318,7 +318,7 @@ import {
 /**
  * 编辑集团内部工作经历
  */
- export function editGroupInnerWork(data?: groupInnerWorkCont) {
+export function editGroupInnerWork(data?: groupInnerWorkCont) {
 	return request({
 		url: '/hrapi/staff/eidtinsidehistoryworkcont',
 		method: 'post',
@@ -328,7 +328,7 @@ import {
 /**
  * 编辑集团内部工作经历
  */
- export function editGroupInnerWorkState(data?: delJjlxr) {
+export function editGroupInnerWorkState(data?: delJjlxr) {
 	return request({
 		url: '/hrapi/staff/editordelinsideworkhistorystate',
 		method: 'post',
@@ -339,7 +339,7 @@ import {
 /**
  * 获取工作时间列表
  */
- export function haveTeamTimeList(data: teamClassQueay) {
+export function haveTeamTimeList(data: teamClassQueay) {
 	return request({
 		url: '/hrapi/rostering/team_time_list',
 		method: 'post',
@@ -349,7 +349,7 @@ import {
 /**
  * 搜索成员
  */
- export function searchUserCont(data: searchPeoleCont): AxiosPromise<PageResult<queryPeopleCont[]>>{
+export function searchUserCont(data: searchPeoleCont): AxiosPromise<PageResult<queryPeopleCont[]>> {
 	return request({
 		url: '/kpiapi/powerpc/search_people',
 		method: 'post',
@@ -359,10 +359,19 @@ import {
 /**
  * 获取人员档案
  */
- export function analysisRedisExelect(data?: any): AxiosPromise {
+export function analysisRedisExelect(data?: any): AxiosPromise {
 	return request({
 		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
+// 	});
+// }

src/api/hr/people/type.ts

@@ -1,339 +1,350 @@
 /**
  * 搜索条件
  */
-export interface searchCriteriaForPeople extends PageQuery{
+export interface searchCriteriaForPeople extends PageQuery {
-	keywords?:string;		//关键字	
+	keywords?: string;		//关键字	
-	adminorg?:number;		//行政组织
+	adminorg?: number;		//行政组织
-	emptype?:number[];		//用工关系
+	emptype?: number[];		//用工关系
 }
 /**
  * 人员基本信息
  */
-export interface archivesCont{
+export interface archivesCont {
-	id?:number //2909;
+	id?: number //2909;
-	number?:string //"201218";
+	number?: string //"201218";
-	name?:string //"苏振";
+	name?: string //"苏振";
-	icon?:string //"";
+	icon?: string //"";
-	hireclass?:number //1;
+	hireclass?: number //1;
-	emptype?:number //8;
+	emptype?: number //8;
-	company?:number //296;
+	company?: number //296;
-	maindeparment?:number //32;
+	maindeparment?: number //32;
-	sunmaindeparment?:number //0;
+	sunmaindeparment?: number //0;
-	deparment?:string //"";
+	deparment?: string //"";
-	adminorg?:number //32;
+	adminorg?: number //32;
-	teamid?:number//0;
+	teamid?: number//0;
-	position?:number //117;
+	position?: number //117;
-	jobclass?:number //3;
+	jobclass?: number //3;
-	jobid?:number //25;
+	jobid?: number //25;
-	jobleve?:number //0;
+	jobleve?: number //0;
-	time?:number //1657002602;
+	time?: number //1657002602;
-	eitetime?:number //1657002602;
+	eitetime?: number //1657002602;
-	wechat?:string //"";
+	wechat?: string //"";
-	workwechat?:string //"";
+	workwechat?: string //"";
-	state?:number //1;
+	interests?: string
-	key?:number //4929995352838144;
+	state?: number //1;
-	isadmin?:number //0;
+	key?: number //4929995352838144;
-	password?:string //"8d135342fcc70ab05332f560031a6112";
+	isadmin?: number //0;
-	role?:string //"";
+	password?: string //"8d135342fcc70ab05332f560031a6112";
-	idcardno?:string //"370481197603084270";
+	role?: string //"";
-	passportno?:string //"";
+	idcardno?: string //"370481197603084270";
-	globalroaming?:string //"";
+	passportno?: string //"";
-	mobilephone?:string //"15020711996";
+	globalroaming?: string //"";
-	email?:string //"";
+	mobilephone?: string //"15020711996";
-	gender?:number //1;
+	email?: string //"";
-	birthday?:number //195062400;
+	gender?: number //1;
-	myfolk?:string //"汉族";
+	birthday?: number //195062400;
-	nativeplace?:string //"济宁高新区恒信公馆";
+	myfolk?: string //"汉族";
-	idcardstartdate?:number //1173801600;
+	bloodtype?: string
-	idcardenddate?:number //1804953600;
+	nativeplace?: string //"济宁高新区恒信公馆";
-	idcardaddress?:string //"";
+	idcardstartdate?: number //1173801600;
-	idcardIssued?:string //"";
+	idcardenddate?: number //1804953600;
-	health?:number //1;
+	idcardaddress?: string //"";
-	maritalstatus?:number //2;
+	idcardIssued?: string //"";
-	internaltelephone?:string //"";
+	health?: number //1;
-	currentresidence?:string //"滕州市西岗镇柴里矿生活去10排8号";
+	maritalstatus?: number //2;
-	constellationing?:number //12;
+	internaltelephone?: string //"";
-	isdoubleworker?:number //2;
+	currentresidence?: string //"滕州市西岗镇柴里矿生活去10排8号";
-	isveterans?:number //2;
+	constellationing?: number //12;
-	veteransnumber?:string //"";
+	isdoubleworker?: number //2;
-	jobstartdate?:number //825609600;
+	isveterans?: number //2;
-	entrydate?:number //0;
+	natureofAccount?: number
-	probationperiod:number //0;
+	veteransnumber?: string //"";
-	planformaldate?:number //0;
+	jobstartdate?: number //825609600;
-	politicaloutlook?:number //1;
+	entrydate?: number //0;
-	nameusedbefore?:string //"";
+	probationperiod: number //0;
-	ruleid?:number //0;
+	planformaldate?: number //0;
-	iconphoto?:string //"";
+	politicaloutlook?: number //1;
-	responsibledepartment?:string //"";
+	nameusedbefore?: string //"";
-	responsibledepartmentjson?:string //"";
+	ruleid?: number //0;
-	companyname?:string //"山东荣信集团有限公司";
+	iconphoto?: string //"";
-	maindeparmentname?:string //"甲醇分厂";
+	responsibledepartment?: string //"";
-	sunmaindeparmentname?:string //"";
+	responsibledepartmentjson?: string //"";
-	workpostname?:string //"";
+	companyname?: string //"山东荣信集团有限公司";
-	positionname?:string //"副厂长";
+	maindeparmentname?: string //"甲醇分厂";
-	keystr?:string //"4929995352838144";
+	sunmaindeparmentname?: string //"";
-	teamname?:string //"";
+	workpostname?: string //"";
-	personincharge?:number // 2
+	positionname?: string //"副厂长";
+	keystr?: string //"4929995352838144";
+	teamname?: string //"";
+	personincharge?: number // 2
 }
 /**
  * 员工列表
  */
- export type archivesList = PageResult<archivesCont[]>
+export type archivesList = PageResult<archivesCont[]>
 /**
  * id
  */
 export interface contId {
-	id:string
+	id: string
 }
 /**
  * 人员与行政组织关系
  */
-export interface peopleAboutOrg{
+export interface peopleAboutOrg {
-	id?:number
+	id?: number
-	key?:number
+	key?: number
-	group?:number
+	group?: number
-	company?:number
+	company?: number
-	department?:number
+	department?: number
-	workshop?:number
+	workshop?: number
-	workshopsection?:number
+	workshopsection?: number
-	position?:number
+	position?: number
-	gradepositions?:number
+	gradepositions?: number
-	starttime?:number
+	starttime?: number
-	endtime?:number
+	endtime?: number
-	team?:number
+	team?: number
-	changetype?:number
+	changetype?: number
-	time?:number
+	time?: number
-	state?:number
+	state?: number
-	assigntype?:number
+	assigntype?: number
-	jobid?:number
+	jobid?: number
-	orgallname?:string
+	orgallname?: string
-	postname?:string
+	postname?: string
-	starttimeing?:string
+	starttimeing?: string
-	endtimeing?:string
+	endtimeing?: string
 }
 /**
  * 人员与行政组织关系列表
  */
- export type peopleAboutOrgList = PageResult<peopleAboutOrg[]>
+export type peopleAboutOrgList = PageResult<peopleAboutOrg[]>
 /**
  * 紧急联系人
  */
-export interface emergencyContact{
+export interface emergencyContact {
-    id:number
+	id: number
-    number?:string
+	number?: string
-    name?:string
+	name?: string
-    relationship?:string
+	relationship?: string
-    tel?:string
+	tel?: string
-    time?:number
+	time?: number
-    state?:number
+	state?: number
-    key?:number
+	key?: number
 }
 /**
  * 双职工
  */
-export interface shuangzhigong{
+export interface shuangzhigong {
-	id:number
+	id: number
-	number?:string
+	number?: string
-	name?:string
+	workcouple?: string
-	company?:string
+	name?: string
-	department?:string
+	company?: string
-	position?:string
+	department?: string
-	tel?:string
+	section?: string
-	time?:number
+	job?: string
-	state?:number
+	level?: string
-	key?:number
+	mobilephone?: number
+	position?: string
+	tel?: string
+	time?: number
+	state?: number
+	key?: number
 }
 /**
  * 家庭成员
  */
-export interface jiatingchengyuan{
+export interface jiatingchengyuan {
-    id:number
+	id: number
-    number?:string
+	number?: string
-    relationship?:string
+	relationship?: string
-    name?:string
+	name?: string
-    company?:string
+	company?: string
-    deparment?:string
+	deparment?: string
-    postnme?:string
+	postnme?: string
-    tel?:string
+	tel?: string
-    politicaloutlook?:number
+	politicaloutlook?: number
-    time?:number
+	time?: number
-    key?:number
+	key?: number
-    state?:number
+	state?: number
-    politicaloutlookcn?:string
+	politicaloutlookcn?: string
 }
 /**
  * 教育经历
  */
-export interface jiaoyujingli{
+export interface jiaoyujingli {
-    id:number
+	id: number
-    number?:string
+	number?: string
-    education?:number
+	education?: number
-    graduationschool?:string
+	graduationschool?: string
-    subject?:string
+	subject?: string
-    admissiontime?:number
+	admissiontime?: number
-    graduationtime?:number
+	graduationtime?: number
-    time?:number
+	time?: number
-    level?:number
+	level?: number
-    academicdegree?:number
+	academicdegree?: number
-    key?:number
+	key?: number
-    state?:number
+	state?: number
-    academicdegreecn?:string
+	academicdegreecn?: string
-    educationcn?:string
+	educationcn?: string
-    admissiontimestr?:string
+	admissiontimestr?: string
-    graduationtimestr?:string
+	graduationtimestr?: string
 }
 /**
  * 集团内部工作
  */
-export interface innerWorkCont{
+export interface innerWorkCont {
-  id:string
+	id: string
-  starttimg?:string
+	starttimg?: string
-  endtimg?:string
+	endtimg?: string
-  allorgname?:string
+	allorgname?: string
-  orgid?:number
+	orgid?: number
-  postid?:number
+	postid?: number
-  postname?:string
+	postname?: string
-  postnlevel?:number
+	postnlevel?: number
-  teamid?:number
+	teamid?: number
-  teamname?:string
+	teamname?: string
-  changetype?:number
+	changetype?: number
-  changetypename?:string
+	changetypename?: string
-  assigntype?:number
+	assigntype?: number
-  superiorpostname?:string
+	superiorpostname?: string
-  superiormanname?:null
+	superiormanname?: null
-  subordinatescount?:number
+	subordinatescount?: number
-  jobid?:number
+	jobid?: number
-  jobname?:string
+	jobname?: string
 }
 /**
  * 集团外部工作经历
  */
-export interface outsideWork{
+export interface outsideWork {
-    id:number
+	id: number
-    number:string
+	number: string
-    key:number
+	key: number
-    company:string
+	company: string
-    deparment:string
+	deparment: string
-    job:string
+	job: string
-    entrytime:number
+	entrytime: number
-    leavedate:number
+	leavedate: number
-    witness:string
+	witness: string
-    witnesstel:string
+	witnesstel: string
-    remarks:string
+	remarks: string
-    time:number
+	time: number
-    state:number
+	state: number
-    starttimg:string
+	starttimg: string
-    endtimg:string
+	endtimg: string
 }
 /**
  * 修改密码
  */
-export interface editPwdCont extends contId{
+export interface editPwdCont extends contId {
-	pwd:string
+	pwd: string
-	pwdes:string
+	pwdes: string
 }
 
 /**
  * 获取个人信息详情
  */
-export interface myinfostruct{
+export interface myinfostruct {
-    id?:number //78,
+	id?: number //78,
-    number?:string //"300450",
+	number?: string //"300450",
-    name?:string //"秦东",
+	name?: string //"秦东",
-    icon?:string //"https://wework.qpic.cn/wwhead/duc2TvpEgSTPk74IwG7BswsATgrfz6BGVPpX5QU5uvaCiaxk3ReIlRhdUwIeiaBBazzCLiaHI8VuA4/0",
+	icon?: string //"https://wework.qpic.cn/wwhead/duc2TvpEgSTPk74IwG7BswsATgrfz6BGVPpX5QU5uvaCiaxk3ReIlRhdUwIeiaBBazzCLiaHI8VuA4/0",
-    hireclass?:number //1,
+	hireclass?: number //1,
-    emptype?:number //8,
+	emptype?: number //8,
-    company?:number //309,
+	company?: number //309,
-    maindeparment?:number //102,
+	maindeparment?: number //102,
-    sunmaindeparment?:number //272,
+	sunmaindeparment?: number //272,
-    deparment?:string //"",
+	deparment?: string //"",
-    adminorg?:number //272,
+	adminorg?: number //272,
-    teamid?:number //1,
+	teamid?: number //1,
-    position?:number //2184,
+	position?: number //2184,
-    jobclass?:number //5,
+	jobclass?: number //5,
-    jobid?:number //36,
+	jobid?: number //36,
-    jobleve?:number //3,
+	jobleve?: number //3,
-    time?:number //1656984567,
+	time?: number //1656984567,
-    eitetime?:number //1671160648,
+	eitetime?: number //1671160648,
-    wechat?:string //"",
+	wechat?: string //"",
-    workwechat?:string //"KaiXinGuo",
+	workwechat?: string //"KaiXinGuo",
-    state?:number //1,
+	interests?: string
-    key?:number //15993815826844528,
+	state?: number //1,
-    isadmin?:number //4,
+	key?: number //15993815826844528,
-    password?:string //"ecffe8715d2d3c2743bab6abc90e1331",
+	isadmin?: number //4,
-    role?:string //"1",
+	password?: string //"ecffe8715d2d3c2743bab6abc90e1331",
-    idcardno?:string //"370921198810151515",
+	role?: string //"1",
-    passportno?:string //"",
+	idcardno?: string //"370921198810151515",
-    globalroaming?:string //"",
+	passportno?: string //"",
-    mobilephone?:string //"15069130853",
+	globalroaming?: string //"",
-    email?:string //"",
+	mobilephone?: string //"15069130853",
-    gender?:number //1,
+	email?: string //"",
-    birthday?:number //592848000,
+	gender?: number //1,
-    myfolk?:string //"汉族",
+	birthday?: number //592848000,
-    nativeplace?:string //"山东省宁阳县华丰镇白土厂村15号",
+	myfolk?: string //"汉族",
-    idcardstartdate?:number //0,
+	bloodtype?: string
-    idcardenddate?:number //0,
+	nativeplace?: string //"山东省宁阳县华丰镇白土厂村15号",
+	idcardstartdate?: number //0,
+	idcardenddate?: number //0,
 	idcardaddress?: string//"",
-    idcardIssued?:string //"",
+	idcardIssued?: string //"",
-    health?:number //2,
+	health?: number //2,
-    maritalstatus?:number //2,
+	maritalstatus?: number //2,
-    internaltelephone?:string //"",
+	internaltelephone?: string //"",
-    currentresidence?:string //"山东省宁阳县华丰镇矿区花园小区1号楼1单元302室",
+	currentresidence?: string //"山东省宁阳县华丰镇矿区花园小区1号楼1单元302室",
-    constellationing?:number //1,
+	constellationing?: number //1,
-    isdoubleworker?:number //2,
+	isdoubleworker?: number //2,
-    isveterans?:number //2,
+	isveterans?: number //2,
-    veteransnumber?:string //"",
+	natureofAccount?: number
-    jobstartdate?:number //0,
+	veteransnumber?: string //"",
-    entrydate?:number //0,
+	jobstartdate?: number //0,
-    probationperiod:number //0,
+	entrydate?: number //0,
-    planformaldate?:number //0,
+	probationperiod: number //0,
-    politicaloutlook?:number //1,
+	planformaldate?: number //0,
-    nameusedbefore?:string //"",
+	politicaloutlook?: number //1,
-    iconphoto?:string //"data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCAB4AGQDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiuK8afE3RfBhEM+65vCM+RERkfU9q8s1L9ojUpfMXTtLtoBkbTIS5Az+A9aAPoiivnSy/aJ1aIQrdaTbTgMfMcMVZhnjHYHHtXVJ+0LoTzqg0m9CFsFyy8DjnH50WA9horN0fX9L161W50y9huI2GfkbkfUda0qACiiigAooooAKKKKACvNfi94/n8IaRFaad5f268DDeSCYk6E4znPPB6cGvSq+N/G+pX3iXxxfzzyO7GYxxgrjYgOFAHYYoA5ue5utQuGklkeWRjyTyTWtp/g/Vb6MSCHYh6F+K6/QfDUNqql0DMeQxFd9Y28SxqCOg5riqYuztE76eDuryPJofhvrMr4xGBjPLVU1TwPrWmAu1uZYx1aPkV77FEkZGBjj0qd7VHjJOMnsalYqZTwsD578KeI77wrrkN/b8SRHlWHUHqK+uPDmvWviXQ7bVLQ/u5l5U9VYdRXhPj7wnFc6c19bRKlzB8x2jG9e4rq/gLqvm6Pf6UyyboHEoJOVw3B7cHj1NddKqqkbo46tJ03Y9gooorQyCiiigAooooARlDKVPQjBr5BuNOksfGd/ZlQGguJFYAYxhiK+v68I+IPh5NJ+Icmp7D9m1FFkzjgOMhh/I/jUVHaLNKSvNGfbXq+XFFDH5jg9DwK37N7yKbzJ7B44iP9YrBl/H0rmpNAu7jUVnspmjhOPuqCf1rq9Pt7rT7SQ3OpTz5J2q4TGMcDgfrXm8sbHqXka0d1HcQwsqEDndx6VKNQjuUEcNtI7DrjA/nVbQZPO0l4jgsSV3d6zIdH1a01PdFqckaDO5PKVt47cnkU4aikjWmiS8tpYnjIyCCrDmsr4K2Mtvq2vuMeRGwh6dWDHv8AQH8xW7bi5SLF08byAfeRSufwya3PAelHTdHupGUA3d5LOP8AdLYH6DP4104bRuxyYnZHU0UUV1nGFFFFABRRRQAV598WkB0GxkI+7dYz6ZU/4V6DXMfEGxS+8FagGdEaBPPRnIABXnGT6jI/Gk1dFRdpJnEaA6yW6bSOnftTPFp+xadCsQIeeUIZOy9//rfjWJ4Xvz5WD9a19V1xY0XzxhG+VQR1NeW0k7WPYTbsyx4VvbRdHbdMdyNhmxkA5xW+syysY5gN6n5Hx1FYGj6qsdoqi2mWIdcQnn3rZe7tryJfKcM6Y5HUZ7GrtbUmSd9S7MuWVVHLcV2kUawxJGgAVQAAK47SUa51GBOysGb8Oa7SurD7NnDinqkFFFFdByhRRRQAUVxHi74oaL4R1A6fNFcXV4FDPHCBhM9AxJ6kc8Zrz7Xvj1fywGLRNKjtXPWa4fzCPouAPzzVKDZLkke8V4n8cPHWmS6B/wAI3pt3Hc3M8qtcmF9yxopyFJHGS2OO2Oe1eXan4/8AFWs20i3mt3jRygrJGj7EI9Nq4GKwYrYSISRnNWqbuS6iOl8IeINsqRTPyDg5r0GWKDV5FBfKg5BU9DXjCWksM6ywN8wPavR/D8d9NBHcRo+GGC0RHOPVT3+lcOJw7i+Y9DC4hSXKeiafZFAsf2mQADocY/lU17tgdW+UMBjPqKyrCK8chSbgkdyuKzfG2pLpFglmj7tRvPlUA58tP4nJ+nT3rmUJTaijpnVUU5M1tE+Iul6VrFzFeRSNBsCrPGN2GzyMenTn2rvtK8a+HNaYJZavbNIeBE7bHJ/3WwT+FfNKjaKy5gY7n5eAen+Fe59VjCKSPB+tSnNtn2RRXyhpfi7X9ElX7Fql1HH2TeWX8VPBr0XQvjVdwsket2aXEXea3G1x7leh/Ss5UJLY0VaL3PaqKxdN8W6Dq1kl3a6pbeW3aSQIwPoQcGisrM05kfIs11dX80l1dzyTzync8srFmY+5PJpChwM0sC/IvsKsrGGBY/QV2qOhyOWpmonzTJjjINX7H/j3Q+oNQop+1Sj2FSQsLe2w5IKgnCjtmiKswbuiyAI8kDJNbHh3xNd6BeCSIGWFiBNAeVcf0Poa57z2kl8qNQMrnc57UtqUcEku/ue/07CiVpaCjeOqPoOPxT4e/sX+1fNxEB8y7TuVv7pA715JretSa7qz6i/yRE7YkIxtXt9TVDw/fxWupRSXFrHcWzHDQOThsMP16DPoTTL+2A1GZmVkyxGw9vQYrKlRUamhtWrOULMeD19KozkNNjsT+VKAUkZQxA9M8Uq88jrnqa7HqcaViAf6xoz+GakUlVKn8aimB87d6c1YADrkelSkU2S29w8MWwdM0VGvA60VauiXYu+FfD48QySILkQBV4YrnJOT0z6A1rzeCryGKIrPAyyIXG7K44Bx068iiivmcXmFejiXCL006eR6EKMJRuzOTwlfC5EjtAEc7PkYsQOTnp/+skVe1HwlCunyPDLIJo0LfvMFXwCSOBx90469KKKKWPrVEm2enh8DRlRnOS1V/wAFc4ooyQq+MvCSpHqP/wBVWUdTHmMDDDOR3oor30eEy1p8e61RyM7ZSD9Dx/hXUeIbXTLdNPFnNI92Yc3iuDhX9uOnX8AKKKqK99GcpPlaOXClpnPvToxgj0JxRRWxDGSICTz14ptucqVxlh70UVL3GtibyyaKKKsm5//Z",
+	nameusedbefore?: string //"",
-    responsibledepartment?:string //"",
+	iconphoto?: string //"data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCAB4AGQDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiuK8afE3RfBhEM+65vCM+RERkfU9q8s1L9ojUpfMXTtLtoBkbTIS5Az+A9aAPoiivnSy/aJ1aIQrdaTbTgMfMcMVZhnjHYHHtXVJ+0LoTzqg0m9CFsFyy8DjnH50WA9horN0fX9L161W50y9huI2GfkbkfUda0qACiiigAooooAKKKKACvNfi94/n8IaRFaad5f268DDeSCYk6E4znPPB6cGvSq+N/G+pX3iXxxfzzyO7GYxxgrjYgOFAHYYoA5ue5utQuGklkeWRjyTyTWtp/g/Vb6MSCHYh6F+K6/QfDUNqql0DMeQxFd9Y28SxqCOg5riqYuztE76eDuryPJofhvrMr4xGBjPLVU1TwPrWmAu1uZYx1aPkV77FEkZGBjj0qd7VHjJOMnsalYqZTwsD578KeI77wrrkN/b8SRHlWHUHqK+uPDmvWviXQ7bVLQ/u5l5U9VYdRXhPj7wnFc6c19bRKlzB8x2jG9e4rq/gLqvm6Pf6UyyboHEoJOVw3B7cHj1NddKqqkbo46tJ03Y9gooorQyCiiigAooooARlDKVPQjBr5BuNOksfGd/ZlQGguJFYAYxhiK+v68I+IPh5NJ+Icmp7D9m1FFkzjgOMhh/I/jUVHaLNKSvNGfbXq+XFFDH5jg9DwK37N7yKbzJ7B44iP9YrBl/H0rmpNAu7jUVnspmjhOPuqCf1rq9Pt7rT7SQ3OpTz5J2q4TGMcDgfrXm8sbHqXka0d1HcQwsqEDndx6VKNQjuUEcNtI7DrjA/nVbQZPO0l4jgsSV3d6zIdH1a01PdFqckaDO5PKVt47cnkU4aikjWmiS8tpYnjIyCCrDmsr4K2Mtvq2vuMeRGwh6dWDHv8AQH8xW7bi5SLF08byAfeRSufwya3PAelHTdHupGUA3d5LOP8AdLYH6DP4104bRuxyYnZHU0UUV1nGFFFFABRRRQAV598WkB0GxkI+7dYz6ZU/4V6DXMfEGxS+8FagGdEaBPPRnIABXnGT6jI/Gk1dFRdpJnEaA6yW6bSOnftTPFp+xadCsQIeeUIZOy9//rfjWJ4Xvz5WD9a19V1xY0XzxhG+VQR1NeW0k7WPYTbsyx4VvbRdHbdMdyNhmxkA5xW+syysY5gN6n5Hx1FYGj6qsdoqi2mWIdcQnn3rZe7tryJfKcM6Y5HUZ7GrtbUmSd9S7MuWVVHLcV2kUawxJGgAVQAAK47SUa51GBOysGb8Oa7SurD7NnDinqkFFFFdByhRRRQAUVxHi74oaL4R1A6fNFcXV4FDPHCBhM9AxJ6kc8Zrz7Xvj1fywGLRNKjtXPWa4fzCPouAPzzVKDZLkke8V4n8cPHWmS6B/wAI3pt3Hc3M8qtcmF9yxopyFJHGS2OO2Oe1eXan4/8AFWs20i3mt3jRygrJGj7EI9Nq4GKwYrYSISRnNWqbuS6iOl8IeINsqRTPyDg5r0GWKDV5FBfKg5BU9DXjCWksM6ywN8wPavR/D8d9NBHcRo+GGC0RHOPVT3+lcOJw7i+Y9DC4hSXKeiafZFAsf2mQADocY/lU17tgdW+UMBjPqKyrCK8chSbgkdyuKzfG2pLpFglmj7tRvPlUA58tP4nJ+nT3rmUJTaijpnVUU5M1tE+Iul6VrFzFeRSNBsCrPGN2GzyMenTn2rvtK8a+HNaYJZavbNIeBE7bHJ/3WwT+FfNKjaKy5gY7n5eAen+Fe59VjCKSPB+tSnNtn2RRXyhpfi7X9ElX7Fql1HH2TeWX8VPBr0XQvjVdwsket2aXEXea3G1x7leh/Ss5UJLY0VaL3PaqKxdN8W6Dq1kl3a6pbeW3aSQIwPoQcGisrM05kfIs11dX80l1dzyTzync8srFmY+5PJpChwM0sC/IvsKsrGGBY/QV2qOhyOWpmonzTJjjINX7H/j3Q+oNQop+1Sj2FSQsLe2w5IKgnCjtmiKswbuiyAI8kDJNbHh3xNd6BeCSIGWFiBNAeVcf0Poa57z2kl8qNQMrnc57UtqUcEku/ue/07CiVpaCjeOqPoOPxT4e/sX+1fNxEB8y7TuVv7pA715JretSa7qz6i/yRE7YkIxtXt9TVDw/fxWupRSXFrHcWzHDQOThsMP16DPoTTL+2A1GZmVkyxGw9vQYrKlRUamhtWrOULMeD19KozkNNjsT+VKAUkZQxA9M8Uq88jrnqa7HqcaViAf6xoz+GakUlVKn8aimB87d6c1YADrkelSkU2S29w8MWwdM0VGvA60VauiXYu+FfD48QySILkQBV4YrnJOT0z6A1rzeCryGKIrPAyyIXG7K44Bx068iiivmcXmFejiXCL006eR6EKMJRuzOTwlfC5EjtAEc7PkYsQOTnp/+skVe1HwlCunyPDLIJo0LfvMFXwCSOBx90469KKKKWPrVEm2enh8DRlRnOS1V/wAFc4ooyQq+MvCSpHqP/wBVWUdTHmMDDDOR3oor30eEy1p8e61RyM7ZSD9Dx/hXUeIbXTLdNPFnNI92Yc3iuDhX9uOnX8AKKKqK99GcpPlaOXClpnPvToxgj0JxRRWxDGSICTz14ptucqVxlh70UVL3GtibyyaKKKsm5//Z",
-    responsibledepartmentjson?:string //"",
+	responsibledepartment?: string //"",
-    birthdaytime?:string //"1988-10-15",
+	responsibledepartmentjson?: string //"",
-    idcardstarttimedata?:string //"",
+	birthdaytime?: string //"1988-10-15",
-    idcardendtimedata?:string //"",
+	idcardstarttimedata?: string //"",
-    entrydatetime:string //"",
+	idcardendtimedata?: string //"",
-    planformaldatetime?:string //"",
+	entrydatetime: string //"",
-    doubleworkerlist?:any //null,
+	planformaldatetime?: string //"",
-    educationalexperience?:any //null,
+	doubleworkerlist?: any //null,
-    emergencycontact?:any //null,
+	educationalexperience?: any //null,
-    memberoffamily?:any //null,
+	emergencycontact?: any //null,
-    workhistorylist?:any //null,
+	memberoffamily?: any //null,
-    groupworkhistorylist?:any //null,
+	workhistorylist?: any //null,
-    idstr?:string //"78",
+	groupworkhistorylist?: any //null,
-    companyname?:string //"山东恒信高科能源有限公司",
+	idstr?: string //"78",
-    maindeparmentname?:string //"企管部",
+	companyname?: string //"山东恒信高科能源有限公司",
-    adminorgname?:string //"",
+	maindeparmentname?: string //"企管部",
-    positionname?:string //"开发主管",
+	adminorgname?: string //"",
-    jobclassname?:string //"基层管理",
+	positionname?: string //"开发主管",
-    jobidname?:string //"主管",
+	jobclassname?: string //"基层管理",
-    politicaloutlookname?:string //"群众",
+	jobidname?: string //"主管",
-    jobstartdatestr?:string //"",
+	politicaloutlookname?: string //"群众",
-    entrydatestr?:string //"",
+	jobstartdatestr?: string //"",
-    personincharge?:number //2,
+	entrydatestr?: string //"",
-    sunmaindeparmentname?:string //"企管",
+	personincharge?: number //2,
-    workpostname?:string //"",
+	sunmaindeparmentname?: string //"企管",
-    teamname?:string //"长白班",
+	workpostname?: string //"",
-    allorglist?:number[][] //[309,102,272],
+	teamname?: string //"长白班",
-    ruleid?:string //"0",
+	allorglist?: number[][] //[309,102,272],
-    rulename?:string //"",
+	ruleid?: string //"0",
-    orgreslist?:any //null
+	rulename?: string //"",
-	keystr?:string //
+	orgreslist?: any //null
+	keystr?: string //
 }
 /**
  * 多重Id
  */
 export interface contIdes {
-	id:number;
+	id: number;
-	idstr:string;
+	idstr: string;
 }
 /**
  * 提交修改人员主副信息
  */
-export interface userManOrFucont{
+export interface userManOrFucont {
 	id?: string
 	name?: string
 	mobilephone?: string
@@ -353,35 +364,40 @@ export interface userManOrFucont{
 	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{
+export interface emergencyContactAdd extends contId {
-	list?:emergencyContactCont[]
+	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{
+export interface delJjlxr extends contId {
-	state:number;
+	state: number;
-	isdel:number;
+	isdel: number;
 }
 /**
  * 双职工
  */
-export interface doubleWorkCont extends contId{
+export interface doubleWorkCont extends contId {
-	name?:string
+	name?: string
-    company?:string
+	workcouple?: string
-    department?:string
+	company?: string
-    position?:string
+	department?: string
-    mobilephone?:string
+	section?: string
+	job?: string
+	level?: string
+	position?: string
+	time?: string
+	mobilephone?: string
 }
 /**
  * 家庭成员
  */
-export interface familyMembersCont{
+export interface familyMembersCont {
-	id?:string
+	id?: string
 	name?: string
 	relationship?: string
 	mobilephone?: string
 	company?: string
-	department?:string
+	department?: string
 	politicaloutlook?: number
 }
 /**
  * 添加家庭成员
  */
- export interface familyMembersContAdd extends contId{
+export interface familyMembersContAdd extends contId {
-	list?:familyMembersCont[]
+	list?: familyMembersCont[]
 }
 /**
  * 编辑家庭成员
  */
- export interface familyMembersContEdit extends familyMembersCont{
+export interface familyMembersContEdit extends familyMembersCont {
 	id?: string
- }
+}
 /**
  * 教育经历基础参数
  */
-export interface educExpInfo{
+export interface educExpInfo {
-	graduationschool?:string //"宁阳实验高中",
+	graduationschool?: string //"宁阳实验高中",
-	subject?:string //"理科",
+	subject?: string //"理科",
-	education?:number//3,
+	education?: number//3,
-	admissiontime?:string //"2005-09-09",
+	admissiontime?: string //"2005-09-09",
-	graduationtime?:string //"2008-06-06",
+	graduationtime?: string //"2008-06-06",
-	academicdegree?:string //"1",
+	academicdegree?: string //"1",
-    level?:string //"1"
+	level?: string //"1"
 }
 /**
  * 编辑教育经历
  */
- export interface editEducExpInfoing extends educExpInfo{
+export interface editEducExpInfoing extends educExpInfo {
-	id:string
+	id: string
- }
+}
 /**
  * 添加教育经历
  */
- export interface addEducExpInfoing extends contId{
+export interface addEducExpInfoing extends contId {
-	list?:educExpInfo[]
+	list?: educExpInfo[]
 }
 /**
  * 集团外部工作经历
  */
-export interface groupExternalWork{
+export interface groupExternalWork {
-	company?:string //"济南易搜集团",
+	company?: string //"济南易搜集团",
-	department?:string //"技术部",
+	department?: string //"技术部",
-	position?:string //"程序员",
+	position?: string //"程序员",
-	entrytime?:string //"2010-10-09",
+	entrytime?: string //"2010-10-09",
-	leavedate?:string //"2013-12-06",
+	leavedate?: string //"2013-12-06",
-	witness?:string //"石娟柯",
+	witness?: string //"石娟柯",
-	witnesstel?:string //"15069130853",
+	witnesstel?: string //"15069130853",
-	remarks?:string //"看看手机打开"
+	remarks?: string //"看看手机打开"
 }
 /**
  * 编辑外部工作经历
  */
- export interface editGroupExternalWorkCont extends groupExternalWork{
+export interface editGroupExternalWorkCont extends groupExternalWork {
-	id:string
+	id: string
- }
+}
 /**
  * 添加外部工作经历
  */
- export interface addGroupExternalWorkCont extends contId{
+export interface addGroupExternalWorkCont extends contId {
-	list?:groupExternalWork[]
+	list?: groupExternalWork[]
 }
 /**
  * 添加集团内部工作履历
  */
-export interface groupInnerWorkCont extends contId{
+export interface groupInnerWorkCont extends contId {
-	orgid?:string
+	orgid?: string
-    position?:string
+	position?: string
-    gradepositions?:number
+	gradepositions?: number
-    starttime?:string
+	starttime?: string
-    endtime?:string
+	endtime?: string
-    changetype?:number
+	changetype?: number
-    assigntype?:number
+	assigntype?: number
-    team?:string
+	team?: string
-	jobid?:string
+	jobid?: string
 }
 
 /**
  * 修改头像
  */
-export interface editUserIcon{
+export interface editUserIcon {
-	id:number;
+	id: number;
-	iconpath:string;
+	iconpath: string;
 }
 /**
  * 编辑人员行政组织关系
  */
-export interface editUserAboutOrg{
+export interface editUserAboutOrg {
-	id:string;
+	id: string;
-	orgid?:number;
+	orgid?: number;
-	position?:number;
+	position?: number;
-	teamid?:number;
+	teamid?: number;
-	jobid?:number;
+	jobid?: number;
-	jobleve?:number;
+	jobleve?: number;
-	ruleid?:string;
+	ruleid?: string;
-	personInCharge:any;
+	personInCharge: any;
-	orgreslist?:any;
+	orgreslist?: any;
-	resallorg?:any;
+	resallorg?: any;
 }
 /**
  * 排版类型
  */
-export interface teamClassQueay{
+export interface teamClassQueay {
-	name?:""
+	name?: ""
 }
-export interface teamRule{
+export interface teamRule {
-	id:string;
+	id: string;
-	sort:number;
+	sort: number;
-	teamid:string;
+	teamid: string;
 }
-export interface teamList{
+export interface teamList {
-	id:string;
+	id: string;
-	title:string;
+	title: string;
-	startTime:string;
+	startTime: string;
-	endTime:string;
+	endTime: string;
 }
 /**
  * 排班类型模板
  */
-export interface teamClassCont{
+export interface teamClassCont {
-	id:string;
+	id: string;
-	state?:number;
+	state?: number;
-	states:boolean;
+	states: boolean;
-	rulename:string;
+	rulename: string;
-	name:string;
+	name: string;
-	rule:teamRule[];
+	rule: teamRule[];
-	list:teamList[];
+	list: teamList[];
 }
 /**
  * 搜索成员条件
  */
- export interface searchPeoleCont extends PageQuery{
+export interface searchPeoleCont extends PageQuery {
-	name?:number|string;		//关键字	
+	name?: number | string;		//关键字	
 }
 /**
  * 搜索成员结果
  */
-export interface queryPeopleCont{
+export interface queryPeopleCont {
-	id:string // "15993815826844528",
+	id: string // "15993815826844528",
-	employeeName:string // "秦东",
+	employeeName: string // "秦东",
-	isLeave:string // "0",
+	isLeave: string // "0",
-	open:boolean // "false",
+	open: boolean // "false",
-	icon:string // "https://wework.qpic.cn/wwhead/duc2TvpEgSTPk74IwG7BswsATgrfz6BGVPpX5QU5uvaCiaxk3ReIlRhdUwIeiaBBazzCLiaHI8VuA4/0",
+	icon: string // "https://wework.qpic.cn/wwhead/duc2TvpEgSTPk74IwG7BswsATgrfz6BGVPpX5QU5uvaCiaxk3ReIlRhdUwIeiaBBazzCLiaHI8VuA4/0",
-	iconToBase64:string // 
+	iconToBase64: string // 
-	wechat:string // "KaiXinGuo",
+	wechat: string // "KaiXinGuo",
-	departmentid:number // 102,
+	departmentid: number // 102,
-	departmentname:string // "企管部",
+	departmentname: string // "企管部",
-	postid:number // 794,
+	postid: number // 794,
-	postname:string // "主管",
+	postname: string // "主管",
-	tema:number // 1,
+	tema: number // 1,
-	temaname:string // "长白班"
+	temaname: string // "长白班"
+}
+
+/**
+ * 奖惩记录
+ */
+export interface RewardsAndPunishments {
+	id?: string
+	level?: string
+	type?: string
+	content?: string
+	time?: string
+	department?: string
+	politicaloutlook?: number
 }

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']

src/views/hr/archives/archivescont.vue

@@ -9,6 +9,7 @@
  */
 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'
@@ -16,6 +17,8 @@ import FamilyMembers from '@/views/hr/archives/basicinformation/familymembers.vu
 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:{
+	isShow: {
-		type:Boolean,
+		type: Boolean,
-		default:false
+		default: false
 	},
-	archivesdata:{
+	archivesdata: {
-		type:Object,
+		type: Object,
-		default(){
+		default() {
 			return {}
 		}
 	}
 });
-const emits = defineEmits(["update:isShow","updatemyconting","getarchivespageclick"]);		//操作父级数据
+const emits = defineEmits(["update:isShow", "updatemyconting", "getarchivespageclick"]);		//操作父级数据
 const boxTitle = ref<string>();			//弹出框标题
 const userIcon = ref<string>();			//人员内容
 const activeName = ref("1")
 const editMyCont = ref(false);
 // const userConting = ref<myinfostruct>();
-const userConting = reactive<myinfostruct>({entrydatetime:"",probationperiod:1});
+const userConting = reactive<myinfostruct>({ 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,10 +66,10 @@ const editMyOrgCont = ref(false);
 /**
  * 获取人员数据
  */
- function getjtcyList(){
+function getjtcyList() {
 	rowLoading.value = true;
-	getMyInfoing({id:props.archivesdata.id,idstr:props.archivesdata.idstr})
+	getMyInfoing({ id: props.archivesdata.id, idstr: props.archivesdata.idstr })
-		.then(( data )=>{
+		.then((data) => {
 			// userConting.value = data.data
 			userConting.id = data.data.id
 			userConting.number = data.data.number //"300450",
@@ -88,6 +91,7 @@ const editMyOrgCont = ref(false);
 			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,
@@ -101,6 +105,7 @@ const editMyOrgCont = ref(false);
 			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,
@@ -113,6 +118,7 @@ const editMyOrgCont = ref(false);
 			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,
@@ -154,36 +160,36 @@ const editMyOrgCont = ref(false);
 			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 +")" +"  详情";
+		boxTitle.value = "查看  " + props.archivesdata.name + "(工号：" + props.archivesdata.number + ")" + "  详情";
-		if(props.archivesdata.icon != ""){
+		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{
+		} else {
-			userIcon.value =UserRole
+			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})
+	editMyInfoIcon({ id: props.archivesdata.id, iconpath: response.data.url })
-		.then(( data )=>{
+		.then((data) => {
 			// userConting.value = data.data
 			ElMessage.success("编辑成功");
 			emits("getarchivespageclick");
@@ -300,25 +306,21 @@ const handleAvatarSuccess: UploadProps['onSuccess'] = (response,uploadFile,uploa
 const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
 	// console.log("上传前判断------>",rawFile)
 }
-function editmvorg(){
+function editmvorg() {
 	editMyOrgCont.value = true;
 }
 </script>
 <template>
-	<el-dialog v-model="boxShow" custom-class="dialog_box" :title="boxTitle" top="50px" :before-close="closeArchivesBox" width="80%">
+	<el-dialog v-model="boxShow" custom-class="dialog_box" :title="boxTitle" top="50px" :before-close="closeArchivesBox"
+		width="80%">
 
-		<el-row v-loading="rowLoading" :gutter="20" >
+		<el-row v-loading="rowLoading" :gutter="20">
 			<el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
 				<el-card shadow="always" class="box-card-left">
 					<el-row>
 						<el-col :span="24">
-							<el-upload
+							<el-upload class="avatar-uploader" :action="imgUploadApiUrl" :show-file-list="false"
-								class="avatar-uploader"
+								:on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
-								:action="imgUploadApiUrl"
-								:show-file-list="false"
-								:on-success="handleAvatarSuccess"
-								:before-upload="beforeAvatarUpload"
-							>	
 								<el-avatar :size="180" :src="userIcon" />
 
 							</el-upload>
@@ -333,16 +335,16 @@ function editmvorg(){
 								<el-col :span="24" class="col_box">
 									<el-text class="cont_size">
 										<svg-icon icon-class="gender" class="svg_box"></svg-icon>
-										<span v-if="userConting.gender==1">男</span>
+										<span v-if="userConting.gender == 1">男</span>
 										<span v-else>女</span>
 									</el-text>
 								</el-col>
 								<el-col :span="24" class="col_box">
 									<el-text class="cont_size">
 										<svg-icon icon-class="marriageregistration" class="svg_box"></svg-icon>
-										<span v-if="userConting.maritalstatus==2">已婚</span>
+										<span v-if="userConting.maritalstatus == 2">已婚</span>
-										<span v-else-if="userConting.maritalstatus==3">丧偶</span>
+										<span v-else-if="userConting.maritalstatus == 3">丧偶</span>
-										<span v-else-if="userConting.maritalstatus==4">离异</span>
+										<span v-else-if="userConting.maritalstatus == 4">离异</span>
 										<span v-else>未婚</span>
 									</el-text>
 								</el-col>
@@ -355,10 +357,10 @@ function editmvorg(){
 								<el-col :span="24" class="col_box">
 									<el-text class="cont_size">
 										<svg-icon icon-class="healthcondition" class="svg_box"></svg-icon>
-										<span v-if="userConting.health==2">良好</span>
+										<span v-if="userConting.health == 2">良好</span>
-										<span v-else-if="userConting.health==3">较弱</span>
+										<span v-else-if="userConting.health == 3">较弱</span>
-										<span v-else-if="userConting.health==4">有生理缺陷</span>
+										<span v-else-if="userConting.health == 4">有生理缺陷</span>
-										<span v-else-if="userConting.health==5">残废</span>
+										<span v-else-if="userConting.health == 5">残废</span>
 										<span v-else>一般</span>
 									</el-text>
 								</el-col>
@@ -405,10 +407,14 @@ function editmvorg(){
 
 					<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClickUser">
 						<el-tab-pane label="基本信息" name="1">
-							<UserContent v-if="!editMyCont&&activeName=='1'" v-model:editShow="editMyCont" :usercont="userConting" :tabsid="activeName" />
+							<UserContent v-if="!editMyCont && activeName == '1'" v-model:editShow="editMyCont"
-							<EditUserContent v-if="editMyCont" v-model:editShow="editMyCont" :usercont="userConting" :tabsid="activeName" @refreshcontdata="refreshContPage" />
+								:usercont="userConting" :tabsid="activeName" />
+							<EditUserContent v-if="editMyCont" v-model:editShow="editMyCont" :usercont="userConting"
+								:tabsid="activeName" @refreshcontdata="refreshContPage" />
+						</el-tab-pane>
+						<el-tab-pane label="彩色性格" name="2">
+							<CharacterColor :usercont="userConting" :tabsid="activeName" />
 						</el-tab-pane>
-						<el-tab-pane label="彩色性格" name="2">彩色性格</el-tab-pane>
 						<el-tab-pane label="行政组织关系" name="3">
 							<OrgNexus :usercont="userConting" :tabsid="activeName" />
 						</el-tab-pane>
@@ -430,8 +436,12 @@ function editmvorg(){
 						<el-tab-pane label="集团外部工作履历" name="9">
 							<OutsideWork :usercont="userConting" :tabsid="activeName" />
 						</el-tab-pane>
-						<el-tab-pane label="奖惩记录" name="10">奖惩记录</el-tab-pane>
+						<el-tab-pane label="奖惩记录" name="10">
-						<el-tab-pane label="考评记录" name="11">考评记录</el-tab-pane>
+							<Rewardsandpunishments :usercont="userConting" :tabsid="activeName" />
+						</el-tab-pane>
+						<el-tab-pane label="考评记录" name="11">
+							<Appraisalrecord :usercont="userConting" :tabsid="activeName" />
+						</el-tab-pane>
 						<el-tab-pane label="修改登陆密码" name="12">
 							<Editpwd :usercont="userConting" :tabsid="activeName" />
 						</el-tab-pane>
@@ -440,33 +450,41 @@ function editmvorg(){
 				</el-card>
 			</el-col>
 		</el-row>
-		<EditOrg v-model:editShow="editMyOrgCont"  :usercont="userConting" :tabsid="activeName" @refreshcontdata="refreshContPage" />
+		<EditOrg v-model:editShow="editMyOrgCont" :usercont="userConting" :tabsid="activeName"
+			@refreshcontdata="refreshContPage" />
 	</el-dialog>
 </template>
 <style  lang='scss' scoped>
-.bjg{
+.bjg {
 	background-color: aqua;
 	height: 50px;
 }
-.box-card-left{
+
+.box-card-left {
 	text-align: center;
-	.username{
+
+	.username {
 		margin-top: 20px;
 		font-size: 35px;
 	}
-	.usernumber{
+
+	.usernumber {
 		margin-top: 10px;
 		font-size: 25px;
 	}
-	.user_cont{
+
+	.user_cont {
 		width: 90%;
 		margin: auto;
 		text-align: left;
-		.col_box{
+
+		.col_box {
 			margin-top: 10px;
-			.cont_size{
+
+			.cont_size {
 				font-size: 16px;
-				.svg_box{
+
+				.svg_box {
 					margin-right: 10px;
 				}
 			}

src/views/hr/archives/basicinformation/appraisalrecord.vue

@@ -0,0 +1,3 @@
+<script lang='ts' setup></script>
+<template></template>
+<style></style>

src/views/hr/archives/basicinformation/appraisalrecordadd.vue

@@ -0,0 +1,3 @@
+<script lang='ts' setup></script>
+<template></template>
+<style></style>

src/views/hr/archives/basicinformation/appraisalrecordedit.vue

@@ -0,0 +1,3 @@
+<script lang='ts' setup></script>
+<template></template>
+<style></style>

src/views/hr/archives/basicinformation/charactercolor.vue

@@ -0,0 +1,68 @@
+<!--
+@ 作者: 袁纪菲
+@ 时间: 2024-2-28
+@ 备注: 色彩性格
+-->
+<script lang='ts' setup>
+import * as echarts from 'echarts';
+
+
+onMounted(() => {
+    const dom = document.getElementById('myChart');
+    const myChart = echarts.init(dom); // 初始化echarts实例
+    window.addEventListener('resize', () => {
+        myChart.resize();    // 大小自适应
+    });
+    const option = {
+        title: {
+            text: '性格色彩特质'
+        },
+        tooltip: {
+            trigger: 'axis'
+        },
+        legend: {
+            left: 'center',
+            data: [
+                'A Phone',
+                'Another Phone',
+                'Precipitation',
+                'Evaporation'
+            ]
+        },
+        radar: [
+            {
+                indicator: [
+                    { text: '红色', max: 100 },
+                    { text: '蓝色', max: 100 },
+                    { text: '黄色', max: 100 },
+                    { text: '绿色', max: 100 }
+                ],
+                center: ['25%', '40%'],
+                radius: 100
+            },
+        ],
+        series: [
+            {
+                type: 'radar',
+                tooltip: {
+                    trigger: 'item'
+                },
+                areaStyle: {},
+                data: [
+                    {
+                        value: [60, 73, 85, 40],
+                        name: '性格色彩'
+                    }
+                ]
+            },
+        ]
+    };
+    // 设置实例参数
+    myChart.setOption(option);
+});
+
+</script>
+<template>
+    <div ref="myChart" id="myChart" :style="{ width: '800px', height: '400px' }"></div>
+</template>
+<style></style>

src/views/hr/archives/basicinformation/content.vue

@@ -6,22 +6,22 @@
 <script lang='ts' setup>
 import SvgIcon from '@/components/SvgIcon/index.vue';
 const props = defineProps({
-	tabsid:{
+	tabsid: {
-		type:String,
+		type: String,
-		default:"1"
+		default: "1"
 	},
-	editShow:{
+	editShow: {
-		type:Boolean,
+		type: Boolean,
-		default:false
+		default: false
 	},
-	usercont:{
+	usercont: {
-		type:Object,
+		type: Object,
-		default(){
+		default() {
 			return {}
 		}
 	}
 });
-const emitsed = defineEmits(["update:editShow","updatemyconting"]);		//操作父级数据
+const emitsed = defineEmits(["update:editShow", "updatemyconting"]);		//操作父级数据
 /**
  * 编辑控制
  */
@@ -34,19 +34,13 @@ const boxShow = computed({
 /**
  * 编辑信息
  */
-function editCont(){
+function editCont() {
 	emitsed("update:editShow", true);
 }
 
 </script>
 <template>
-	<el-descriptions
+	<el-descriptions class="margin-top" direction="vertical" :column="4" border :width="80">
-		class="margin-top"
-		direction="vertical"
-		:column="4"
-		border
-		:width="80"
-	>
 		<template #extra>
 			<el-button type="primary" link size="small" @click="editCont"><i-ep-edit />编辑</el-button>
 		</template>
@@ -67,46 +61,46 @@ function editCont(){
 			<template #label>
 				<el-text><svg-icon icon-class="gender" class="svg_box"></svg-icon> 性别</el-text>
 			</template>
-			<span v-if="props.usercont.gender==3">中性</span>
+			<span v-if="props.usercont.gender == 3">中性</span>
-			<span v-if="props.usercont.gender==2">女</span>
+			<span v-if="props.usercont.gender == 2">女</span>
 			<span v-else>男</span>&nbsp;
 		</el-descriptions-item>
 		<el-descriptions-item>
 			<template #label>
 				<el-text><svg-icon icon-class="healthcondition" class="svg_box"></svg-icon> 健康状况</el-text>
 			</template>
-			<span v-if="props.usercont.health==1">良好</span>
+			<span v-if="props.usercont.health == 1">良好</span>
-			<span v-else-if="props.usercont.health==2">一般</span>
+			<span v-else-if="props.usercont.health == 2">一般</span>
-			<span v-else-if="props.usercont.health==3">较弱</span>
+			<span v-else-if="props.usercont.health == 3">较弱</span>
-			<span v-else-if="props.usercont.health==4">有生理缺陷</span>
+			<span v-else-if="props.usercont.health == 4">有生理缺陷</span>
-			<span v-else-if="props.usercont.health==5">残废</span>
+			<span v-else-if="props.usercont.health == 5">残废</span>
 			<span v-else>良好</span>&nbsp;
 		</el-descriptions-item>
 		<el-descriptions-item>
 			<template #label>
 				<el-text><svg-icon icon-class="marriageregistration" class="svg_box"></svg-icon> 婚姻状况</el-text>
 			</template>
-			<span v-if="props.usercont.maritalstatus==2">已婚</span>
+			<span v-if="props.usercont.maritalstatus == 2">已婚</span>
-			<span v-else-if="props.usercont.maritalstatus==3">丧偶</span>
+			<span v-else-if="props.usercont.maritalstatus == 3">丧偶</span>
-			<span v-else-if="props.usercont.maritalstatus==4">离异</span>
+			<span v-else-if="props.usercont.maritalstatus == 4">离异</span>
 			<span v-else>未婚</span>&nbsp;
 		</el-descriptions-item>
 		<el-descriptions-item>
 			<template #label>
 				<el-text><svg-icon icon-class="zhengzhi" class="svg_box"></svg-icon> 政治面貌</el-text>
 			</template>
-			<span v-if="props.usercont.politicaloutlook==2">无党派</span>
+			<span v-if="props.usercont.politicaloutlook == 2">无党派</span>
-			<span v-else-if="props.usercont.politicaloutlook==3">台盟会员</span>
+			<span v-else-if="props.usercont.politicaloutlook == 3">台盟会员</span>
-			<span v-else-if="props.usercont.politicaloutlook==4">九三社员</span>
+			<span v-else-if="props.usercont.politicaloutlook == 4">九三社员</span>
-			<span v-else-if="props.usercont.politicaloutlook==5">致公党员</span>
+			<span v-else-if="props.usercont.politicaloutlook == 5">致公党员</span>
-			<span v-else-if="props.usercont.politicaloutlook==6">农工党员</span>
+			<span v-else-if="props.usercont.politicaloutlook == 6">农工党员</span>
-			<span v-else-if="props.usercont.politicaloutlook==7">民进会员</span>
+			<span v-else-if="props.usercont.politicaloutlook == 7">民进会员</span>
-			<span v-else-if="props.usercont.politicaloutlook==8">民建会员</span>
+			<span v-else-if="props.usercont.politicaloutlook == 8">民建会员</span>
-			<span v-else-if="props.usercont.politicaloutlook==9">民盟盟员</span>
+			<span v-else-if="props.usercont.politicaloutlook == 9">民盟盟员</span>
-			<span v-else-if="props.usercont.politicaloutlook==10">民革会员</span>
+			<span v-else-if="props.usercont.politicaloutlook == 10">民革会员</span>
-			<span v-else-if="props.usercont.politicaloutlook==11">共青团员</span>
+			<span v-else-if="props.usercont.politicaloutlook == 11">共青团员</span>
-			<span v-else-if="props.usercont.politicaloutlook==12">预备党员</span>
+			<span v-else-if="props.usercont.politicaloutlook == 12">预备党员</span>
-			<span v-else-if="props.usercont.politicaloutlook==13">中共党员</span>
+			<span v-else-if="props.usercont.politicaloutlook == 13">中共党员</span>
 			<span v-else>群众</span>&nbsp;
 		</el-descriptions-item>
 		<el-descriptions-item>
@@ -169,7 +163,17 @@ function editCont(){
 			</template>
 			{{ props.usercont.internaltelephone }}&nbsp;
 		</el-descriptions-item>
-		<el-descriptions-item :span="2">
+
+		<el-descriptions-item>
+			<template #label>
+				<el-text><el-icon>
+						<Notification />
+					</el-icon> 血型</el-text>
+			</template>
+			{{ props.usercont.bloodtype }}&nbsp;
+		</el-descriptions-item>
+
+		<el-descriptions-item>
 			<template #label>
 				<el-text><svg-icon icon-class="0213-lmp" class="svg_box"></svg-icon> 籍贯</el-text>
 			</template>
@@ -185,43 +189,43 @@ function editCont(){
 			<template #label>
 				<el-text><svg-icon icon-class="xingzuo" class="svg_box"></svg-icon> 星座</el-text>
 			</template>
-			<span v-if="props.usercont.constellationing==2">金牛座</span>
+			<span v-if="props.usercont.constellationing == 2">金牛座</span>
-			<span v-else-if="props.usercont.constellationing==3">双子座</span>
+			<span v-else-if="props.usercont.constellationing == 3">双子座</span>
-			<span v-else-if="props.usercont.constellationing==4">巨蟹座</span>
+			<span v-else-if="props.usercont.constellationing == 4">巨蟹座</span>
-			<span v-else-if="props.usercont.constellationing==5">狮子座</span>
+			<span v-else-if="props.usercont.constellationing == 5">狮子座</span>
-			<span v-else-if="props.usercont.constellationing==6">处女座</span>
+			<span v-else-if="props.usercont.constellationing == 6">处女座</span>
-			<span v-else-if="props.usercont.constellationing==7">天枰座</span>
+			<span v-else-if="props.usercont.constellationing == 7">天枰座</span>
-			<span v-else-if="props.usercont.constellationing==8">天蝎座</span>
+			<span v-else-if="props.usercont.constellationing == 8">天蝎座</span>
-			<span v-else-if="props.usercont.constellationing==9">射手座</span>
+			<span v-else-if="props.usercont.constellationing == 9">射手座</span>
-			<span v-else-if="props.usercont.constellationing==10">摩羯座</span>
+			<span v-else-if="props.usercont.constellationing == 10">摩羯座</span>
-			<span v-else-if="props.usercont.constellationing==11">水瓶座</span>
+			<span v-else-if="props.usercont.constellationing == 11">水瓶座</span>
-			<span v-else-if="props.usercont.constellationing==12">双鱼座</span>
+			<span v-else-if="props.usercont.constellationing == 12">双鱼座</span>
 			<span v-else>白羊座</span>&nbsp;
 		</el-descriptions-item>
 		<el-descriptions-item>
 			<template #label>
 				<el-text><svg-icon icon-class="guyong" class="svg_box"></svg-icon> 雇佣类型</el-text>
 			</template>
-			<span v-if="props.usercont.hireclass==2">再入职</span>
+			<span v-if="props.usercont.hireclass == 2">再入职</span>
 			<span v-else>雇佣入职</span>&nbsp;
 		</el-descriptions-item>
 		<el-descriptions-item>
 			<template #label>
 				<el-text><svg-icon icon-class="jianzhi" class="svg_box"></svg-icon> 用工关系</el-text>
 			</template>
-			<span v-if="props.usercont.emptype==2">编外人员</span>
+			<span v-if="props.usercont.emptype == 2">编外人员</span>
-			<span v-else-if="props.usercont.emptype==3">实习&实习生</span>
+			<span v-else-if="props.usercont.emptype == 3">实习&实习生</span>
-			<span v-else-if="props.usercont.emptype==4">试用员工</span>
+			<span v-else-if="props.usercont.emptype == 4">试用员工</span>
-			<span v-else-if="props.usercont.emptype==5">待分配</span>
+			<span v-else-if="props.usercont.emptype == 5">待分配</span>
-			<span v-else-if="props.usercont.emptype==6">待岗</span>
+			<span v-else-if="props.usercont.emptype == 6">待岗</span>
-			<span v-else-if="props.usercont.emptype==7">临时调入</span>
+			<span v-else-if="props.usercont.emptype == 7">临时调入</span>
-			<span v-else-if="props.usercont.emptype==8">正式员工</span>
+			<span v-else-if="props.usercont.emptype == 8">正式员工</span>
-			<span v-else-if="props.usercont.emptype==9">长期病假</span>
+			<span v-else-if="props.usercont.emptype == 9">长期病假</span>
-			<span v-else-if="props.usercont.emptype==10">停薪留职</span>
+			<span v-else-if="props.usercont.emptype == 10">停薪留职</span>
-			<span v-else-if="props.usercont.emptype==11">退休</span>
+			<span v-else-if="props.usercont.emptype == 11">退休</span>
-			<span v-else-if="props.usercont.emptype==12">辞职</span>
+			<span v-else-if="props.usercont.emptype == 12">辞职</span>
-			<span v-else-if="props.usercont.emptype==13">辞退</span>
+			<span v-else-if="props.usercont.emptype == 13">辞退</span>
-			<span v-else-if="props.usercont.emptype==14">离职</span>
+			<span v-else-if="props.usercont.emptype == 14">离职</span>
 			<span v-else>临时工</span>&nbsp;
 		</el-descriptions-item>
 		<el-descriptions-item>
@@ -252,7 +256,7 @@ function editCont(){
 			<template #label>
 				<el-text><svg-icon icon-class="tyjr" class="svg_box"></svg-icon> 是否为退役军人</el-text>
 			</template>
-			<span v-if="props.usercont.isveterans==2">否</span>
+			<span v-if="props.usercont.isveterans == 2">否</span>
 			<span v-else>是</span>&nbsp;
 		</el-descriptions-item>
 		<el-descriptions-item>
@@ -274,6 +278,16 @@ function editCont(){
 			{{ props.usercont.globalroaming }}&nbsp;
 		</el-descriptions-item>
 
+		<el-descriptions-item>
+			<template #label>
+				<el-text><el-icon>
+						<HomeFilled />
+					</el-icon> 户口类型</el-text>
+			</template>
+			<span v-if="props.usercont.natureofAccount == 2">农业户口</span>
+			<span v-else>非农业户口</span>&nbsp;
+		</el-descriptions-item>
+
 		<el-descriptions-item>
 			<template #label>
 				<el-text><svg-icon icon-class="wechat" class="svg_box"></svg-icon> 绑定微信</el-text>
@@ -287,11 +301,19 @@ function editCont(){
 			{{ props.usercont.workwechat }}&nbsp;
 		</el-descriptions-item>
 
+		<el-descriptions-item>
+			<template #label>
+				<el-text><el-icon>
+						<Star />
+					</el-icon> 兴趣爱好</el-text>
+			</template>
+			{{ props.usercont.interests }}&nbsp;
+		</el-descriptions-item>
+
+
 		<el-descriptions-item :span="2">
 			&nbsp;
 		</el-descriptions-item>
 	</el-descriptions>
 </template>
-<style  lang='scss' scoped>
+<style  lang='scss' scoped></style>
-
-</style>

src/views/hr/archives/basicinformation/editcontent.vue

@@ -4,33 +4,33 @@
 @ 备注: 编辑员工信息
 -->
 <script lang='ts' setup>
-import { myinfostruct,userManOrFucont } from '@/api/hr/people/type'
+import { myinfostruct, userManOrFucont } from '@/api/hr/people/type'
 import { editMyInfoing } from '@/api/hr/people/index'
 // import { calculateDatesMonth } from '@/api/publicapi'
 import { haveDateTime } from '@/api/handle'
-import { userGender,healthStates,userMaritalstatus,userPoliticaloutloo,userConstellationing,userHireclass,emptypeOptionsAll,yesOrno } from '@/api/hr/people/datacont'
+import { userGender, healthStates, userMaritalstatus, userPoliticaloutloo, userConstellationing, userHireclass, emptypeOptionsAll, Householdregistration, yesOrno } from '@/api/hr/people/datacont'
 
 const props = defineProps({
-	editShow:{
+	editShow: {
-		type:Boolean,
+		type: Boolean,
-		default:false
+		default: false
 	},
-	usercont:{
+	usercont: {
-		type:Object,
+		type: Object,
-		default(){
+		default() {
 			return {}
 		}
 	}
 });
-const emits = defineEmits(["update:editShow","refreshcontdata"]);		//操作父级数据
+const emits = defineEmits(["update:editShow", "refreshcontdata"]);		//操作父级数据
-const myContData = reactive<myinfostruct>({entrydatetime:"",probationperiod:1})
+const myContData = reactive<myinfostruct>({ entrydatetime: "", probationperiod: 1 })
 const editPostFormRef = ref(ElForm);	//编辑表单
 const editLoading = ref(false)
 const submitEditCont = reactive<userManOrFucont>({})
 /**
  * 表单验证规则
  */
- const editMycontRules = reactive({
+const editMycontRules = reactive({
 	name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
 	gender: [{ required: true, message: "请选择性别", trigger: "blur" }],
 	health: [{ required: true, message: "请选择健康状况", trigger: "blur" }],
@@ -56,7 +56,7 @@ const boxShow = computed({
 /**
  * 提交
  */
-function submitEditMyCont(){
+function submitEditMyCont() {
 	// console.log("提交数据--myContData-->",myContData)
 	editLoading.value = true;
 	editPostFormRef.value.validate((isValid: boolean) => {
@@ -80,33 +80,36 @@ function submitEditMyCont(){
 			submitEditCont.idcardaddress = myContData.idcardaddress
 			submitEditCont.idcardIssued = myContData.idcardIssued
 			submitEditCont.currentresidence = myContData.currentresidence
+			submitEditCont.bloodtype = myContData.bloodtype
 			submitEditCont.nativeplace = myContData.nativeplace
 			submitEditCont.email = myContData.email
 			submitEditCont.internaltelephone = myContData.internaltelephone
 			submitEditCont.hireclass = myContData.hireclass
 			submitEditCont.emptype = myContData.emptype
 			submitEditCont.isveterans = myContData.isveterans
+			submitEditCont.natureofAccount = myContData.natureofAccount
 			submitEditCont.veteransnumber = myContData.veteransnumber
 			submitEditCont.passportno = myContData.passportno
 			submitEditCont.globalroaming = myContData.globalroaming
 			submitEditCont.wechat = myContData.wechat
 			submitEditCont.workwechat = myContData.workwechat
+			submitEditCont.interests = myContData.interests
 			submitEditCont.constellationing = myContData.constellationing
 			submitEditCont.maritalstatus = myContData.maritalstatus
 			editMyInfoing(submitEditCont)
-				.then(() =>{
+				.then(() => {
 					ElMessage.success("编辑成功");
 					emits("refreshcontdata", myContData);
 					emits("update:editShow", false);
 				})
-				.finally(() =>{editLoading.value = false;})
+				.finally(() => { editLoading.value = false; })
 		}
 	});
 }
 /**
  * 取消修改
  */
-function handleCloseMyCont(){
+function handleCloseMyCont() {
 	emits("update:editShow", false);
 }
 //加载数据
@@ -131,6 +134,7 @@ onMounted(() => {
 	myContData.eitetime = props.usercont.eitetime      //1671160648,
 	myContData.wechat = props.usercont.wechat      //"",
 	myContData.workwechat = props.usercont.workwechat      //"KaiXinGuo",
+	myContData.interests = props.usercont.interests
 	myContData.state = props.usercont.state      //1,
 	myContData.key = props.usercont.key      //15993815826844528,
 	myContData.isadmin = props.usercont.isadmin      //4,
@@ -144,6 +148,7 @@ onMounted(() => {
 	myContData.gender = props.usercont.gender      //1,
 	myContData.birthday = props.usercont.birthday      //592848000,
 	myContData.myfolk = props.usercont.myfolk      //"汉族",
+	myContData.bloodtype = props.usercont.bloodtype
 	myContData.nativeplace = props.usercont.nativeplace      //"山东省宁阳县华丰镇白土厂村15号",
 	myContData.idcardstartdate = props.usercont.idcardstartdate      //0,
 	myContData.idcardenddate = props.usercont.idcardenddate      //0,
@@ -156,6 +161,7 @@ onMounted(() => {
 	myContData.constellationing = props.usercont.constellationing      //1,
 	myContData.isdoubleworker = props.usercont.isdoubleworker      //2,
 	myContData.isveterans = props.usercont.isveterans      //2,
+	myContData.natureofAccount = props.usercont.natureofAccount
 	myContData.veteransnumber = props.usercont.veteransnumber      //"",
 	myContData.jobstartdate = props.usercont.jobstartdate      //0,
 	myContData.entrydate = props.usercont.entrydate      //0,
@@ -202,28 +208,18 @@ onMounted(() => {
  */
 const computingTime = (value: any) => {
 	let dataCont = myContData.entrydatetime?.toString()
-  	myContData.planformaldatetime = haveDateTime(dataCont,value,false)
+	myContData.planformaldatetime = haveDateTime(dataCont, value, false)
 }
 /**
  * 选择入职时间
  */
 const computingClickTime = (value: string) => {
-	myContData.planformaldatetime = haveDateTime(value,myContData.probationperiod,false)
+	myContData.planformaldatetime = haveDateTime(value, myContData.probationperiod, false)
 }
 </script>
 <template>
-	<el-form
+	<el-form ref="editPostFormRef" :model="myContData" :rules="editMycontRules">
-		ref="editPostFormRef"
+		<el-descriptions class="margin-top" direction="vertical" :column="4" border :width="80">
-		:model="myContData"
-		:rules="editMycontRules"                                                                                                                                                    
-	>
-		<el-descriptions
-			class="margin-top"
-			direction="vertical"
-			:column="4"
-			border
-			:width="80"
-		>
 
 			<el-descriptions-item>
 				<template #label>
@@ -247,27 +243,18 @@ const computingClickTime = (value: string) => {
 				</template>
 				<el-form-item prop="gender">
 					<el-select v-model="myContData.gender" class="m-2" placeholder="请选择性别" size="default">
-						<el-option
+						<el-option v-for="item in userGender" :key="item.id" :label="item.name" :value="item.id" />
-						v-for="item in userGender"
-						:key="item.id"
-						:label="item.name"
-						:value="item.id"
-						/>
 					</el-select>
 				</el-form-item>
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template #label>
-					<el-text><svg-icon icon-class="healthcondition" class="svg_box"></svg-icon> 健康状况<i class="hong_mi">*</i></el-text>
+					<el-text><svg-icon icon-class="healthcondition" class="svg_box"></svg-icon> 健康状况<i
+							class="hong_mi">*</i></el-text>
 				</template>
 				<el-form-item prop="health">
 					<el-select v-model="myContData.health" class="m-2" placeholder="请选择健康状况" size="default">
-						<el-option
+						<el-option v-for="item in healthStates" :key="item.id" :label="item.name" :value="item.id" />
-						v-for="item in healthStates"
-						:key="item.id"
-						:label="item.name"
-						:value="item.id"
-						/>
 					</el-select>
 				</el-form-item>
 			</el-descriptions-item>
@@ -277,12 +264,7 @@ const computingClickTime = (value: string) => {
 				</template>
 				<el-form-item>
 					<el-select v-model="myContData.maritalstatus" class="m-2" placeholder="请选择婚姻状况" size="default">
-						<el-option
+						<el-option v-for="item in userMaritalstatus" :key="item.id" :label="item.name" :value="item.id" />
-						v-for="item in userMaritalstatus"
-						:key="item.id"
-						:label="item.name"
-						:value="item.id"
-						/>
 					</el-select>
 				</el-form-item>
 			</el-descriptions-item>
@@ -292,34 +274,24 @@ const computingClickTime = (value: string) => {
 				</template>
 				<el-form-item>
 					<el-select v-model="myContData.politicaloutlook" class="m-2" placeholder="请选择政治面貌" size="default">
-						<el-option
+						<el-option v-for="item in userPoliticaloutloo" :key="item.id" :label="item.name" :value="item.id" />
-						v-for="item in userPoliticaloutloo"
-						:key="item.id"
-						:label="item.name"
-						:value="item.id"
-						/>
 					</el-select>
 				</el-form-item>
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template #label>
-					<el-text><svg-icon icon-class="shengri" class="svg_box"></svg-icon> 出生日期<i class="hong_mi">*</i></el-text>
+					<el-text><svg-icon icon-class="shengri" class="svg_box"></svg-icon> 出生日期<i
+							class="hong_mi">*</i></el-text>
 				</template>
 				<el-form-item prop="birthdaytime">
-					<el-date-picker
+					<el-date-picker v-model="myContData.birthdaytime" type="date" placeholder="请选择出生日期" format="YYYY-MM-DD"
-						v-model="myContData.birthdaytime"
+						value-format="YYYY-MM-DD" style="width: 100%;" size="default" />
-						type="date"
-						placeholder="请选择出生日期"
-						format="YYYY-MM-DD"
-						value-format="YYYY-MM-DD"
-						style="width: 100%;"
-						size="default"
-					/>
 				</el-form-item>
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template #label>
-					<el-text><svg-icon icon-class="zhqxgl" class="svg_box"></svg-icon> 身份证号<i class="hong_mi">*</i></el-text>
+					<el-text><svg-icon icon-class="zhqxgl" class="svg_box"></svg-icon> 身份证号<i
+							class="hong_mi">*</i></el-text>
 				</template>
 				<el-form-item prop="idcardno">
 					<el-input v-model="myContData.idcardno" placeholder="请输入身份证号" />
@@ -329,32 +301,18 @@ const computingClickTime = (value: string) => {
 				<template #label>
 					<el-text><svg-icon icon-class="bdzj-bg" class="svg_box"></svg-icon> 身份证有效期开始</el-text>
 				</template>
-				<el-form-item >
+				<el-form-item>
-					<el-date-picker
+					<el-date-picker v-model="myContData.idcardstarttimedata" type="date" placeholder="身份证有效期开始"
-						v-model="myContData.idcardstarttimedata"
+						format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;" size="default" />
-						type="date"
-						placeholder="身份证有效期开始"
-						format="YYYY-MM-DD"
-						value-format="YYYY-MM-DD"
-						style="width: 100%;"
-						size="default"
-					/>
 				</el-form-item>
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template #label>
 					<el-text><svg-icon icon-class="bdzj-bg" class="svg_box"></svg-icon> 身份证有效期结束</el-text>
 				</template>
-				<el-form-item >
+				<el-form-item>
-					<el-date-picker
+					<el-date-picker v-model="myContData.idcardendtimedata" type="date" placeholder="身份证有效期结束"
-						v-model="myContData.idcardendtimedata"
+						format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;" size="default" />
-						type="date"
-						placeholder="身份证有效期结束"
-						format="YYYY-MM-DD"
-						value-format="YYYY-MM-DD"
-						style="width: 100%;"
-						size="default"
-					/>
 				</el-form-item>
 			</el-descriptions-item>
 			<el-descriptions-item :span="2">
@@ -383,7 +341,8 @@ const computingClickTime = (value: string) => {
 			</el-descriptions-item>
 			<el-descriptions-item :span="2">
 				<template #label>
-					<el-text><svg-icon icon-class="address" class="svg_box"></svg-icon> 现居住地<i class="hong_mi">*</i></el-text>
+					<el-text><svg-icon icon-class="address" class="svg_box"></svg-icon> 现居住地<i
+							class="hong_mi">*</i></el-text>
 				</template>
 				<el-form-item prop="currentresidence">
 					<el-input v-model="myContData.currentresidence" placeholder="请输入现居住地" />
@@ -393,7 +352,7 @@ const computingClickTime = (value: string) => {
 				<template #label>
 					<el-text><svg-icon icon-class="email" class="svg_box"></svg-icon> 电子邮件</el-text>
 				</template>
-				<el-form-item >
+				<el-form-item>
 					<el-input v-model="myContData.email" placeholder="请输入电子邮件" />
 				</el-form-item>
 			</el-descriptions-item>
@@ -401,15 +360,27 @@ const computingClickTime = (value: string) => {
 				<template #label>
 					<el-text><svg-icon icon-class="phone" class="svg_box"></svg-icon> 内线电话</el-text>
 				</template>
-				<el-form-item >
+				<el-form-item>
 					<el-input v-model="myContData.internaltelephone" placeholder="请输入内线电话" />
 				</el-form-item>
 			</el-descriptions-item>
-			<el-descriptions-item :span="2">
+
+			<el-descriptions-item>
+				<template #label>
+					<el-text><el-icon>
+							<Notification />
+						</el-icon> 血型</el-text>
+				</template>
+				<el-form-item>
+					<el-input v-model="myContData.bloodtype" placeholder="请输入血型" />
+				</el-form-item>
+			</el-descriptions-item>
+
+			<el-descriptions-item>
 				<template #label>
 					<el-text><svg-icon icon-class="0213-lmp" class="svg_box"></svg-icon> 籍贯</el-text>
 				</template>
-				<el-form-item >
+				<el-form-item>
 					<el-input v-model="myContData.nativeplace" placeholder="请输入籍贯" />
 				</el-form-item>
 			</el-descriptions-item>
@@ -427,42 +398,30 @@ const computingClickTime = (value: string) => {
 				</template>
 				<el-form-item>
 					<el-select v-model="myContData.constellationing" class="m-2" placeholder="请选择星座" size="default">
-						<el-option
+						<el-option v-for="item in userConstellationing" :key="item.id" :label="item.name"
-						v-for="item in userConstellationing"
+							:value="item.id" />
-						:key="item.id"
-						:label="item.name"
-						:value="item.id"
-						/>
 					</el-select>
 				</el-form-item>
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template #label>
-					<el-text><svg-icon icon-class="guyong" class="svg_box"></svg-icon> 雇佣类型<i class="hong_mi">*</i></el-text>
+					<el-text><svg-icon icon-class="guyong" class="svg_box"></svg-icon> 雇佣类型<i
+							class="hong_mi">*</i></el-text>
 				</template>
 				<el-form-item prop="hireclass">
 					<el-select v-model="myContData.hireclass" class="m-2" placeholder="请选雇佣类型" size="default">
-						<el-option
+						<el-option v-for="item in userHireclass" :key="item.id" :label="item.name" :value="item.id" />
-						v-for="item in userHireclass"
-						:key="item.id"
-						:label="item.name"
-						:value="item.id"
-						/>
 					</el-select>
 				</el-form-item>
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template #label>
-					<el-text><svg-icon icon-class="jianzhi" class="svg_box"></svg-icon> 用工关系<i class="hong_mi">*</i></el-text>
+					<el-text><svg-icon icon-class="jianzhi" class="svg_box"></svg-icon> 用工关系<i
+							class="hong_mi">*</i></el-text>
 				</template>
 				<el-form-item prop="emptype">
 					<el-select v-model="myContData.emptype" class="m-2" placeholder="请选择工关系" size="default">
-						<el-option
+						<el-option v-for="item in emptypeOptionsAll" :key="item.id" :label="item.name" :value="item.id" />
-						v-for="item in emptypeOptionsAll"
-						:key="item.id"
-						:label="item.name"
-						:value="item.id"
-						/>
 					</el-select>
 				</el-form-item>
 			</el-descriptions-item>
@@ -471,24 +430,18 @@ const computingClickTime = (value: string) => {
 					<el-text><svg-icon icon-class="role" class="svg_box"></svg-icon> 入职日期<i class="hong_mi">*</i></el-text>
 				</template>
 				<el-form-item prop="entrydatetime">
-					<el-date-picker
+					<el-date-picker v-model="myContData.entrydatetime" type="date" placeholder="入职日期" format="YYYY-MM-DD"
-						v-model="myContData.entrydatetime"
+						value-format="YYYY-MM-DD" style="width: 100%;" size="default" @change="computingClickTime" />
-						type="date"
-						placeholder="入职日期"
-						format="YYYY-MM-DD"
-						value-format="YYYY-MM-DD"
-						style="width: 100%;"
-						size="default"
-						@change="computingClickTime"
-					/>
 				</el-form-item>
 			</el-descriptions-item>
 			<el-descriptions-item>
 				<template #label>
-					<el-text><svg-icon icon-class="iconfont-riyongbaihuo" class="svg_box"></svg-icon> 试用期(月)<i class="hong_mi">*</i></el-text>
+					<el-text><svg-icon icon-class="iconfont-riyongbaihuo" class="svg_box"></svg-icon> 试用期(月)<i
+							class="hong_mi">*</i></el-text>
 				</template>
 				<el-form-item prop="probationperiod">
-					<el-input-number v-model="myContData.probationperiod" :min="1" placeholder="请输入试用期(月)" style="width:100%" @change="computingTime" />
+					<el-input-number v-model="myContData.probationperiod" :min="1" placeholder="请输入试用期(月)"
+						style="width:100%" @change="computingTime" />
 				</el-form-item>
 			</el-descriptions-item>
 			<el-descriptions-item>
@@ -496,15 +449,8 @@ const computingClickTime = (value: string) => {
 					<el-text><svg-icon icon-class="qxsp" class="svg_box"></svg-icon> 预计转正日期</el-text>
 				</template>
 				<el-form-item>
-					<el-date-picker
+					<el-date-picker v-model="myContData.planformaldatetime" type="date" placeholder="预计转正日期"
-						v-model="myContData.planformaldatetime"
+						format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;" size="default" />
-						type="date"
-						placeholder="预计转正日期"
-						format="YYYY-MM-DD"
-						value-format="YYYY-MM-DD"
-						style="width: 100%;"
-						size="default"
-					/>
 				</el-form-item>
 			</el-descriptions-item>
 			<el-descriptions-item>
@@ -512,15 +458,8 @@ const computingClickTime = (value: string) => {
 					<el-text><svg-icon icon-class="gdqr" class="svg_box"></svg-icon> 参加工作日期</el-text>
 				</template>
 				<el-form-item>
-					<el-date-picker
+					<el-date-picker v-model="myContData.jobstartdatestr" type="date" placeholder="参加工作日期"
-						v-model="myContData.jobstartdatestr"
+						format="YYYY-MM-DD" value-format="YYYY-MM-DD" style="width: 100%;" size="default" />
-						type="date"
-						placeholder="参加工作日期"
-						format="YYYY-MM-DD"
-						value-format="YYYY-MM-DD"
-						style="width: 100%;"
-						size="default"
-					/>
 				</el-form-item>
 			</el-descriptions-item>
 			<el-descriptions-item>
@@ -529,12 +468,7 @@ const computingClickTime = (value: string) => {
 				</template>
 				<el-form-item>
 					<el-select v-model="myContData.isveterans" class="m-2" placeholder="请选是否为退役军人" size="default">
-						<el-option
+						<el-option v-for="item in yesOrno" :key="item.id" :label="item.name" :value="item.id" />
-						v-for="item in yesOrno"
-						:key="item.id"
-						:label="item.name"
-						:value="item.id"
-						/>
 					</el-select>
 				</el-form-item>
 			</el-descriptions-item>
@@ -563,6 +497,20 @@ const computingClickTime = (value: string) => {
 				</el-form-item>
 			</el-descriptions-item>
 
+			<el-descriptions-item>
+				<template #label>
+					<el-text><el-icon>
+							<HomeFilled />
+						</el-icon> 户口类型</el-text>
+				</template>
+				<el-form-item>
+					<el-select v-model="myContData.natureofAccount" class="m-2" placeholder="请选择户口类型" size="default">
+						<el-option v-for="item in Householdregistration" :key="item.id" :label="item.name"
+							:value="item.id" />
+					</el-select>
+				</el-form-item>
+			</el-descriptions-item>
+
 			<el-descriptions-item>
 				<template #label>
 					<el-text><svg-icon icon-class="wechat" class="svg_box"></svg-icon> 绑定微信</el-text>
@@ -580,25 +528,38 @@ const computingClickTime = (value: string) => {
 				</el-form-item>
 			</el-descriptions-item>
 
+			<el-descriptions-item>
+				<template #label>
+					<el-text><el-icon>
+							<Star />
+						</el-icon> 兴趣爱好</el-text>
+				</template>
+				<el-form-item prop="nameusedbefore">
+					<el-input v-model="myContData.interests" placeholder="请输入兴趣爱好" />
+				</el-form-item>
+			</el-descriptions-item>
+
 			<el-descriptions-item :span="2">
 				&nbsp;
 			</el-descriptions-item>
 		</el-descriptions>
 	</el-form>
 	<div class="dialog-footer">
-		<el-button type="primary" :loading="editLoading" @click="submitEditMyCont" >确 定</el-button>
+		<el-button type="primary" :loading="editLoading" @click="submitEditMyCont">确 定</el-button>
 		<el-button @click="handleCloseMyCont">取 消</el-button>
 	</div>
 </template>
 <style  lang='scss' scoped>
-.el-form-item--default{
+.el-form-item--default {
 	margin-bottom: 0px;
 }
-.dialog-footer{
+
+.dialog-footer {
 	margin-top: 15px;
 	text-align: right;
 }
-.hong_mi{
+
+.hong_mi {
 	color: #FF0000;
 	margin-left: 5px;
 }

src/views/hr/archives/basicinformation/emergencycontact.vue

@@ -5,22 +5,22 @@
 -->
 <script lang='ts' setup>
 import { emergencyContact } from '@/api/hr/people/type'
-import { getEmergencyContact,editEmergencyContactState } from '@/api/hr/people/index'
+import { getEmergencyContact, editEmergencyContactState } from '@/api/hr/people/index'
 
 /**
  * 引入页面
  */
- import EditEmergencyContactPage  from '@/views/hr/archives/basicinformation/emergencycontactedit.vue'
+import EditEmergencyContactPage from '@/views/hr/archives/basicinformation/emergencycontactedit.vue'
- import AddEmergencyContactPage  from '@/views/hr/archives/basicinformation/emergencycontactadd.vue'
+import AddEmergencyContactPage from '@/views/hr/archives/basicinformation/emergencycontactadd.vue'
 
 const props = defineProps({
-	tabsid:{
+	tabsid: {
-		type:String,
+		type: String,
-		default:"1"
+		default: "1"
 	},
-	usercont:{
+	usercont: {
-		type:Object,
+		type: Object,
-		default(){
+		default() {
 			return {}
 		}
 	}
@@ -30,32 +30,32 @@ const editJjlxrBoxPage = ref(false)			//编辑紧急联系人
 const tableLoading = ref(false)
 const jinjilianxirenList = ref<emergencyContact[]>([])
 const jjlxrCont = ref<emergencyContact>()
-function getJinjiLianXirenList(){
+function getJinjiLianXirenList() {
 	tableLoading.value = true;
-	getEmergencyContact({id:props.usercont.keystr})
+	getEmergencyContact({ id: props.usercont.keystr })
-		.then(( data )=>{
+		.then((data) => {
 			jinjilianxirenList.value = data.data
 		})
-		.finally(()=>{tableLoading.value = false;})
+		.finally(() => { tableLoading.value = false; })
 }
 /**
  * 监听数据
  */
- watch(() => props.tabsid,() => {
+watch(() => props.tabsid, () => {
-	if(props.tabsid == "4"){
+	if (props.tabsid == "4") {
 		getJinjiLianXirenList()
 	}
- })
+})
-  /**
+/**
-  * 添加数据
+* 添加数据
-  */
+*/
-function addJjlxrBox(key:string){
+function addJjlxrBox(key: string) {
 	addJjlxrBoxPage.value = true;
 }
 /**
  * 编辑紧急联系人
  */
-function editJjlxrBox(cont:emergencyContact){
+function editJjlxrBox(cont: emergencyContact) {
 	jjlxrCont.value = cont
 	editJjlxrBoxPage.value = true;
 	// console.log("编辑紧急联系人--------->",cont)
@@ -63,13 +63,13 @@ function editJjlxrBox(cont:emergencyContact){
 /**
  * 删除紧急联系人
  */
-function delJjlxrBox(cont:emergencyContact){
+function delJjlxrBox(cont: emergencyContact) {
-	ElMessageBox.confirm("确认删除<"+cont.name+">此数据项?", "警告", {
+	ElMessageBox.confirm("确认删除<" + cont.name + ">此数据项?", "警告", {
 		confirmButtonText: "确定",
 		cancelButtonText: "取消",
 		type: "warning",
 	}).then(() => {
-		editEmergencyContactState({id:cont.id.toString(),state:3,isdel:1}).then(() => {
+		editEmergencyContactState({ id: cont.id.toString(), state: 3, isdel: 1 }).then(() => {
 			ElMessage.success("删除成功");
 			getJinjiLianXirenList()
 		});
@@ -77,51 +77,33 @@ function delJjlxrBox(cont:emergencyContact){
 }
 </script>
 <template>
-	<el-table
+	<el-table v-loading="tableLoading" highlight-current-row :data="jinjilianxirenList" border
-		v-loading="tableLoading"
+		:header-cell-style="{ background: '#F5F7FA' }">
-		highlight-current-row
-		:data="jinjilianxirenList"
-		border 
-		:header-cell-style="{background:'#F5F7FA'}"
-	>
 
-		<el-table-column  label="姓名" prop="name" width="150"    />
+		<el-table-column label="姓名" prop="name" width="100" />
-		<el-table-column  label="联系电话" prop="tel"  />
+		<el-table-column label="联系电话" prop="tel" width="120" />
-		<el-table-column  label="与本人关系" prop="relationship"  width="150"  align="center" />
+		<el-table-column label="与本人关系" prop="relationship" width="100" align="center" />
-		<el-table-column fixed="right" align="right"  width="150">
+		<el-table-column label="工作单位" prop="company" align="center" />
+		<el-table-column label="政治面貌" prop="political" width="90" align="center" />
+		<el-table-column fixed="right" align="right" width="100">
 			<template #header>
-				<el-button
+				<el-button type="primary" link size="small" @click.stop="addJjlxrBox(props.usercont.keystr)">
-					type="primary"
-					link
-					size="small"
-					@click.stop="addJjlxrBox(props.usercont.keystr)"
-				>
 					<i-ep-plus /> 新增
 				</el-button>
 			</template>
 			<template #default="scope">
-				<el-button
+				<el-button type="primary" link size="small" @click.stop="editJjlxrBox(scope.row)">
-					type="primary"
-					link
-					size="small"
-					@click.stop="editJjlxrBox(scope.row)"
-				>
 					<i-ep-edit />编辑
 				</el-button>
-				<el-button
+				<el-button type="primary" link size="small" @click.stop="delJjlxrBox(scope.row)">
-					type="primary"
-					link
-					size="small"
-					@click.stop="delJjlxrBox(scope.row)"
-				>
 					<i-ep-delete />删除
 				</el-button>
 			</template>
 		</el-table-column>
 	</el-table>
-	<AddEmergencyContactPage v-model:addisshow="addJjlxrBoxPage" :keyval="props.usercont.keystr" @restdata="getJinjiLianXirenList" />
+	<AddEmergencyContactPage v-model:addisshow="addJjlxrBoxPage" :keyval="props.usercont.keystr"
-	<EditEmergencyContactPage v-model:editisshow="editJjlxrBoxPage" :keyval="props.usercont.keystr" :datacont="jjlxrCont" @restdata="getJinjiLianXirenList" />
+		@restdata="getJinjiLianXirenList" />
+	<EditEmergencyContactPage v-model:editisshow="editJjlxrBoxPage" :keyval="props.usercont.keystr" :datacont="jjlxrCont"
+		@restdata="getJinjiLianXirenList" />
 </template>
-<style  lang='scss' scoped>
+<style  lang='scss' scoped></style>
-
-</style>

src/views/hr/archives/basicinformation/emergencycontactadd.vue

@@ -4,23 +4,24 @@
 @ 备注: 新增紧急联系人
 -->
 <script lang='ts' setup>
-import { emergencyContactInfo,emergencyContactAdd } from '@/api/hr/people/type'
+import { emergencyContactInfo, emergencyContactAdd } from '@/api/hr/people/type'
 import { addEmergencyContactInfo } from '@/api/hr/people/index'
+import { userPoliticaloutloo } from '@/api/hr/people/datacont'
 
 const props = defineProps({
-	addisshow:{
+	addisshow: {
-		type:Boolean,
+		type: Boolean,
-		default:false
+		default: false
 	},
-	keyval:{
+	keyval: {
-		type:String,
+		type: String,
-		default:""
+		default: ""
 	}
 });
 const addLoading = ref(false)
-const emits = defineEmits(["update:addisshow","restdata"]);		//操作父级数据
+const emits = defineEmits(["update:addisshow", "restdata"]);		//操作父级数据
 const addJjlxrFormRef = ref(ElForm);	//编辑表单
-const jjlxrFormData = reactive<emergencyContactInfo>({id:""});
+const jjlxrFormData = reactive<emergencyContactInfo>({ id: "" });
 /**
  * 弹窗显示控制
  */
@@ -33,60 +34,51 @@ const addshow = computed({
 /**
  * 表单验证规则
  */
- const addJjlxrRules = reactive({
+const addJjlxrRules = reactive({
 	name: [{ required: true, message: "请输入紧急联系人姓名", trigger: "blur" }],
 	relationship: [{ required: true, message: "请输入与紧急联系人关系", trigger: "blur" }],
 	mobilephone: [{ required: true, message: "请输入紧急联系人联系方式", trigger: "blur" }],
+	company: [{ required: false, message: "请输入紧急联系人工作单位", trigger: "blur" }],
+	political: [{ required: false, message: "请输入紧急联系人政治面貌", trigger: "blur" }],
 });
 /**
  * 关闭弹窗
  */
-function clostAddBoxJjlxr(){
+function clostAddBoxJjlxr() {
 	emits("update:addisshow", false);
 	initJjlxrData()
 }
 /**
  * 初始化数据
  */
- function initJjlxrData(){
+function initJjlxrData() {
 	addJjlxrFormRef.value.resetFields();
 	addLoading.value = false;
 }
 /**
  * 提交数据
  */
-function submitAddJjlxr(){
+function submitAddJjlxr() {
 	// console.log("提交数据",jjlxrFormData)
 	// addLoading.value = true;
 	addJjlxrFormRef.value.validate((isValid: boolean) => {
 		if (isValid) {
 			let listAry = new Array
 			listAry.push(jjlxrFormData)
-			addEmergencyContactInfo({id:props.keyval,list:listAry})
+			addEmergencyContactInfo({ id: props.keyval, list: listAry })
-				.then(() =>{
+				.then(() => {
 					ElMessage.success("新增成功");
 					clostAddBoxJjlxr();
 					emits('restdata');
 				})
-				.finally(() =>{addLoading.value = false;})
+				.finally(() => { addLoading.value = false; })
 		}
 	});
 }
 </script>
 <template>
-	<el-dialog
+	<el-dialog v-model="addshow" width="500" title="添加紧急联系人" append-to-body :before-close="clostAddBoxJjlxr">
-        v-model="addshow"
+		<el-form ref="addJjlxrFormRef" :model="jjlxrFormData" :rules="addJjlxrRules" label-width="140px">
-        width="500"
-        title="添加紧急联系人"
-        append-to-body
-		:before-close="clostAddBoxJjlxr"
-    >
-		<el-form
-			ref="addJjlxrFormRef"
-			:model="jjlxrFormData"
-			:rules="addJjlxrRules"
-			label-width="140px"                                                                                                                                                        
-		>
 			<el-form-item label="姓名" prop="name">
 				<el-input v-model="jjlxrFormData.name" placeholder="请输入紧急联系人姓名" />
 			</el-form-item>
@@ -96,15 +88,26 @@ function submitAddJjlxr(){
 			<el-form-item label="与紧急联系人关系" prop="relationship">
 				<el-input v-model="jjlxrFormData.relationship" placeholder="请输入与紧急联系人关系" />
 			</el-form-item>
+			<el-form-item label="工作单位" prop="company">
+				<el-input v-model="jjlxrFormData.company" placeholder="请输入紧急联系人工作单位" />
+			</el-form-item>
+			<el-form-item label="政治面貌" prop="political">
+				<el-select v-model="jjlxrFormData.political" placeholder="请选择紧急联系人政治面貌" >
+				<el-option
+						v-for="item in userPoliticaloutloo"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"
+					/>
+				</el-select>
+			</el-form-item>
 		</el-form>
 		<template #footer>
 			<div class="dialog-footer">
-				<el-button type="primary" :loading="addLoading" @click="submitAddJjlxr" >确 定</el-button>
+				<el-button type="primary" :loading="addLoading" @click="submitAddJjlxr">确 定</el-button>
 				<el-button @click="clostAddBoxJjlxr">取 消</el-button>
 			</div>
 		</template>
 	</el-dialog>
 </template>
-<style  lang='scss' scoped>
+<style  lang='scss' scoped></style>
-
-</style>

src/views/hr/archives/basicinformation/emergencycontactedit.vue

@@ -4,28 +4,29 @@
 @ 备注: 编辑紧急联系人
 -->
 <script lang='ts' setup>
-import { emergencyContactInfo,emergencyContactAdd } from '@/api/hr/people/type'
+import { emergencyContactInfo, emergencyContactAdd } from '@/api/hr/people/type'
 import { editEmergencyContactInfo } from '@/api/hr/people/index'
+import { userPoliticaloutloo } from '@/api/hr/people/datacont'
 const props = defineProps({
-	editisshow:{
+	editisshow: {
-		type:Boolean,
+		type: Boolean,
-		default:false
+		default: false
 	},
-	keyval:{
+	keyval: {
-		type:String,
+		type: String,
-		default:""
+		default: ""
 	},
-	datacont:{
+	datacont: {
-		type:Object,
+		type: Object,
-		default(){
+		default() {
 			return {}
 		}
 	}
 });
 const addLoading = ref(false)
-const emits = defineEmits(["update:editisshow","restdata"]);		//操作父级数据
+const emits = defineEmits(["update:editisshow", "restdata"]);		//操作父级数据
 const addJjlxrFormRef = ref(ElForm);	//编辑表单
-const jjlxrFormData = reactive<emergencyContactInfo>({id:""});
+const jjlxrFormData = reactive<emergencyContactInfo>({ id: "" });
 /**
  * 弹窗显示控制
  */
@@ -38,71 +39,66 @@ const editshow = computed({
 /**
  * 表单验证规则
  */
- const addJjlxrRules = reactive({
+const addJjlxrRules = reactive({
 	name: [{ required: true, message: "请输入紧急联系人姓名", trigger: "blur" }],
 	relationship: [{ required: true, message: "请输入与紧急联系人关系", trigger: "blur" }],
 	mobilephone: [{ required: true, message: "请输入紧急联系人联系方式", trigger: "blur" }],
+	company: [{ required: true, message: "请输入紧急联系人工作单位", trigger: "blur" }],
+	political: [{ required: true, message: "请输入紧急联系人政治面貌", trigger: "blur" }],
 });
 /**
  * 关闭弹窗
  */
-function clostEditBoxJjlxr(){
+function clostEditBoxJjlxr() {
 	emits("update:editisshow", false);
 	initJjlxrData()
 }
 /**
  * 初始化数据
  */
-function initJjlxrData(){
+function initJjlxrData() {
 	addJjlxrFormRef.value.resetFields();
 	addLoading.value = false;
 }
 /**
  * 监听数据
  */
- watch(() => props.editisshow,() => {
+watch(() => props.editisshow, () => {
 	// console.log("watch--------->",props.editisshow,props.datacont)
-	if(props.editisshow){
+	if (props.editisshow) {
-		jjlxrFormData.id= props.datacont.id.toString();
+		jjlxrFormData.id = props.datacont.id.toString();
 		jjlxrFormData.name = props.datacont.name;
 		jjlxrFormData.mobilephone = props.datacont.tel;
 		jjlxrFormData.relationship = props.datacont.relationship;
+		jjlxrFormData.political = props.datacont.political;
+		jjlxrFormData.company = props.datacont.company;
+
 	}
 
- })
+})
- /**
+/**
- * 提交数据
+* 提交数据
- */
+*/
-function submitEditJjlxr(){
+function submitEditJjlxr() {
 	// console.log("提交数据",jjlxrFormData)
 	// addLoading.value = true;
 	addJjlxrFormRef.value.validate((isValid: boolean) => {
 		if (isValid) {
 			let listAry = new Array
 			editEmergencyContactInfo(jjlxrFormData)
-				.then(() =>{
+				.then(() => {
 					ElMessage.success("编辑成功");
 					clostEditBoxJjlxr();
 					emits('restdata');
 				})
-				.finally(() =>{addLoading.value = false;})
+				.finally(() => { addLoading.value = false; })
 		}
 	});
 }
 </script>
 <template>
-	<el-dialog
+	<el-dialog v-model="editshow" width="30%" title="编辑紧急联系人" append-to-body>
-        v-model="editshow"
+		<el-form ref="addJjlxrFormRef" :model="jjlxrFormData" :rules="addJjlxrRules" label-width="140px">
-        width="30%"
-        title="编辑紧急联系人"
-        append-to-body
-    >
-		<el-form
-			ref="addJjlxrFormRef"
-			:model="jjlxrFormData"
-			:rules="addJjlxrRules"
-			label-width="140px"                                                                                                                                                        
-		>
 			<el-form-item label="姓名" prop="name">
 				<el-input v-model="jjlxrFormData.name" placeholder="请输入紧急联系人姓名" />
 			</el-form-item>
@@ -112,15 +108,26 @@ function submitEditJjlxr(){
 			<el-form-item label="与紧急联系人关系" prop="relationship">
 				<el-input v-model="jjlxrFormData.relationship" placeholder="请输入与紧急联系人关系" />
 			</el-form-item>
+			<el-form-item label="工作单位" prop="company">
+				<el-input v-model="jjlxrFormData.company" placeholder="请输入紧急联系人工作单位" />
+			</el-form-item>
+			<el-form-item label="政治面貌" prop="political">
+				<el-select v-model="jjlxrFormData.political" placeholder="请选择紧急联系人政治面貌" >
+				<el-option
+						v-for="item in userPoliticaloutloo"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"
+					/>
+				</el-select>
+			</el-form-item>
 		</el-form>
 		<template #footer>
 			<div class="dialog-footer">
-				<el-button type="primary" :loading="addLoading" @click="submitEditJjlxr" >确 定</el-button>
+				<el-button type="primary" :loading="addLoading" @click="submitEditJjlxr">确 定</el-button>
 				<el-button @click="clostEditBoxJjlxr">取 消</el-button>
 			</div>
 		</template>
 	</el-dialog>
 </template>
-<style  lang='scss' scoped>
+<style  lang='scss' scoped></style>
-
-</style>

src/views/hr/archives/basicinformation/familymembersadd.vue

@@ -96,9 +96,6 @@ function clostAddBoxJtcy(){
 			<el-form-item label="公司" prop="company">
 				<el-input v-model="jtcyFormData.company" placeholder="请输入公司" />
 			</el-form-item>
-			<el-form-item label="所在部门" prop="department">
-				<el-input v-model="jtcyFormData.department" placeholder="请输入所在部门" />
-			</el-form-item>
 			<el-form-item label="亲属关系">
 				<el-input v-model="jtcyFormData.relationship" placeholder="请输入亲属关系" />
 			</el-form-item>

src/views/hr/archives/basicinformation/rewardsandpunishments.vue

@@ -0,0 +1,8 @@
+<!--
+@ 作者: 袁纪菲
+@ 时间: 2024-03-03
+@ 备注: 奖惩记录
+-->
+<script lang='ts' setup></script>
+<template></template>
+<style></style>

src/views/hr/archives/basicinformation/rewardsandpunishmentsadd.vue

@@ -0,0 +1,3 @@
+<script lang='ts' setup></script>
+<template></template>
+<style></style>

src/views/hr/archives/basicinformation/rewardsandpunishmentsedit.vue

@@ -0,0 +1,3 @@
+<script lang='ts' setup></script>
+<template></template>
+<style></style>

src/views/hr/archives/basicinformation/workingcouple.vue

@@ -5,22 +5,22 @@
 -->
 <script lang='ts' setup>
 import { shuangzhigong } from '@/api/hr/people/type'
-import { getWorkingCouple,editDoubleWorkState } from '@/api/hr/people/index'
+import { getWorkingCouple, editDoubleWorkState } from '@/api/hr/people/index'
 /**
  * 引入页面
  */
- import WorkingCoupleAddPage  from '@/views/hr/archives/basicinformation/workingcoupleadd.vue'
+import WorkingCoupleAddPage from '@/views/hr/archives/basicinformation/workingcoupleadd.vue'
- import WorkingCoupleEditPage  from '@/views/hr/archives/basicinformation/workingcoupleedit.vue'
+import WorkingCoupleEditPage from '@/views/hr/archives/basicinformation/workingcoupleedit.vue'
 
 
 const props = defineProps({
-	tabsid:{
+	tabsid: {
-		type:String,
+		type: String,
-		default:"1"
+		default: "1"
 	},
-	usercont:{
+	usercont: {
-		type:Object,
+		type: Object,
-		default(){
+		default() {
 			return {}
 		}
 	}
@@ -30,46 +30,46 @@ const editSzgBoxPage = ref(false)			//编辑双职工
 
 const tableLoading = ref(false)
 const shuangzhigongList = ref<shuangzhigong[]>([])
-function getshuangzhigongList(){
+function getshuangzhigongList() {
 	tableLoading.value = true;
-	getWorkingCouple({id:props.usercont.keystr})
+	getWorkingCouple({ id: props.usercont.keystr })
-		.then(( data )=>{
+		.then((data) => {
 			shuangzhigongList.value = data.data
 		})
-		.finally(()=>{tableLoading.value = false;})
+		.finally(() => { tableLoading.value = false; })
 }
 const doubleWorkCont = ref<shuangzhigong>()				//双职工内容
 /**
  * 监听数据
  */
- watch(() => props.tabsid,() => {
+watch(() => props.tabsid, () => {
-	if(props.tabsid == "5"){
+	if (props.tabsid == "5") {
 		getshuangzhigongList()
 	}
- })
+})
- /**
+/**
  * 添加数据
  */
-function addSzgBox(key:string){
+function addSzgBox(key: string) {
 	addSzgBoxPage.value = true;
 }
 /**
  * 编辑双职工
  */
-function editSzgBox(cont:shuangzhigong){
+function editSzgBox(cont: shuangzhigong) {
 	doubleWorkCont.value = cont
 	editSzgBoxPage.value = true
 }
 /**
  * 删除双职工
  */
- function delSzgBox(cont:shuangzhigong){
+function delSzgBox(cont: shuangzhigong) {
-	ElMessageBox.confirm("确认删除<"+cont.name+">此数据项?", "警告", {
+	ElMessageBox.confirm("确认删除<" + cont.name + ">此数据项?", "警告", {
 		confirmButtonText: "确定",
 		cancelButtonText: "取消",
 		type: "warning",
 	}).then(() => {
-		editDoubleWorkState({id:cont.id.toString(),state:3,isdel:1}).then(() => {
+		editDoubleWorkState({ id: cont.id.toString(), state: 3, isdel: 1 }).then(() => {
 			ElMessage.success("删除成功");
 			getshuangzhigongList()
 		});
@@ -77,57 +77,45 @@ function editSzgBox(cont:shuangzhigong){
 }
 </script>
 <template>
-	<el-table
+	<el-table v-loading="tableLoading" highlight-current-row :data="shuangzhigongList" border
-		v-loading="tableLoading"
+		:header-cell-style="{ background: '#F5F7FA' }">
-		highlight-current-row
-		:data="shuangzhigongList"
-		border 
-		:header-cell-style="{background:'#F5F7FA'}"
-	>
 
-		<el-table-column  label="姓名" prop="name" width="100"    />
+		<el-table-column label="是否双职工" prop="workingcouple" width="100" align="center" />
-		<el-table-column  label="联系电话" prop="tel" width="150"   align="center" />
+		<el-table-column label="配偶姓名" prop="name" width="100" align="center" />
-		<el-table-column  label="行政组织关系关系" >
+		<el-table-column label="所在公司" prop="corporation" />
+		<el-table-column label="所在部门" prop="department" width="100" align="center" />
+		<el-table-column label="工段" prop="section" width="60" align="center" />
+		<el-table-column label="职位" prop="job" width="60" align="center" />
+		<el-table-column label="职等" prop="level" width="60" align="center" />
+		<el-table-column label="入职时间" prop="time" align="center" />
+		<el-table-column label="联系方式" prop="tel" align="center">
 			<template #default="scope">
 				<el-text class="mx-1">{{ scope.row.company }}</el-text>
-				<el-text v-if="scope.row.department" class="mx-1"> <span v-if="scope.row.company"> / </span>{{ scope.row.department }}</el-text>
+				<el-text v-if="scope.row.department" class="mx-1"> <span v-if="scope.row.company"> / </span>{{
-				<el-text v-if="scope.row.position" class="mx-1"> <span v-if="scope.row.department"> / </span>{{ scope.row.position }}</el-text>
+					scope.row.department }}</el-text>
+				<el-text v-if="scope.row.position" class="mx-1"> <span v-if="scope.row.department"> / </span>{{
+					scope.row.position }}</el-text>
 			</template>
 		</el-table-column>
 		<el-table-column fixed="right" align="right" width="150">
 			<template #header>
-				<el-button
+				<el-button type="primary" link size="small" @click.stop="addSzgBox(props.usercont.keystr)">
-					type="primary"
-					link
-					size="small"
-					@click.stop="addSzgBox(props.usercont.keystr)"
-				>
 					<i-ep-plus /> 新增
 				</el-button>
 			</template>
 			<template #default="scope">
-				<el-button
+				<el-button type="primary" link size="small" @click.stop="editSzgBox(scope.row)">
-					type="primary"
-					link
-					size="small"
-					@click.stop="editSzgBox(scope.row)"
-				>
 					<i-ep-edit />编辑
 				</el-button>
-				<el-button
+				<el-button type="primary" link size="small" @click.stop="delSzgBox(scope.row)">
-					type="primary"
-					link
-					size="small"
-					@click.stop="delSzgBox(scope.row)"
-				>
 					<i-ep-delete />删除
 				</el-button>
 			</template>
 		</el-table-column>
 	</el-table>
-	<WorkingCoupleAddPage v-model:addisshow="addSzgBoxPage" :keyval="props.usercont.keystr" @restdata="getshuangzhigongList" />
+	<WorkingCoupleAddPage v-model:addisshow="addSzgBoxPage" :keyval="props.usercont.keystr"
-	<WorkingCoupleEditPage v-model:editisshow="editSzgBoxPage" :keyval="props.usercont.keystr" :datacont="doubleWorkCont" @restdata="getshuangzhigongList" />
+		@restdata="getshuangzhigongList" />
+	<WorkingCoupleEditPage v-model:editisshow="editSzgBoxPage" :keyval="props.usercont.keystr" :datacont="doubleWorkCont"
+		@restdata="getshuangzhigongList" />
 </template>
-<style  lang='scss' scoped>
+<style  lang='scss' scoped></style>
-
-</style>

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:{
+	addisshow: {
-		type:Boolean,
+		type: Boolean,
-		default:false
+		default: false
 	},
-	keyval:{
+	keyval: {
-		type:String,
+		type: String,
-		default:""
+		default: ""
 	}
 });
 const addLoading = ref(false)
-const emits = defineEmits(["update:addisshow","restdata"]);		//操作父级数据
+const emits = defineEmits(["update:addisshow", "restdata"]);		//操作父级数据
 const addSzgFormRef = ref(ElForm);	//编辑表单
-const szgFormData = reactive<doubleWorkCont>({id:""});
+const szgFormData = reactive<doubleWorkCont>({ id: "" });
 /**
  * 弹窗显示控制
  */
- const addshow = computed({
+const addshow = computed({
 	get: () => props.addisshow,
 	set: (val) => {
 		emits("update:addisshow", val);
@@ -32,65 +32,67 @@ const szgFormData = reactive<doubleWorkCont>({id:""});
 /**
  * 表单验证规则
  */
- const addszgRules = reactive({
+const addszgRules = reactive({
-	name: [{ required: true, message: "请输入姓名", trigger: "blur" }],	
+	workcouple: [{ required: true, message: "请输入是或否", trigger: "blur" }],
-	mobilephone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],	
+	// name: [{ required: false, message: "请输入配偶姓名", trigger: "blur" }],
-	company: [{ required: true, message: "请输入公司", trigger: "blur" }],
+	// company: [{ required: false, message: "请输入所在公司", trigger: "blur" }],
-	department: [{ required: true, 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" }],
-function clostAddBoxSzg(){
+	// 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; })
 		}
 	});
 }
 </script>
 <template>
-	<el-dialog
+	<el-dialog v-model="addshow" width="500" title="添加双职工" append-to-body :before-close="clostAddBoxSzg">
-        v-model="addshow"
+		<el-form ref="addSzgFormRef" :model="szgFormData" :rules="addszgRules" label-width="140px">
-        width="500"
+			<el-form-item label="是否双职工" prop="workcouple">
-        title="添加双职工"
+				<el-input v-model="szgFormData.workcouple" placeholder="请输入是或否" />
-        append-to-body
-		:before-close="clostAddBoxSzg"
-    >
-		<el-form
-			ref="addSzgFormRef"
-			:model="szgFormData"
-			:rules="addszgRules"
-			label-width="140px"                                                                                                                                                        
-		>
-			<el-form-item label="姓名" prop="name">
-				<el-input v-model="szgFormData.name" placeholder="请输入姓名" />
 			</el-form-item>
-			<el-form-item label="联系电话" prop="mobilephone">
+			<el-form-item label="配偶姓名" prop="name">
-				<el-input v-model="szgFormData.mobilephone" placeholder="请输入联系电话" />
+				<el-input v-model="szgFormData.name" placeholder="请输入配偶姓名" />
 			</el-form-item>
 			<el-form-item label="公司" prop="company">
 				<el-input v-model="szgFormData.company" placeholder="请输入公司" />
@@ -98,19 +100,30 @@ function clostAddBoxSzg(){
 			<el-form-item label="所在部门" prop="department">
 				<el-input v-model="szgFormData.department" placeholder="请输入所在部门" />
 			</el-form-item>
-			<el-form-item label="职务">
+			<el-form-item label="工段" prop="section">
-				<el-input v-model="szgFormData.position" placeholder="请输入职务" />
+				<el-input v-model="szgFormData.section" placeholder="请输入工段" />
+			</el-form-item>
+			<el-form-item label="职位" prop="job">
+				<el-input v-model="szgFormData.job" placeholder="请输入职位" />
+			</el-form-item>
+			<el-form-item label="职等" prop="level">
+				<el-input v-model="szgFormData.level" placeholder="请输入职等" />
+			</el-form-item>
+			<el-form-item label="入职时间" prop="time">
+				<el-date-picker v-model="szgFormData.time" type="date" placeholder="请选择入职时间" format="YYYY-MM-DD"
+					value-format="YYYY-MM-DD" style="width: 100%;" size="default" />
+			</el-form-item>
+			<el-form-item label="联系方式" prop="mobilephone">
+				<el-input v-model="szgFormData.mobilephone" placeholder="请输入联系方式" />
 			</el-form-item>
 
 		</el-form>
 		<template #footer>
 			<div class="dialog-footer">
-				<el-button type="primary" :loading="addLoading" @click="submitAddSzg" >确 定</el-button>
+				<el-button type="primary" :loading="addLoading" @click="submitAddSzg">确 定</el-button>
 				<el-button @click="clostAddBoxSzg">取 消</el-button>
 			</div>
 		</template>
 	</el-dialog>
 </template>
-<style  lang='scss' scoped>
+<style  lang='scss' scoped></style>
-
-</style>

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:{
+	editisshow: {
-		type:Boolean,
+		type: Boolean,
-		default:false
+		default: false
 	},
-	keyval:{
+	keyval: {
-		type:String,
+		type: String,
-		default:""
+		default: ""
 	},
-	datacont:{
+	datacont: {
-		type:Object,
+		type: Object,
-		default(){
+		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<doubleWorkCont>({id:""});
+const szgFormData = reactive<doubleWorkCont>({ id: "" });
 /**
  * 弹窗显示控制
  */
- const editshow = computed({
+const editshow = computed({
 	get: () => props.editisshow,
 	set: (val) => {
 		emits("update:editisshow", val);
@@ -38,51 +38,56 @@ const szgFormData = reactive<doubleWorkCont>({id:""});
 /**
  * 表单验证规则
  */
- const editszgRules = reactive({
+const editszgRules = reactive({
-	name: [{ required: true, message: "请输入姓名", trigger: "blur" }],	
+	workcouple: [{ required: true, message: "请输入是或否", trigger: "blur" }],
-	mobilephone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],	
+	name: [{ required: true, message: "请输入配偶姓名", trigger: "blur" }],
-	company: [{ 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){
+	if (props.editisshow) {
-		szgFormData.id= props.datacont.id.toString();
+		szgFormData.id = props.datacont.id.toString();
 		szgFormData.name = props.datacont.name;
 		szgFormData.mobilephone = props.datacont.tel;
 		szgFormData.company = props.datacont.company;
@@ -93,24 +98,13 @@ function clostEditBoxSzg(){
 })
 </script>
 <template>
-	<el-dialog
+	<el-dialog v-model="editshow" width="500" title="编辑双职工" append-to-body :before-close="clostEditBoxSzg">
-        v-model="editshow"
+		<el-form ref="editSzgFormRef" :model="szgFormData" :rules="editszgRules" label-width="140px">
-        width="500"
+			<el-form-item label="是否双职工" prop="workcouple">
-        title="编辑双职工"
+				<el-input v-model="szgFormData.workcouple" placeholder="请输入是或否" />
-        append-to-body
-		:before-close="clostEditBoxSzg"
-    >
-		<el-form
-			ref="editSzgFormRef"
-			:model="szgFormData"
-			:rules="editszgRules"
-			label-width="140px"                                                                                                                                                        
-		>
-			<el-form-item label="姓名" prop="name">
-				<el-input v-model="szgFormData.name" placeholder="请输入姓名" />
 			</el-form-item>
-			<el-form-item label="联系电话" prop="mobilephone">
+			<el-form-item label="配偶姓名" prop="name">
-				<el-input v-model="szgFormData.mobilephone" placeholder="请输入联系电话" />
+				<el-input v-model="szgFormData.name" placeholder="请输入配偶姓名" />
 			</el-form-item>
 			<el-form-item label="公司" prop="company">
 				<el-input v-model="szgFormData.company" placeholder="请输入公司" />
@@ -118,19 +112,30 @@ function clostEditBoxSzg(){
 			<el-form-item label="所在部门" prop="department">
 				<el-input v-model="szgFormData.department" placeholder="请输入所在部门" />
 			</el-form-item>
-			<el-form-item label="职务">
+			<el-form-item label="工段" prop="section">
-				<el-input v-model="szgFormData.position" placeholder="请输入职务" />
+				<el-input v-model="szgFormData.section" placeholder="请输入工段" />
+			</el-form-item>
+			<el-form-item label="职位" prop="job">
+				<el-input v-model="szgFormData.job" placeholder="请输入职位" />
+			</el-form-item>
+			<el-form-item label="职等" prop="level">
+				<el-input v-model="szgFormData.level" placeholder="请输入职等" />
+			</el-form-item>
+			<el-form-item label="入职时间" prop="time">
+				<el-date-picker v-model="szgFormData.time" type="date" placeholder="请选择入职时间" format="YYYY-MM-DD"
+					value-format="YYYY-MM-DD" style="width: 100%;" size="default" />
+			</el-form-item>
+			<el-form-item label="联系方式" prop="mobilephone">
+				<el-input v-model="szgFormData.mobilephone" placeholder="请输入联系方式" />
 			</el-form-item>
 
 		</el-form>
 		<template #footer>
 			<div class="dialog-footer">
-				<el-button type="primary" :loading="editLoading" @click="submitEditSzg" >确 定</el-button>
+				<el-button type="primary" :loading="editLoading" @click="submitEditSzg">确 定</el-button>
 				<el-button @click="clostEditBoxSzg">取 消</el-button>
 			</div>
 		</template>
 	</el-dialog>
 </template>
-<style  lang='scss' scoped>
+<style  lang='scss' scoped></style>
-
-</style>