Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/package-lock.json

@@ -23,6 +23,7 @@
         "file-saver": "2.0.4",
         "fuse.js": "6.4.3",
         "js-cookie": "2.2.1",
+        "js-export-excel": "^1.1.4",
         "jsencrypt": "3.0.0-rc.1",
         "json-bigint": "^0.3.0",
         "jwt-decode": "3.1.2",
@@ -3065,6 +3066,21 @@
         "node": ">= 0.12.0"
       }
     },
+    "node_modules/adler-32": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz",
+      "integrity": "sha512-/vUqU/UY4MVeFsg+SsK6c+/05RZXIHZMGJA+PX5JyWI0ZRcBpupnRuPLU/NXXoFwMYCPCoxIfElM2eS+DUXCqQ==",
+      "dependencies": {
+        "exit-on-epipe": "~1.0.1",
+        "printj": "~1.1.0"
+      },
+      "bin": {
+        "adler32": "bin/adler32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.nlark.com/aggregate-error/download/aggregate-error-3.1.0.tgz",
@@ -3849,6 +3865,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/blob.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/blob.js/-/blob.js-1.0.1.tgz",
+      "integrity": "sha512-TkPuWPeCHBbN+LWFg7BlXdSh6stRxwmAbuirKfiiHTMmo/uQfKFQMx2jrxVUkueKRiG+Tc7Os1Zn618Yc0MZpg=="
+    },
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.nlark.com/bluebird/download/bluebird-3.7.2.tgz",
@@ -4418,6 +4439,26 @@
       "dev": true,
       "license": "Apache-2.0"
     },
+    "node_modules/cfb": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
+      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "crc-32": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/cfb/node_modules/adler-32": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
+      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/chalk": {
       "version": "4.1.0",
       "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.0.tgz?cache=0&sync_timestamp=1627646734234&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.0.tgz",
@@ -4938,6 +4979,26 @@
         "node": ">=4"
       }
     },
+    "node_modules/codepage": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz",
+      "integrity": "sha512-iz3zJLhlrg37/gYRWgEPkaFTtzmnEv1h+r7NgZum2lFElYQPi0/5bnmuDfODHxfp0INEfnRqyfyeIJDbb7ahRw==",
+      "dependencies": {
+        "commander": "~2.14.1",
+        "exit-on-epipe": "~1.0.1"
+      },
+      "bin": {
+        "codepage": "bin/codepage.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/codepage/node_modules/commander": {
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
+      "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
+    },
     "node_modules/collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.nlark.com/collection-visit/download/collection-visit-1.0.0.tgz",
@@ -5474,6 +5535,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/create-ecdh": {
       "version": "4.0.4",
       "resolved": "https://registry.nlark.com/create-ecdh/download/create-ecdh-4.0.4.tgz",
@@ -7348,6 +7420,14 @@
         "semver": "bin/semver"
       }
     },
+    "node_modules/exit-on-epipe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
+      "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.nlark.com/expand-brackets/download/expand-brackets-2.1.4.tgz",
@@ -7969,6 +8049,14 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/frac": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
+      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.nlark.com/fragment-cache/download/fragment-cache-0.2.1.tgz",
@@ -9723,6 +9811,22 @@
       "integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg=",
       "license": "MIT"
     },
+    "node_modules/js-export-excel": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/js-export-excel/-/js-export-excel-1.1.4.tgz",
+      "integrity": "sha512-19m7e3Gnn4CRfHXoFrLYj4fFfJ/KpvI7HRRn25p4GXYD+AlTV+1oU24NH6S904Ksi44tSx7futxhouOPAQ22oQ==",
+      "dependencies": {
+        "blob.js": "^1.0.1",
+        "file-saver": "^1.3.3",
+        "script-loader": "0.7.2",
+        "xlsx": "0.16.3"
+      }
+    },
+    "node_modules/js-export-excel/node_modules/file-saver": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz",
+      "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
+    },
     "node_modules/js-message": {
       "version": "1.0.7",
       "resolved": "https://registry.nlark.com/js-message/download/js-message-1.0.7.tgz",
@@ -13213,6 +13317,17 @@
         "renderkid": "^2.0.4"
       }
     },
+    "node_modules/printj": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
+      "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==",
+      "bin": {
+        "printj": "bin/printj.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/process": {
       "version": "0.11.10",
       "resolved": "https://registry.nlark.com/process/download/process-0.11.10.tgz",
@@ -13509,6 +13624,11 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/raw-loader": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+      "integrity": "sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q=="
+    },
     "node_modules/read-pkg": {
       "version": "5.2.0",
       "resolved": "https://registry.nlark.com/read-pkg/download/read-pkg-5.2.0.tgz",
@@ -14405,6 +14525,14 @@
         "webpack": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0"
       }
     },
+    "node_modules/script-loader": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/script-loader/-/script-loader-0.7.2.tgz",
+      "integrity": "sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA==",
+      "dependencies": {
+        "raw-loader": "~0.5.1"
+      }
+    },
     "node_modules/select": {
       "version": "1.1.2",
       "resolved": "https://registry.npm.taobao.org/select/download/select-1.1.2.tgz",
@@ -15116,6 +15244,17 @@
       "dev": true,
       "license": "BSD-3-Clause"
     },
+    "node_modules/ssf": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
+      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+      "dependencies": {
+        "frac": "~1.1.2"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/sshpk": {
       "version": "1.16.1",
       "resolved": "https://registry.nlark.com/sshpk/download/sshpk-1.16.1.tgz",
@@ -17679,6 +17818,22 @@
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "license": "ISC"
     },
+    "node_modules/wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
+      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/word": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
+      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.nlark.com/word-wrap/download/word-wrap-1.2.3.tgz",
@@ -17731,6 +17886,33 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "node_modules/xlsx": {
+      "version": "0.16.3",
+      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.16.3.tgz",
+      "integrity": "sha512-LInZ1OK6vpe+Em8XDZ5gDH3WixARwxI7UWc+3chLeafI6gUwECEgL43k4Tjbs1uRfkxpM7wQFy5DLE0hFBRqRw==",
+      "dependencies": {
+        "adler-32": "~1.2.0",
+        "cfb": "^1.1.4",
+        "codepage": "~1.14.0",
+        "commander": "~2.17.1",
+        "crc-32": "~1.2.0",
+        "exit-on-epipe": "~1.0.1",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
+      },
+      "bin": {
+        "xlsx": "bin/xlsx.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/xlsx/node_modules/commander": {
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.nlark.com/xtend/download/xtend-4.0.2.tgz",
@@ -20044,6 +20226,15 @@
       "integrity": "sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY=",
       "dev": true
     },
+    "adler-32": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz",
+      "integrity": "sha512-/vUqU/UY4MVeFsg+SsK6c+/05RZXIHZMGJA+PX5JyWI0ZRcBpupnRuPLU/NXXoFwMYCPCoxIfElM2eS+DUXCqQ==",
+      "requires": {
+        "exit-on-epipe": "~1.0.1",
+        "printj": "~1.1.0"
+      }
+    },
     "aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.nlark.com/aggregate-error/download/aggregate-error-3.1.0.tgz",
@@ -20590,6 +20781,11 @@
       "integrity": "sha1-WYr+VHVbKGilMw0q/51Ou1Mgm2U=",
       "dev": true
     },
+    "blob.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/blob.js/-/blob.js-1.0.1.tgz",
+      "integrity": "sha512-TkPuWPeCHBbN+LWFg7BlXdSh6stRxwmAbuirKfiiHTMmo/uQfKFQMx2jrxVUkueKRiG+Tc7Os1Zn618Yc0MZpg=="
+    },
     "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.nlark.com/bluebird/download/bluebird-3.7.2.tgz",
@@ -21052,6 +21248,22 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
       "dev": true
     },
+    "cfb": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
+      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+      "requires": {
+        "adler-32": "~1.3.0",
+        "crc-32": "~1.2.0"
+      },
+      "dependencies": {
+        "adler-32": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
+          "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="
+        }
+      }
+    },
     "chalk": {
       "version": "4.1.0",
       "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.0.tgz?cache=0&sync_timestamp=1627646734234&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.0.tgz",
@@ -21431,6 +21643,22 @@
         }
       }
     },
+    "codepage": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz",
+      "integrity": "sha512-iz3zJLhlrg37/gYRWgEPkaFTtzmnEv1h+r7NgZum2lFElYQPi0/5bnmuDfODHxfp0INEfnRqyfyeIJDbb7ahRw==",
+      "requires": {
+        "commander": "~2.14.1",
+        "exit-on-epipe": "~1.0.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.14.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
+          "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
+        }
+      }
+    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.nlark.com/collection-visit/download/collection-visit-1.0.0.tgz",
@@ -21849,6 +22077,11 @@
         }
       }
     },
+    "crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
+    },
     "create-ecdh": {
       "version": "4.0.4",
       "resolved": "https://registry.nlark.com/create-ecdh/download/create-ecdh-4.0.4.tgz",
@@ -23230,6 +23463,11 @@
         }
       }
     },
+    "exit-on-epipe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
+      "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="
+    },
     "expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.nlark.com/expand-brackets/download/expand-brackets-2.1.4.tgz",
@@ -23699,6 +23937,11 @@
       "integrity": "sha1-ImmTZCiq1MFcfr6XeahL8LKoGBE=",
       "dev": true
     },
+    "frac": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
+      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="
+    },
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.nlark.com/fragment-cache/download/fragment-cache-0.2.1.tgz",
@@ -24930,6 +25173,24 @@
       "resolved": "https://registry.nlark.com/js-cookie/download/js-cookie-2.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-cookie%2Fdownload%2Fjs-cookie-2.2.1.tgz",
       "integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg="
     },
+    "js-export-excel": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/js-export-excel/-/js-export-excel-1.1.4.tgz",
+      "integrity": "sha512-19m7e3Gnn4CRfHXoFrLYj4fFfJ/KpvI7HRRn25p4GXYD+AlTV+1oU24NH6S904Ksi44tSx7futxhouOPAQ22oQ==",
+      "requires": {
+        "blob.js": "^1.0.1",
+        "file-saver": "^1.3.3",
+        "script-loader": "0.7.2",
+        "xlsx": "0.16.3"
+      },
+      "dependencies": {
+        "file-saver": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz",
+          "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
+        }
+      }
+    },
     "js-message": {
       "version": "1.0.7",
       "resolved": "https://registry.nlark.com/js-message/download/js-message-1.0.7.tgz",
@@ -27500,6 +27761,11 @@
         "renderkid": "^2.0.4"
       }
     },
+    "printj": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
+      "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="
+    },
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.nlark.com/process/download/process-0.11.10.tgz",
@@ -27731,6 +27997,11 @@
         "unpipe": "1.0.0"
       }
     },
+    "raw-loader": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+      "integrity": "sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q=="
+    },
     "read-pkg": {
       "version": "5.2.0",
       "resolved": "https://registry.nlark.com/read-pkg/download/read-pkg-5.2.0.tgz",
@@ -28375,6 +28646,14 @@
         "debug": "^4.2.0"
       }
     },
+    "script-loader": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/script-loader/-/script-loader-0.7.2.tgz",
+      "integrity": "sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA==",
+      "requires": {
+        "raw-loader": "~0.5.1"
+      }
+    },
     "select": {
       "version": "1.1.2",
       "resolved": "https://registry.npm.taobao.org/select/download/select-1.1.2.tgz",
@@ -28956,6 +29235,14 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "ssf": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
+      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+      "requires": {
+        "frac": "~1.1.2"
+      }
+    },
     "sshpk": {
       "version": "1.16.1",
       "resolved": "https://registry.nlark.com/sshpk/download/sshpk-1.16.1.tgz",
@@ -30858,6 +31145,16 @@
       "resolved": "https://registry.nlark.com/which-module/download/which-module-2.0.0.tgz",
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
     },
+    "wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
+      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="
+    },
+    "word": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
+      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA=="
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.nlark.com/word-wrap/download/word-wrap-1.2.3.tgz",
@@ -30899,6 +31196,29 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "xlsx": {
+      "version": "0.16.3",
+      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.16.3.tgz",
+      "integrity": "sha512-LInZ1OK6vpe+Em8XDZ5gDH3WixARwxI7UWc+3chLeafI6gUwECEgL43k4Tjbs1uRfkxpM7wQFy5DLE0hFBRqRw==",
+      "requires": {
+        "adler-32": "~1.2.0",
+        "cfb": "^1.1.4",
+        "codepage": "~1.14.0",
+        "commander": "~2.17.1",
+        "crc-32": "~1.2.0",
+        "exit-on-epipe": "~1.0.1",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
+        }
+      }
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.nlark.com/xtend/download/xtend-4.0.2.tgz",

attendance-performance-manager-ui/admin/src/components/tools/TableButtons.vue

@@ -7,9 +7,9 @@
       size="mini"
       @click="$emit('edit', row)"
       title="编辑"
+      style="margin-left: 0;margin-right: 5px"
       >编辑</el-button
     >
-    <span>&nbsp;</span>
     <el-button
       v-if="!noView"
       type="text"
@@ -17,18 +17,18 @@
       size="mini"
       @click="$emit('view', row)"
       title="查看"
+      style="margin-left: 0;margin-right: 5px"
       >查看</el-button
     >
-    <span>&nbsp;</span>
     <el-switch
       v-if="switchBtn"
       v-model="row.check"
       @change="$emit('view', row)"
       title="核查"
       :active-value="true"
+      style="margin-left: 0;margin-right: 5px"
       :inactive-value="false"
     ></el-switch>
-    <span>&nbsp;</span>
     <el-button
       v-if="reCheck"
       type="text"
@@ -36,9 +36,9 @@
       size="mini"
       @click="$emit('edit', row)"
       title="核查"
+      style="margin-left: 0;margin-right: 5px"
       >核查</el-button
     >
-    <span>&nbsp;</span>
     <el-button
       v-if="chuli"
       type="text"
@@ -46,9 +46,9 @@
       size="mini"
       @click="$emit('edit', row)"
       title="处理"
+      style="margin-left: 0;margin-right: 5px"
       >处理</el-button
     >
-    <span>&nbsp;</span>
     <Confirm @confirm="$emit('del', row.id)" message="确定要删除该条记录吗？">
       <el-button
         v-if="!noDel"
@@ -56,6 +56,7 @@
         icon="el-icon-delete"
         size="mini"
         title="删除"
+        style="margin-left: 0;margin-right: 5px"
         >删除</el-button
       >
     </Confirm>

attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue

@@ -255,6 +255,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (
                 <table-buttons

attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue

@@ -262,6 +262,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (
                 <table-buttons

attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue

@@ -262,6 +262,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (
                 <table-buttons

attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue

@@ -250,6 +250,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (
                 <table-buttons

attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue

@@ -258,6 +258,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (
                 <table-buttons

attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue

@@ -259,6 +259,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (
                 <table-buttons

attendance-performance-manager-ui/admin/src/views/homeCharts/record/list.vue

@@ -1151,7 +1151,7 @@ export default {
         this.$app.loading = true;
         this.$app.percentage = parseInt((dataList.length / total) * 100);
         if (dataList.length >= total || data.data.length == 0) {
-          callback(dataList);
+          if (callback) callback(dataList);
           this.$app.loading = false;
           this.$app.percentage = 1;
           return;

attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue

@@ -507,6 +507,9 @@ export default {
         ],
         createTime: [{ required: true, message: "请选择创建时间" }],
       },
+      urls: {
+        saveUrl: "/perform/attend/appeal/audit",
+      },
     };
   },
 

attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue

@@ -218,7 +218,7 @@ export default {
 
           { label: "异常结果", prop: "errorResult" },
 
-/*
+          /*
           {
             label: "图片凭证",
             prop: "filePaths",
@@ -232,10 +232,13 @@ export default {
             formatter: this.formatterPic,
           },
 
-
           { label: "绩效规则", prop: "ruleNme" },
 
-          { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
+          {
+            label: "加分/扣分方式",
+            prop: "subMethod",
+            formatter: this.formatter,
+          },
 
           {
             label: "加分/扣分时间",
@@ -256,6 +259,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.processStatus == 1 ? (
                 <table-buttons

attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue

@@ -232,7 +232,11 @@ export default {
 
           { label: "绩效规则", prop: "ruleNme" },
 
-          { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
+          {
+            label: "加分/扣分方式",
+            prop: "subMethod",
+            formatter: this.formatter,
+          },
 
           {
             label: "加分/扣分时间",
@@ -253,6 +257,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.processStatus == 1 ? (
                 <table-buttons

attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue

@@ -232,7 +232,11 @@ export default {
           },
           { label: "绩效规则", prop: "ruleName" },
 
-          { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
+          {
+            label: "加分/扣分方式",
+            prop: "subMethod",
+            formatter: this.formatter,
+          },
 
           {
             label: "加分/扣分时间",
@@ -252,7 +256,8 @@ export default {
 
           {
             label: "操作",
-            width: 240,
+            width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.processStatus == 1 ? (
                 <table-buttons

attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue

@@ -219,7 +219,11 @@ export default {
           },
           { label: "绩效规则", prop: "ruleName" },
 
-          { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
+          {
+            label: "加分/扣分方式",
+            prop: "subMethod",
+            formatter: this.formatter,
+          },
 
           {
             label: "加分/扣分时间",
@@ -239,7 +243,8 @@ export default {
 
           {
             label: "操作",
-            width: 240,
+            width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.processStatus == 1 ? (
                 <table-buttons

attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue

@@ -248,7 +248,8 @@ export default {
 
           {
             label: "操作",
-            width: 240,
+            width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.processStatus == 1 ? (
                 <table-buttons

attendance-performance-manager-ui/admin/src/views/perform/review/record/list.vue

@@ -230,7 +230,11 @@ export default {
 
           { label: "绩效规则", prop: "ruleNme" },
 
-          { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
+          {
+            label: "加分/扣分方式",
+            prop: "subMethod",
+            formatter: this.formatter,
+          },
 
           {
             label: "加分/扣分时间",
@@ -251,6 +255,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.processStatus == 1 ? (
                 <table-buttons

attendance-performance-manager-ui/admin/src/views/system/user/list.vue

@@ -40,14 +40,12 @@
       </div>
     </el-dialog>
 
-
     <el-dialog
       :title="userDeptDialog.title"
       :visible.sync="userDeptDialog.open"
       width="60%"
       append-to-body
     >
-
       <div class="mytree">
         <el-tree
           ref="bomTree"
@@ -95,7 +93,7 @@ export default {
       this.tableData.loading = false;
     },
 
-    renderContent: function (h, { node, data, store }) {
+    renderContent: function(h, { node, data, store }) {
       return (
         <span>
           <i style="font-size:16px;color:#409EFF" class={data.icon}></i>
@@ -128,18 +126,17 @@ export default {
       //     });
     },
 
-
     userDeptConfirm(row) {
-      if(Object.keys(this.node).length === 0){
+      if (Object.keys(this.node).length === 0) {
         this.$message.error("请选择一个部门！");
         return;
       }
-    this.userDeptDialog.data['deptId']=this.node.id;
-    this.userDeptDialog.data['deptName']=this.node.label;
+      this.userDeptDialog.data["deptId"] = this.node.id;
+      this.userDeptDialog.data["deptName"] = this.node.label;
       this.$post("/user/save", this.userDeptDialog.data).then((res) => {
         if (res && res.code == 1) {
           this.userDeptDialog.data = {};
-          this.node=null;
+          this.node = null;
           this.$message.success("分配部门成功！");
           this.getData();
         }
@@ -148,7 +145,6 @@ export default {
       });
     },
 
-
     // 获取角色列表与当前用户角色列表
     userRoleConfirm(row) {
       let data = this.userRoleDialog.data;
@@ -182,7 +178,6 @@ export default {
       this.tableData.loading = false;
     },
 
-
     async distributeDept(row) {
       console.log("分配部门");
       try {
@@ -193,9 +188,8 @@ export default {
             parentId: 0,
           }).then(({ data }) => {
             this.data = data.result;
-            this.node={}
-            console.log("data",this.data)
-
+            this.node = {};
+            console.log("data", this.data);
           });
           this.userDeptDialog.open = true;
         });
@@ -218,8 +212,8 @@ export default {
     getRoleUsers(id) {
       return new Promise((resolve, reject) => {
         this.$post("/role/user/list", {
-          "userId": id,
-          "size": -1,
+          userId: id,
+          size: -1,
         })
           .then(({ data }) => {
             const result = data.data
@@ -247,7 +241,7 @@ export default {
     return {
       allRoles: {},
       nodeData: {},
-      node:{},
+      node: {},
       data: [],
       tree: [],
       roles: [],
@@ -276,10 +270,10 @@ export default {
         visible: false,
       },
       config: {
-        isshowTabPane:true,
+        isshowTabPane: true,
         columns: [
-          { type: "selection",reserveSelection:true, width: 60 },
-          { type: "index", label: "序号",align:"center", width: 50 },
+          { type: "selection", reserveSelection: true, width: 60 },
+          { type: "index", label: "序号", align: "center", width: 50 },
           {
             prop: "loginName",
             label: "登录名称",
@@ -353,7 +347,7 @@ export default {
                   >
                     分配部门
                   </el-button>
-<span> </span>
+                  <span> </span>
                   <el-button
                     size="mini"
                     type="text"
@@ -362,7 +356,6 @@ export default {
                   >
                     修改密码
                   </el-button>
-
                 </div>
               );
             },
@@ -464,7 +457,5 @@ export default {
     top: 12px;
     width: 24px;
   }
-
 }
 </style>
-

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendAppealServiceImpl.java

@@ -74,7 +74,8 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
 
 
     private void sendCheckDingTalk(PerformAttendAppealEntity entity) {
-        String ruleStr = String.format("%s/%s/%s", PerformTypeEnum.getByValue(entity.getPerformType()).getDesc(), entity.getCategoryName(), entity.getRuleName());
+       // String ruleStr = String.format("%s/%s/%s", PerformTypeEnum.getByValue(entity.getPerformType()).getDesc(), entity.getCategoryName(), entity.getRuleName());
+        String ruleStr = String.format("%s/%s/%s", PerformTypeEnum.考勤绩效.getDesc(), entity.getCategoryName(), entity.getRuleName());
         //绩效核查通知
         StaffEntity staffCache = staffService.getCache(entity.getStaffId().toString());
         if (!ObjectUtils.isEmpty(staffCache)) {
@@ -121,7 +122,7 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
         }
         String appealMsg = "申诉成功，返回所扣分数，申诉ID:" + appeal.getId().toString();
         sendCheckDingTalk(appealEntity);
-log.info(appealMsg);
+        log.info(appealMsg);
 
         if (appeal.getAppealResult() == AppealResultEnum.通过.getValue()) {
             if (appeal.getSubAddType() == SubAddTypeEnum.扣除.getValue()) {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java

@@ -137,6 +137,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
             }
             recordSysLog(request, busiDesc + " 【成功】");
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            jsonObject.put(KEY_RESULT_MSG, busiDesc+ "成功!");
         } catch (Exception e) {
             log.error("申诉审核", e);
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);