diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index b1cfe0e7..c27fb880 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -500,13 +500,21 @@ const audiColums = ref([ ellipsis: true, }, { - title: "人数", + title: "总人数", dataIndex: "totalMember", key: "totalMember", width: 30, align: "center", className: "h", }, + { + title: "在职人数", + dataIndex: "workMember", + key: "workMember", + width: 30, + align: "center", + className: "h", + }, ]); const orgSelectKeys = ref([]); const auditTableRef = ref(); @@ -612,7 +620,7 @@ const submitAuth = () => { function handleDialogOk() { if (auditSelectRowKeys.value.length || deptList.value.length) { - dialog({ content: "您选择了组织或受众,此添加为异步添加,请稍后手动刷新学员!", ok: handleStageOk }); + dialog({ content: "您选择了组织或受众,此添加为异步添加,请稍后手动刷新学员!(本次添加只添加在职人员)", ok: handleStageOk }); return; } handleStageOk(); diff --git a/src/views/audience/audienceManage.vue b/src/views/audience/audienceManage.vue index 1b24164e..e053dc92 100644 --- a/src/views/audience/audienceManage.vue +++ b/src/views/audience/audienceManage.vue @@ -693,7 +693,7 @@ const column = [ }, }, { - title: "人数", + title: "总人数", dataIndex: "members", key: "members", width: "5%", @@ -704,6 +704,18 @@ const column = [ return text ? text : "-"; }, }, + { + title: "在职人数", + dataIndex: "workMembers", + key: "workMembers", + width: "5%", + align: "center", + ellipsis: true, + className: "h", + customRender: ({ text }) => { + return text ? text : "-"; + }, + }, { title: "状态", dataIndex: "state",