Merge branch 'online' into LAO_MO

dist/static/css/chunk-43252de2.3f3f13fc.css → dist/static/css/chunk-4b6885df.fafcdfe5.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-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}
+.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-4bcb46ac] .el-button--primary,[data-v-4bcb46ac] .el-button--primary:active,[data-v-4bcb46ac] .el-button--primary:focus,[data-v-4bcb46ac] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-4bcb46ac] .el-dialog__body{padding:0 20px}[data-v-4bcb46ac] .el-date-editor.el-input,[data-v-4bcb46ac] .el-select{width:100%!important}

src/views/categroyManager/insideSetting/staffManager.vue

@@ -293,7 +293,7 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { queryEmployByOrganId, employeeOperate, getUserRole, employeeAdd, employeeUpdate, hasCourseGroupRelation, updateEducationTeacherId } from '@/api/systemManage'
-import { branchQueryPage } from '@/api/specialSetting'
+import { branchQueryPage, findEducationTeacher } from '@/api/specialSetting'
 import { findEducationUsers } from '@/api/buildTeam'
 import store from '@/store'
 import { isvalidPhone } from '@/utils/validate'
@@ -508,7 +508,7 @@ export default {
           } else {
             if (res.data.hasCourseGroupRelation) {
               let userId = data.id
-              await findEducationUsers({ userId }).then(res => {
+              await findEducationTeacher({ userId }).then(res => {
                 if (res.code === 200) {
                   this.educationList = res.data;
                   this.educationViseble = true