diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index cf92b45f..04470c1b 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -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}`) //审批中心查看详情 diff --git a/src/components/growthpath/StudentSeeStu.vue b/src/components/growthpath/StudentSeeStu.vue index 01a471df..c77087fe 100644 --- a/src/components/growthpath/StudentSeeStu.vue +++ b/src/components/growthpath/StudentSeeStu.vue @@ -209,7 +209,7 @@ export default { ellipsis: true, }, { - title: "开始时间", + title: "任务开始时间", dataIndex: "taskStartTime", key: "taskStartTime", align: "center", @@ -218,7 +218,7 @@ export default { }, }, { - title: "完成时间", + title: "任务完成时间", dataIndex: "finishTime", key: "finishTime", align: "center", diff --git a/src/components/project/lockLecturer.vue b/src/components/project/lockLecturer.vue index dc002032..8b23f99f 100644 --- a/src/components/project/lockLecturer.vue +++ b/src/components/project/lockLecturer.vue @@ -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() } }) diff --git a/src/views/growthpath/GrowthAddPath.vue b/src/views/growthpath/GrowthAddPath.vue index a05c7d80..2cc05549 100644 --- a/src/views/growthpath/GrowthAddPath.vue +++ b/src/views/growthpath/GrowthAddPath.vue @@ -562,6 +562,7 @@ export default { key: "stdPositionName", align: "center", ellipsis: true, + width: 400, customRender: ({ record }) => { return record.stdPosition ? `${record.stdPositionName}(${record.stdPosition})` @@ -599,7 +600,7 @@ export default { dataIndex: "ratio", key: "ratio", align: "center", - width:90, + width:100, ellipsis: true, customRender: ({ record }) => { return `${record.ratio * 100}%`; @@ -610,7 +611,7 @@ export default { dataIndex: "isPublished", key: "isPublished", align: "center", - width:80, + width:100, ellipsis: true, customRender: ({ record }) => { return record.isPublished ? "已发布" : "未发布"; @@ -621,12 +622,13 @@ export default { dataIndex: "updateTime", key: "updateTime", align: "center", - width: 180, ellipsis: true, + width: 200, }, { title: "操作", align: "right", + fixed: "right", width: 200, slots: { customRender: "listData" }, }, diff --git a/src/views/growthpath/GrowthPath.vue b/src/views/growthpath/GrowthPath.vue index 0962d92f..370a1bbc 100644 --- a/src/views/growthpath/GrowthPath.vue +++ b/src/views/growthpath/GrowthPath.vue @@ -550,6 +550,7 @@ export default { key: "stdPositionName", align: "center", ellipsis: true, + width: 400, customRender: ({ record }) => { return record.stdPosition ? `${record.stdPositionName}(${record.stdPosition})` @@ -586,7 +587,7 @@ export default { title: "完成比例", dataIndex: "ratio", key: "ratio", - width: 90, + width:100, align: "center", ellipsis: true, customRender: ({ record }) => { @@ -598,7 +599,7 @@ export default { dataIndex: "isPublished", key: "isPublished", align: "center", - width: 80, + width:100, ellipsis: true, customRender: ({ record }) => { return record.isPublished ? "已发布" : "未发布"; @@ -609,12 +610,13 @@ export default { dataIndex: "updateTime", key: "updateTime", align: "center", - width: 180, + width: 200, ellipsis: true, }, { title: "操作", align: "right", + fixed: "right", width: 200, slots: { customRender: "listData" }, }, diff --git a/src/views/lecturer/OrganizationApproval.vue b/src/views/lecturer/OrganizationApproval.vue index a1447f81..0b5729ac 100644 --- a/src/views/lecturer/OrganizationApproval.vue +++ b/src/views/lecturer/OrganizationApproval.vue @@ -102,6 +102,7 @@ :parentName="record.parentName" :id="record.id" :title="'培训发生组织详情'" + :moduleType="1" @searchList="searchList" >
查看
diff --git a/src/views/lecturer/OrganizationList.vue b/src/views/lecturer/OrganizationList.vue index 63e1a62f..a63cd0ac 100644 --- a/src/views/lecturer/OrganizationList.vue +++ b/src/views/lecturer/OrganizationList.vue @@ -82,6 +82,7 @@ :parentName="record.parentName" :id="record.id" :title="'培训发生组织详情'" + :moduleType="0" @searchList="searchList" >
查看