hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-09 02:46:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '250213-prod-master_1202-gx' into compulsory_professional_skills_copy

Browse Source
This commit is contained in:
gengxin
2025-02-26 23:15:14 +08:00
parent c88e4c0ddc 5512963b16
commit 1fe1862a5a
4 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/Lecturer.js
View File

@@ -61,6 +61,8 @@ export const getUnSelectOrg = (isParent) => http.get(`/admin/affiliation/getUnSe
export const getAffiliationCode = () => http.get('/admin/affiliation/getAffiliationCode')
//查看或编辑回显培训发生组织
export const getAffiliationById = (id) => http.get(`/admin/affiliation/queryById?id=${id}`)
export const getAffiliationModuleTypeById = (id,moduleType) => http.get(`/admin/affiliation/queryModelTypeById?id=${id}&moduleType=${moduleType}`)
//审核记录
export const getByBusinessIdList = (obj) => http.post(`/admin/approval/getByBusinessIdListPage?businessId=${obj.businessId}&businessType=${obj.businessType}&pageNo=${obj.pageNo}&pageSize=${obj.pageSize}`)
//审批中心查看详情

52
src/components/project/lockLecturer.vue
View File

@@ -106,6 +106,10 @@ const props = defineProps({
type: String,
default: ""
},
moduleType:{
type: Number,
default: null
},
parentName: String,
});
const emit = defineEmits({});
@@ -287,20 +291,40 @@ watch(visible, (val)=>{
if(val){
threeList.value = false
activeKey.value = '1'
api.getAffiliationById(props.id).then(res=>{
if(res.data.code == 200){
formData.value = res.data.data
formData.value.parentName = props.parentName
formData.value.act = filterList(formData.value.affiliationUserList,0)
formData.value.one = filterList(formData.value.affiliationUserList,1)
formData.value.two = filterList(formData.value.affiliationUserList,2)
formData.value.three = filterList(formData.value.affiliationUserList,3)
formData.value.tableData = res.data.data.affiliationOrgList
}
}).catch(err=>{
message.destroy()
message.error(err.data.msg)
})
if(!props.moduleType){
console.log("getAffiliationModuleTypeById props.moduleType",props.moduleType)
api.getAffiliationModuleTypeById(props.id,props.moduleType).then(res=>{
if(res.data.code == 200){
formData.value = res.data.data
formData.value.parentName = props.parentName
formData.value.act = filterList(formData.value.affiliationUserList,0)
formData.value.one = filterList(formData.value.affiliationUserList,1)
formData.value.two = filterList(formData.value.affiliationUserList,2)
formData.value.three = filterList(formData.value.affiliationUserList,3)
formData.value.tableData = res.data.data.affiliationOrgList
}
}).catch(err=>{
message.destroy()
message.error(err.data.msg)
})
}else{
console.log("getAffiliationById props.moduleType")
api.getAffiliationById(props.id).then(res=>{
if(res.data.code == 200){
formData.value = res.data.data
formData.value.parentName = props.parentName
formData.value.act = filterList(formData.value.affiliationUserList,0)
formData.value.one = filterList(formData.value.affiliationUserList,1)
formData.value.two = filterList(formData.value.affiliationUserList,2)
formData.value.three = filterList(formData.value.affiliationUserList,3)
formData.value.tableData = res.data.data.affiliationOrgList
}
}).catch(err=>{
message.destroy()
message.error(err.data.msg)
})
}
// getTwoData()
}
})

1
src/views/lecturer/OrganizationApproval.vue
View File

@@ -102,6 +102,7 @@
:parentName="record.parentName"
:id="record.id"
:title="'培训发生组织详情'"
:moduleType="1"
@searchList="searchList"
>
<div style="color: #1890ff; cursor: pointer">查看</div>

1
src/views/lecturer/OrganizationList.vue
View File

@@ -82,6 +82,7 @@
:parentName="record.parentName"
:id="record.id"
:title="'培训发生组织详情'"
:moduleType="0"
@searchList="searchList"
>
<div style="color: #1890ff; cursor: pointer">查看</div>