mo 4 lat temu
rodzic
commit
be75f10b0a

Plik diff jest za duży
+ 0 - 0
dist/index.html


+ 1 - 1
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}

Plik diff jest za duży
+ 0 - 0
dist/static/js/app.1a94af74.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-02575c59.d98e2530.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-0cbc46b4.9da36145.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-20c5063f.4ced590a.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-2f86221d.6ffd1b2e.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-2f86221d.a51a9f16.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-3ad08d44.769390ed.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-43252de2.27908acd.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-4a8375df.bd6f4f76.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-4b6885df.91ee4cbe.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-5041d362.6d5142b5.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-5b41afa6.b20eb03f.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-64e97e34.de4b7c8f.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-6b5ac17e.6100cde1.js


+ 120 - 111
src/api/specialSetting.js

@@ -3,171 +3,180 @@ import request from '@/utils/request'
 import qs from 'qs'
 let api = '/api-web'
 // 分页查询分部列表
-export function branchQueryPage(data) {
-    return request({
-        url: api + '/organization/queryPage',
-        method: 'get',
-        params: data
-    })
+export function branchQueryPage (data) {
+  return request({
+    url: api + '/organization/queryPage',
+    method: 'get',
+    params: data
+  })
 }
 
 // 分页查询分部列表
-export function branchAdd(data) {
-    return request({
-        url: api + '/organization/add',
-        method: 'post',
-        data: qs.stringify(data)
-    })
+export function branchAdd (data) {
+  return request({
+    url: api + '/organization/add',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 分页查询分部列表
-export function branchUpdate(data) {
-    return request({
-        url: api + '/organization/update',
-        method: 'post',
-        data: qs.stringify(data)
-    })
+export function branchUpdate (data) {
+  return request({
+    url: api + '/organization/update',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 根据父节点查询下一级子节点列表(不递归)
-export function areaQueryChild(data) {
-    return request({
-        url: api + '/area/queryChild',
-        method: 'get',
-        params: data
-    })
+export function areaQueryChild (data) {
+  return request({
+    url: api + '/area/queryChild',
+    method: 'get',
+    params: data
+  })
 }
 
 
 // 根据子级区域获取父级节点
-export function getParentArea(data) {
-    return request({
-        url: api + `/area/getParentArea/${data.id}`,
-        method: 'get'
-    })
+export function getParentArea (data) {
+  return request({
+    url: api + `/area/getParentArea/${data.id}`,
+    method: 'get'
+  })
 }
 
 // 分页查询科目列表
-export function subjectListTree(data) {
-    return request({
-        url: api + `/subject/queryPageTree`,
-        method: 'get',
-        params: data
-    })
+export function subjectListTree (data) {
+  return request({
+    url: api + `/subject/queryPageTree`,
+    method: 'get',
+    params: data
+  })
 }
 
 // 修改、新增科目
-export function subjectUpset(data) {
-    return request({
-        url: api + `/subject/upset`,
-        method: 'post',
-        data: data
-    })
+export function subjectUpset (data) {
+  return request({
+    url: api + `/subject/upset`,
+    method: 'post',
+    data: data
+  })
 }
 
 // 分页查询收费类型列表
-export function chargeTypeList(data) {
-    return request({
-        url: api + '/chargeType/queryPage',
-        method: 'get',
-        params: data
-    })
+export function chargeTypeList (data) {
+  return request({
+    url: api + '/chargeType/queryPage',
+    method: 'get',
+    params: data
+  })
 }
 
 // 新增、修改收费类型
-export function chargeTypeUpSet(data) {
-    return request({
-        url: api + '/chargeType/upSet',
-        method: 'post',
-        data: data
-    })
+export function chargeTypeUpSet (data) {
+  return request({
+    url: api + '/chargeType/upSet',
+    method: 'post',
+    data: data
+  })
 }
 
 // 删除收费类型
-export function chargeTypeDel(data) {
-    return request({
-        url: api + `/chargeType/del/${data}`,
-        method: 'post'
-    })
+export function chargeTypeDel (data) {
+  return request({
+    url: api + `/chargeType/del/${data}`,
+    method: 'post'
+  })
 }
 
 // 分页查询作业模板列表
-export function courseHomeworkTemplateList(data) {
-    return request({
-        url: api + '/courseHomeworkTemplate/queryPage',
-        method: 'post',
-        data: data
-    })
+export function courseHomeworkTemplateList (data) {
+  return request({
+    url: api + '/courseHomeworkTemplate/queryPage',
+    method: 'post',
+    data: data
+  })
 }
 
 // 修改作业模板
-export function homeWorkUpdate(data) {
-    return request({
-        url: api + '/courseHomeworkTemplate/update',
-        method: 'post',
-        data: qs.stringify(data)
-    })
+export function homeWorkUpdate (data) {
+  return request({
+    url: api + '/courseHomeworkTemplate/update',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 修改作业模板
-export function homeWorkAdd(data) {
-    return request({
-        url: api + '/courseHomeworkTemplate/add',
-        method: 'post',
-        data: qs.stringify(data)
-    })
+export function homeWorkAdd (data) {
+  return request({
+    url: api + '/courseHomeworkTemplate/add',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 
 // 修改作业模板
-export function homeWorkDel(id) {
-    return request({
-        url: api + `/courseHomeworkTemplate/del/${id}`,
-        method: 'post'
-    })
+export function homeWorkDel (id) {
+  return request({
+    url: api + `/courseHomeworkTemplate/del/${id}`,
+    method: 'post'
+  })
 }
 
 // 查询已设置的分部列表
-export function queryOrganIdList(data) {
-    return request({
-        url: api + `/courseScheduleRewards/queryOrganIdList`,
-        method: 'get',
-        params: data
-    })
+export function queryOrganIdList (data) {
+  return request({
+    url: api + `/courseScheduleRewards/queryOrganIdList`,
+    method: 'get',
+    params: data
+  })
 }
 
 // 获取收费类型分部关联的默认课程费用添加
-export function chargeTypeOrganizationFeeAdd(data) {
-    return request({
-        url: api + `/chargeTypeOrganizationFee/add`,
-        method: 'post',
-        data: qs.stringify(data)
-    })
+export function chargeTypeOrganizationFeeAdd (data) {
+  return request({
+    url: api + `/chargeTypeOrganizationFee/add`,
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 获取收费类型分部关联的默认课程费用删除
-export function chargeTypeOrganizationFeeDelete(data) {
-    return request({
-        url: api + `/chargeTypeOrganizationFee/delete`,
-        method: 'post',
-        data: qs.stringify(data)
-    })
+export function chargeTypeOrganizationFeeDelete (data) {
+  return request({
+    url: api + `/chargeTypeOrganizationFee/delete`,
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 获取收费类型分部关联的默认课程费用修改
-export function chargeTypeOrganizationFeeUpdate(data) {
-    return request({
-        url: api + `/chargeTypeOrganizationFee/update`,
-        method: 'post',
-        data: qs.stringify(data)
-    })
+export function chargeTypeOrganizationFeeUpdate (data) {
+  return request({
+    url: api + `/chargeTypeOrganizationFee/update`,
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }
 
 // 获取收费类型分部关联的默认课程费用列表
-export function chargeTypeOrganizationFee(data) {
-    return request({
-        url: api + `/chargeTypeOrganizationFee/queryPage`,
-        method: 'get',
-        params: data
-    })
+export function chargeTypeOrganizationFee (data) {
+  return request({
+    url: api + `/chargeTypeOrganizationFee/queryPage`,
+    method: 'get',
+    params: data
+  })
+}
+
+// 获取收费类型分部关联的默认课程费用列表
+export function findEducationTeacher (data) {
+  return request({
+    url: api + `/employee/findEducationTeacher`,
+    method: 'get',
+    params: data
+  })
 }

+ 2 - 2
src/views/categroyManager/insideSetting/staffManager.vue

@@ -290,7 +290,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'
@@ -505,7 +505,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

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików