diff --git a/src/api/index1.js b/src/api/index1.js index c2d637ed..e2b28694 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -115,6 +115,8 @@ export const getMemberInfo = (obj) => http.post('/admin/orgStruct/getMemberInfo' export const getAudienceInfo = (obj) => http.post('/admin/orgStruct/getAudienceInfo', obj) //获取、添加授权(修改版) export const optionAuthPerm = (obj) => http.post('/admin/AuthPerm/optionAuthPerm', obj) +//获取学员列表 +export const getStuList = (obj) => http.post('/admin/orgStruct/getStudentRef', obj) //获取用户登录 export const getUser = () => http.post('/admin/CheckUser/login', { withCredentials: true }) //公共信息--------------------------------------------------- diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue index 4d93ac8e..0019545a 100644 --- a/src/components/drawers/ProjCheckPower.vue +++ b/src/components/drawers/ProjCheckPower.vue @@ -583,6 +583,7 @@ import { // batchLoadList, } from "../../utils/utils"; import * as api from "../../api/index1"; +import {getStuList} from "../../api/index1"; export default { name: "ProjCheckShip", @@ -603,6 +604,11 @@ export default { type: Number, default: null, }, + //1 审核 2添加学员 + type: { + type: Number, + default: 1, + }, }, setup(props, ctx) { const store = useStore(); @@ -805,7 +811,7 @@ export default { const afterVisibleChange = (bool) => { console.log("state", bool); if (bool) { - optionAuthPerm(); + props.type === 1 ? optionAuthPerm() : getStuentList() } }; //获取组织树 @@ -1335,6 +1341,47 @@ export default { ctx.emit("update:addAuthList", state.selectAllArr); closeDrawer(); }; + //获取学员列表 + const getStuentList = () => { + getStuList({ + refType: {learnPath: 1, project: 2, course: 3, addstudent: 2}[props.classify], + refId: props.selectProjectId, + extId: 0 + }).then(res => { + initResp(res) + }) + } + + function initResp(res) { + let studentArr = res.data.data.studentList; + state.studentList = res.data.data.studentList; + state.choosepeople = res.data.data.studentList; + //快速选人 + state.selectedRowKeys = studentArr.map(e => e.id); + let deptArr = res.data.data.deptList; + let selectedKeys1 = []; + let chooseorganization = []; + for (let i = 0; i < deptArr.length; i++) { + selectedKeys1.push(deptArr[i].id); + chooseorganization.push(deptArr[i]); + } + //组织 + state.selectedKeys1 = selectedKeys1; + state.chooseorganization = chooseorganization; + state.chooseorganization1 = chooseorganization; + let groupArr = res.data.data.groupList; + let selectedRowKeys2 = []; + let relationpeople = []; + for (let i = 0; i < groupArr.length; i++) { + selectedRowKeys2.push(groupArr[i].id); + relationpeople.push(groupArr[i]); + } + //受众 + state.selectedRowKeys2 = selectedRowKeys2; + state.relationpeople = relationpeople; + console.log("获取权限名单成功", res); + } + //获取授权 坐回显 const optionAuthPerm = () => { let obj = { @@ -1357,43 +1404,10 @@ export default { studentList: [], }; console.log("获取权限名单obj", obj); - api - .optionAuthPerm(obj) - .then((res) => { - // console.log("获取权限名单成功", res); - if (res.data.code === 200) { - let studentArr = res.data.data.studentList; - state.studentList = res.data.data.studentList; - state.choosepeople = res.data.data.studentList; - //快速选人 - state.selectedRowKeys = studentArr.map(e => e.id); - let deptArr = res.data.data.deptList; - let selectedKeys1 = []; - let chooseorganization = []; - for (let i = 0; i < deptArr.length; i++) { - selectedKeys1.push(deptArr[i].id); - chooseorganization.push(deptArr[i]); - } - //组织 - state.selectedKeys1 = selectedKeys1; - state.chooseorganization = chooseorganization; - state.chooseorganization1 = chooseorganization; - let groupArr = res.data.data.groupList; - let selectedRowKeys2 = []; - let relationpeople = []; - for (let i = 0; i < groupArr.length; i++) { - selectedRowKeys2.push(groupArr[i].id); - relationpeople.push(groupArr[i]); - } - //受众 - state.selectedRowKeys2 = selectedRowKeys2; - state.relationpeople = relationpeople; - console.log("获取权限名单成功", res); - } - }) - .catch((err) => { - console.log("获取权限名单失败", err); - }); + api.optionAuthPerm(obj).then((res) => { + initResp(res) + }) + }; return { ...toRefs(state), diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index af260299..ff17ecfd 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -1027,7 +1027,8 @@ :selectProjectId="routerId" v-model:addAuthList="addAuthList" :authClassify="authClassify" - classify="addstudent" + classify="learnPath" + :type="2" /> diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 165578e5..40f8a975 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1185,7 +1185,8 @@ :selectProjectId="projectId" v-model:addAuthList="addAuthList" :authClassify="authClassify" - classify="addstudent" + classify="project" + :type="2" /> @@ -3293,6 +3294,7 @@ export default { }; //获取学员列表 const getStu = (obj) => { + state.loading = true let objf = obj || { deptIds: [], //部门 groupId: 0,