Merge branch 'hr-fix' into online

dist/static/css/chunk-030b1cb3.54faaa91.css

@@ -0,0 +1 @@
+.wrap[data-v-512660f1]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-512660f1]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-512660f1],.wrap .rightCell[data-v-512660f1]{width:300px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-512660f1]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-512660f1]{margin-right:30px}[data-v-512660f1] .el-tag{cursor:pointer}

dist/static/css/chunk-031d283b.9daaed23.css

@@ -0,0 +1 @@
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-598fbeec]{font-size:14px}.btnList[data-v-598fbeec]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-598fbeec]{margin-right:15px}

dist/static/css/chunk-07901373.3e1e8744.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-3364cbd4],.el-button--primary[data-v-3364cbd4]:active,.el-button--primary[data-v-3364cbd4]:focus,.el-button--primary[data-v-3364cbd4]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-3364cbd4] .el-date-editor.el-input,[data-v-3364cbd4] .el-select{width:100%!important}

dist/static/css/chunk-102d1e4a.8c566bd5.css

@@ -0,0 +1 @@
+.floor[data-v-4beecb7f]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-4beecb7f]{width:98px;background:#f85043;margin-left:164px}.floor .add[data-v-4beecb7f],.floor .remove[data-v-4beecb7f]{height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-4beecb7f]{width:auto;padding:0 10px;background:#14928a;margin-left:20px}.studentMask[data-v-4beecb7f]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-4beecb7f]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-4beecb7f]{margin-bottom:20px}.studentMask .left h4[data-v-4beecb7f]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-4beecb7f]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-4beecb7f]{padding-left:10px;line-height:25px}.studentMask .right[data-v-4beecb7f]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-4beecb7f]{max-height:500px;overflow-y:auto}.resetClassForm[data-v-4beecb7f] .el-date-editor.el-input,.resetClassForm[data-v-4beecb7f] .el-date-editor.el-input__inner{width:180px!important}[data-v-4beecb7f] .el-date-editor.el-input,[data-v-4beecb7f] .el-date-editor.el-input__inner{width:100px!important}.higheSelect[data-v-4beecb7f] .el-input__inner{height:40px!important}

dist/static/css/chunk-109ef833.f5dfd435.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-e0868ac8],.el-button--primary[data-v-e0868ac8]:active,.el-button--primary[data-v-e0868ac8]:focus,.el-button--primary[data-v-e0868ac8]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-select[data-v-e0868ac8],[data-v-e0868ac8] .el-date-editor.el-input{width:100%!important}

dist/static/css/chunk-12234ce8.0fcb6f4b.css

@@ -0,0 +1 @@
+[data-v-68fd4cd3] .el-button--primary,[data-v-68fd4cd3] .el-button--primary:active,[data-v-68fd4cd3] .el-button--primary:focus,[data-v-68fd4cd3] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-68fd4cd3] .el-date-editor.el-input{width:100%!important}[data-v-68fd4cd3] .el-select{width:98%!important}

dist/static/css/chunk-15a4bcfe.493031de.css

@@ -0,0 +1 @@
+[data-v-4c4abef3] .el-popover .el-form{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-4c4abef3] .el-popover .el-form-item__content{margin-left:0!important}.music-title[data-v-4c4abef3]{font-size:14px;color:#444}.music-title .el-col[data-v-4c4abef3]{background-color:#edeef0;padding-left:36px}.music-title[data-v-4c4abef3] .el-button{float:right;margin-top:10px;margin-right:16px}.el-row[data-v-4c4abef3]{margin-bottom:12px}.el-row .el-col[data-v-4c4abef3]{line-height:48px}.el-row .el-col-18[data-v-4c4abef3]{width:calc(75% - 20px);margin-left:20px}.el-row .one_name[data-v-4c4abef3]{padding-left:10px}.el-row .tow_col[data-v-4c4abef3]{padding-left:20px}.el-row .tow_col .el-button--primary[data-v-4c4abef3],.el-row .tow_col .el-button--primary[data-v-4c4abef3]:active,.el-row .tow_col .el-button--primary[data-v-4c4abef3]:focus,.el-row .tow_col .el-button--primary[data-v-4c4abef3]:hover{background:#fff;border-color:#979797;color:#777}.el-row .tow_input[data-v-4c4abef3]{width:100px;margin-right:12px}.el-button--primary[data-v-4c4abef3],.el-button--primary[data-v-4c4abef3]:active,.el-button--primary[data-v-4c4abef3]:focus,.el-button--primary[data-v-4c4abef3]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-4c4abef3] .el-date-editor.el-input{width:100%!important}.el-select[data-v-4c4abef3]{width:98%!important}.el-tag+.el-tag[data-v-4c4abef3]{margin-left:10px}.button-new-tag[data-v-4c4abef3]{margin-left:10px;height:32px;line-height:30px;padding-top:0;padding-bottom:0}.input-new-tag[data-v-4c4abef3]{width:90px;vertical-align:bottom}.el-tag--dark.el-tag--info[data-v-4c4abef3]{background-color:#f0f2f5;border-color:#f0f2f5;color:#5a5e66}.el-tag--dark.el-tag--info[data-v-4c4abef3] .el-tag__close{background-color:#c0c4cc}

dist/static/css/chunk-1895d5ea.166af95c.css

@@ -0,0 +1 @@
+/deep/.avatar-uploader .el-upload,/deep/.upload-demo .el-upload{border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload:hover{border-color:#409eff}.avatar-uploader-icon{border:1px dashed #d9d9d9;font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar{width:120px;height:120px;display:block}.ivu-upload{display:none}.content-tooltip[data-v-754f10ff]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}.shopImage{width:60px;height:60px}.shopDesc{max-height:70px;overflow:hidden}

dist/static/css/chunk-1ba18d72.3c1fabc2.css

@@ -0,0 +1 @@
+.right-code .title[data-v-ea99d45a]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-ea99d45a]{display:inline-block}.el-input[data-v-ea99d45a]{width:180px!important}

dist/static/css/chunk-242e6b1d.1c077f63.css

@@ -0,0 +1 @@
+[data-v-50ef84fc] .el-button--primary,[data-v-50ef84fc] .el-button--primary:active,[data-v-50ef84fc] .el-button--primary:focus,[data-v-50ef84fc] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-50ef84fc] .el-date-editor.el-input{width:100%!important}[data-v-50ef84fc] .el-select{width:98%!important}

dist/static/css/chunk-251d0f9e.1d6913c7.css

@@ -0,0 +1 @@
+[data-v-1228fca3] .el-button--primary,[data-v-1228fca3] .el-button--primary:active,[data-v-1228fca3] .el-button--primary:focus,[data-v-1228fca3] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-1228fca3] .el-dialog__body{padding:0 20px}[data-v-1228fca3] .el-date-editor.el-input,[data-v-1228fca3] .el-select{width:100%!important}

dist/static/css/chunk-36c7542c.1bb30934.css

@@ -0,0 +1 @@
+.tableWrap[data-v-18d28f42]{height:300px;overflow:auto}

dist/static/css/chunk-5b997a94.2f5c831e.css

@@ -0,0 +1 @@
+.titlewrap[data-v-6e1a1867]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-6e1a1867],.wrap[data-v-6e1a1867]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap div[data-v-6e1a1867]{margin-right:20px}.countWrap[data-v-6e1a1867] .el-date-editor.el-input,.countWrap[data-v-6e1a1867] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-62f7b26a.3b10becf.css

@@ -0,0 +1 @@
+.studenTable[data-v-1526db28]{height:300px;overflow:auto}.infoMsg[data-v-1526db28]{margin:30px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;text-align:center}.infoMsg .title[data-v-1526db28]{color:#999;font-size:14px;line-height:30px;min-width:100px}.infoMsg .status[data-v-1526db28]{font-size:20px}.infoMsg .left[data-v-1526db28]{width:200px;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-right:200px}.infoMsg .left[data-v-1526db28],.infoMsg .right[data-v-1526db28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal;height:60px}.infoMsg .right[data-v-1526db28]{text-align:center;line-height:30px;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoMsg .right .expectBox[data-v-1526db28]{width:220px;border-right:1px solid #ccc}.infoMsg .right .expectBox[data-v-1526db28]:last-child{border-right:none!important}.infoMsg .right .expectBox.first[data-v-1526db28]{width:300px}.wrap[data-v-1526db28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.wrap div[data-v-1526db28]{margin-right:20px}

dist/static/css/chunk-8d014328.39202ad8.css

@@ -0,0 +1 @@
+.vipwrap[data-v-1a2dc975]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.vipwrap .newBand[data-v-1a2dc975]{margin-right:20px}.resetClassForm[data-v-1a2dc975] .el-date-editor.el-input,.resetClassForm[data-v-1a2dc975] .el-date-editor.el-input__inner{width:180px!important}.countWrap[data-v-1a2dc975] .el-date-editor.el-input,.countWrap[data-v-1a2dc975] .el-date-editor.el-input__inner{width:100px!important}.maskForm[data-v-1a2dc975] .el-input{width:220px!important}

dist/static/css/chunk-ce031f86.50bdac75.css

@@ -0,0 +1 @@
+[data-v-2ee5fcc2] .el-button--primary,[data-v-2ee5fcc2] .el-button--primary:active,[data-v-2ee5fcc2] .el-button--primary:focus,[data-v-2ee5fcc2] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-2ee5fcc2] .el-dialog__body{padding:0 20px}[data-v-2ee5fcc2] .el-date-editor.el-input,[data-v-2ee5fcc2] .el-select{width:100%!important}

dist/static/css/chunk-commons.8cf6f8c4.css

@@ -0,0 +1 @@
+.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}

dist/static/css/chunk-d09d58b6.3aaa6d98.css

@@ -0,0 +1 @@
+.content-tooltip[data-v-754f10ff]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}.dialog-footer[data-v-de543970]{width:100%;text-align:right}.reword-list[data-v-de543970]{display:-webkit-box;display:-ms-flexbox;display:flex}.reword-list .el-form-item[data-v-de543970]{-webkit-box-flex:1;-ms-flex:1;flex:1}.add-reword[data-v-de543970]{margin-bottom:22px;width:180px;border-style:dashed}