From 048c6d3cbfb23219131c9d279f5f7f77bd48ea07 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 17 Oct 2024 16:44:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=97=E4=BC=97=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=9C=A8=E8=81=8C=E4=BA=BA=E6=95=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index b1cfe0e7..ec5797cd 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();

From 4e86ae857b35cc7eaac0773e1adc87d0665f32f3 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 17 Oct 2024 17:11:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=97=E4=BC=97=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=9C=A8=E8=81=8C=E4=BA=BA=E6=95=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audience/audienceManage.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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",

From 32559a92c1bc03227b40cd88cbb9530052084d77 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Fri, 18 Oct 2024 11:01:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=97=E4=BC=97?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index ec5797cd..c27fb880 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -620,7 +620,7 @@ const submitAuth = () => {
 
 function handleDialogOk() {
   if (auditSelectRowKeys.value.length || deptList.value.length) {
-    dialog({ content: "您选择了组织或受众，此添加为异步添加，请稍后手动刷新学员！", ok: handleStageOk });
+    dialog({ content: "您选择了组织或受众，此添加为异步添加，请稍后手动刷新学员！(本次添加只添加在职人员)", ok: handleStageOk });
     return;
   }
   handleStageOk();