Merge branch 'online' into LAO_MO

dist/static/css/chunk-6f58bf53.81b66462.css → dist/static/css/chunk-43252de2.3f3f13fc.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{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-31cb099a]{display:none}[data-v-1c04a8a8] .el-button--primary,[data-v-1c04a8a8] .el-button--primary:active,[data-v-1c04a8a8] .el-button--primary:focus,[data-v-1c04a8a8] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-1c04a8a8] .el-dialog__body{padding:0 20px}[data-v-1c04a8a8] .el-date-editor.el-input,[data-v-1c04a8a8] .el-select{width:100%!important}
+.pagination-container[data-v-31cb099a]{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-31cb099a]{display:none}[data-v-26a77352] .el-button--primary,[data-v-26a77352] .el-button--primary:active,[data-v-26a77352] .el-button--primary:focus,[data-v-26a77352] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-26a77352] .el-dialog__body{padding:0 20px}[data-v-26a77352] .el-date-editor.el-input,[data-v-26a77352] .el-select{width:100%!important}

src/layout/components/Navbar.vue

@@ -133,7 +133,6 @@ export default {
     // 手动加入
     this.toggleSideBar();
     this.username = this.$store.getters.name;
-    console.log(this.$store.getters.phone)
   },
   methods: {
     toggleSideBar () {

src/views/categroyManager/insideSetting/staffManager.vue

@@ -369,17 +369,9 @@ export default {
   activated () {
     this.getList()
     this.getRoleList()
-    this.getEducationUsers()
   },
   methods: {
 
-    getEducationUsers () {
-      findEducationUsers().then(res => {
-        if (res.code === 200) {
-          this.educationList = res.data;
-        }
-      })
-    },
     onBranchCheckAll () {
       this.form.organIdLists = []
 
@@ -508,15 +500,23 @@ export default {
     },
     async checkStatus (data) {
       let status;
-      await hasCourseGroupRelation({ employeeId: data.id }).then(res => {
+      await hasCourseGroupRelation({ employeeId: data.id }).then(async res => {
         if (res.code === 200) {
           if (res.data.hasCourseSchedule) {
             this.$message.error('请先交接指导老师课程')
             status = false
           } else {
             if (res.data.hasCourseGroupRelation) {
-              this.educationViseble = true
-              status = false
+              let userId = data.id
+              await findEducationUsers({ userId }).then(res => {
+                if (res.code === 200) {
+                  this.educationList = res.data;
+                  this.educationViseble = true
+                  status = false
+                }
+              })
+
+
             } else {
               // 1 要弹出
               status = true