将批量分组功能添加到研究生管理和外校教师管理

src/views/cees/student/Student.api.ts

@@ -1,5 +1,5 @@
 import { defHttp } from '/@/utils/http/axios';
-import { useMessage } from "/@/hooks/web/useMessage";
+import { useMessage } from '/@/hooks/web/useMessage';
 
 const { createConfirm } = useMessage();
 
@@ -12,6 +12,7 @@ enum Api {
   importExcel = '/cees/student/importExcel',
   exportXls = '/cees/student/exportXls',
   updateGroupUser = '/cees/ceesGroup/updateGroupUser',
+  batchGroup = '/cees/student/batchGroup',
 }
 
 //获取分组
@@ -32,8 +33,7 @@ export const getImportUrl = Api.importExcel;
  * 列表接口
  * @param params
  */
-export const list = (params) =>
+export const list = (params) => defHttp.get({ url: Api.list, params });
-  defHttp.get({url: Api.list, params});
 
 /**
  * 删除单个
@@ -42,7 +42,7 @@ export const deleteOne = (params,handleSuccess) => {
   return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
     handleSuccess();
   });
-}
+};
 /**
  * 批量删除
  * @param params
@@ -58,24 +58,43 @@ export const batchDelete = (params, handleSuccess) => {
       return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
         handleSuccess();
       });
-    }
+    },
   });
-}
+};
+/**
+ * 批量分组
+ * @param params
+ */
+export const batchGroup = (params, handleSuccess) => {
+  console.log('params', params);
+  createConfirm({
+    iconType: 'warning',
+    title: '确认分组',
+    content: '是否分组选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.post({ url: Api.batchGroup, data: params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess();
+      });
+    },
+  });
+};
 //更新分组中间表
 export const updateGroupUser = (params) => {
   return defHttp.post({ url: Api.updateGroupUser, params });
-}
+};
 /**
  * 保存或者更新
  * @param params
  */
 export const saveOrUpdate = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
+  const url = isUpdate ? Api.edit : Api.save;
   // 更新分组中间表
   const groupUserParams = {
     userId: params.userId,
-    groupId: params.groupId
+    groupId: params.groupId,
-  }
+  };
   updateGroupUser(groupUserParams);
   return defHttp.post({ url: url, params });
-}
+};

src/views/cees/student/StudentList.vue

@@ -14,9 +14,14 @@
                 <Icon icon="ant-design:delete-outlined" />
                 删除
               </a-menu-item>
+              <a-menu-item key="1" @click="batchHandleGroup">
+                <Icon icon="ant-design:usergroup-add-outlined" />
+                分组
+              </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down" />
           </a-button>
         </a-dropdown>
@@ -44,6 +49,7 @@
     </BasicTable>
     <!-- 表单区域 -->
     <StudentModal @register="registerModal" @success="handleSuccess" />
+    <GroupSelectModal ref="groupModalRef" @register="registerGroupModal" @success="handleGroupSuccess" />
   </div>
 </template>
 
@@ -51,10 +57,11 @@
   import { ref, reactive, computed, unref, onMounted } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useModal } from '/@/components/Modal';
+  import GroupSelectModal from './components/GroupSelectModal.vue';
   import { useListPage } from '/@/hooks/system/useListPage';
   import StudentModal from './components/StudentModal.vue';
   import { columns, searchFormSchema, superQuerySchema, updateGroupOptions } from './Student.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, getGroup } from './Student.api';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, getGroup, batchGroup } from './Student.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import { useUserStore } from '/@/store/modules/user';
   import { defHttp } from '/@/utils/http/axios';
@@ -63,6 +70,8 @@ const checkedKeys = ref<Array<string | number>>([]);
   const userStore = useUserStore();
   //注册model
   const [registerModal, { openModal }] = useModal();
+  const [registerGroupModal, { openModal: openGroupModal }] = useModal();
+  const groupModalRef = ref<any>(null);
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     tableProps: {
@@ -167,6 +176,29 @@ async function handleDelete(record) {
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
+
+  /**
+   * 批量分组事件
+   */
+  async function batchHandleGroup() {
+    //if (selectedRowKeys.value.length === 0) {
+    //  return;
+    //}
+    groupModalRef.value?.setGroupOptions(groupOptions.value);
+    openGroupModal(true);
+  }
+  /**
+   * 分组选好后的确认事件
+   */
+  async function handleGroupSuccess(groupId) {
+    console.log('asdfasd');
+    try {
+      console.log('111');
+      await batchGroup({ ids: selectedRowKeys.value, groupId }, handleSuccess);
+    } catch (error) {
+      console.error('批量分组失败:', error);
+    }
+  }
   /**
    * 成功回调
    */

src/views/cees/student/components/GroupSelectModal.vue

@@ -0,0 +1,84 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" title="所属分组" @ok="handleOk" :canFullscreen="false">
+    <div class="group-select-modal">
+      <div class="form-wrapper">
+        <div class="form-item">
+          <span class="required-label">所属分组：</span>
+          <a-select v-model:value="formState.groupId" placeholder="请选择所属分组" class="select-width">
+            <a-select-option v-for="item in groupOptions" :key="item.value" :value="item.value">
+              {{ item.label }}
+            </a-select-option>
+          </a-select>
+        </div>
+      </div>
+    </div>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { message } from 'ant-design-vue';
+
+  const emit = defineEmits(['register', 'success']);
+  const formState = ref({
+    groupId: null,
+  });
+
+  const groupOptions = ref<{ label: string; value: number }[]>([]);
+
+  const [registerModal, { closeModal }] = useModalInner(async (data) => {
+    formState.value.groupId = null;
+    if (data?.options) {
+      groupOptions.value = data.options;
+    }
+  });
+
+  function setGroupOptions(options) {
+    groupOptions.value = options;
+  }
+
+  function handleOk() {
+    if (!formState.value.groupId) {
+      message.warning('请选择分组!');
+      return;
+    }
+    emit('success', formState.value.groupId);
+    closeModal();
+  }
+
+  defineExpose({
+    setGroupOptions,
+  });
+</script>
+
+<style lang="less" scoped>
+  .group-select-modal {
+    padding: 20px 24px;
+
+    .form-wrapper {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+    .form-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+    }
+
+    .required-label {
+      white-space: nowrap;
+      &::before {
+        content: '*';
+        color: #ff4d4f;
+        margin-right: 4px;
+      }
+    }
+
+    .select-width {
+      width: 200px;
+    }
+  }
+</style>

src/views/cees/user/CeesUserList.vue

@@ -16,16 +16,15 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down" />
           </a-button>
         </a-dropdown>
         <!-- 高级查询 -->
         <super-query :config="superQueryConfig" @search="handleSuperQuery" />
         <!-- 新增生成账号按钮 -->
-        <a-button type="primary" @click="showAutoGenerateForm = true" preIcon="ant-design:plus-outlined">
+        <a-button type="primary" @click="showAutoGenerateForm = true" preIcon="ant-design:plus-outlined"> 生成账号 </a-button>
-          生成账号
-        </a-button>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -50,12 +49,17 @@
     <CeesUserModal @register="registerModal" @success="handleSuccess" />
 
     <!-- 生成账号表单 -->
-    <a-modal v-model:visible="showAutoGenerateForm" title="生成账号" @ok="handleAutoGenerate"
+    <a-modal
-      @cancel="showAutoGenerateForm = false" :width="600" :bodyStyle="{ padding: '24px' }">
+      v-model:visible="showAutoGenerateForm"
+      title="生成账号"
+      @ok="handleAutoGenerate"
+      @cancel="showAutoGenerateForm = false"
+      :width="600"
+      :bodyStyle="{ padding: '24px' }"
+    >
       <a-form :model="autoGenerateForm" layout="vertical">
         <a-form-item label="账号类型" class="form-item-custom">
-          <a-select v-model="autoGenerateForm.group" placeholder="请选择账号类型" @change="handleGroupChange"
+          <a-select v-model="autoGenerateForm.group" placeholder="请选择账号类型" @change="handleGroupChange" class="select-custom">
-            class="select-custom">
             <a-select-option v-for="item in autoGeneratType" :key="item.id" :value="item.value">
               {{ item.name }}
             </a-select-option>
@@ -63,8 +67,7 @@
         </a-form-item>
 
         <a-form-item label="专业" class="form-item-custom">
-          <a-select v-model="autoGenerateForm.majorId" placeholder="请选择专业" @change="handleMajorChange"
+          <a-select v-model="autoGenerateForm.majorId" placeholder="请选择专业" @change="handleMajorChange" class="select-custom">
-            class="select-custom">
             <a-select-option v-for="item in majors" :key="item.id" :value="item.value">
               {{ item.name }}
             </a-select-option>
@@ -72,8 +75,13 @@
         </a-form-item>
 
         <a-form-item label="账号数量" class="form-item-custom">
-          <a-input-number v-model="autoGenerateForm.num" :min="1" placeholder="请输入账号数量" @change="handleNumChange"
+          <a-input-number
-            class="input-number-custom" />
+            v-model="autoGenerateForm.num"
+            :min="1"
+            placeholder="请输入账号数量"
+            @change="handleNumChange"
+            class="input-number-custom"
+          />
         </a-form-item>
       </a-form>
     </a-modal>
@@ -92,7 +100,6 @@ import { downloadFile } from '/@/utils/common/renderUtils';
   import { useUserStore } from '/@/store/modules/user';
   import { message } from 'ant-design-vue';
 
-
   // 表单相关状态
   const showAutoGenerateForm = ref(false); // 控制表单显示
 
@@ -104,7 +111,7 @@ const handleMajorChange = (value) => {
   };
   const handleNumChange = (value) => {
     autoGenerateForm.num = value;
-}
+  };
 
   const autoGenerateForm = reactive({
     group: undefined, // 账号类型
@@ -116,7 +123,7 @@ const autoGenerateForm = reactive({
   const autoGeneratType = ref([
     { id: 1, name: '研究生', value: 2 },
     { id: 2, name: '本校老师', value: 3 },
-  { id: 3, name: "外校老师", value: 4 }
+    { id: 3, name: '外校老师', value: 4 },
   ]);
 
   // 专业选项
@@ -129,27 +136,27 @@ const majors = ref([
 
   // 生成账号逻辑
   const handleAutoGenerate = () => {
-  console.log(autoGenerateForm)
+    console.log(autoGenerateForm);
     if (autoGenerateForm.group == undefined) {
       message.warning('请选择身份', 1.5);
-    return
+      return;
     }
     if (autoGenerateForm.majorId == undefined) {
       message.warning('请选择专业', 1.5);
-    return
+      return;
     }
     if (autoGenerateForm.num == undefined) {
       message.warning('请输入账号数量', 1.5);
-    return
+      return;
     }
     //     账号数量小于500并且大于0
     if (autoGenerateForm.num <= 0) {
       message.warning('账号数量必须大于0', 1.5);
-    return
+      return;
     }
     if (autoGenerateForm.num > 500) {
       message.warning('账号数量不能大于500', 1.5);
-    return
+      return;
     }
     // 调用生成账号的 API 或逻辑
     try {
@@ -163,8 +170,7 @@ const handleAutoGenerate = () => {
         } else {
           message.error('生成账号失败', 1.5);
         }
-
+      });
-    })
     } catch (error) {
       // 处理失败逻辑
       message.error('账号生成失败，请重试');

src/views/cees/waiTeacher/CeesWaiTeacher.api.ts

@@ -14,7 +14,8 @@ enum Api {
   updateGroupUser = '/cees/ceesGroup/updateGroupUser',
   updateDormitory = 'cees/ceesWaiTeacher/updateDormitory',
   cancelCheckIn = 'cees/ceesWaiTeacher/cancelCheckIn',
-  confirmCheckIn = 'cees/ceesWaiTeacher/confirmCheckIn'
+  confirmCheckIn = 'cees/ceesWaiTeacher/confirmCheckIn',
+  batchGroup = '/cees/ceesWaiTeacher/batchGroup',
 }
 
 export const updateDormitory = (id, dormitory) => defHttp.get({ url: Api.updateDormitory, params: { id, dormitory } }); // ✅ 将参数包装为独立的对象 });
@@ -69,6 +70,25 @@ export const batchDelete = (params, handleSuccess) => {
     },
   });
 };
+/**
+ * 批量分组
+ * @param params
+ */
+export const batchGroup = (params, handleSuccess) => {
+  console.log('params', params);
+  createConfirm({
+    iconType: 'warning',
+    title: '确认分组',
+    content: '是否分组选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.post({ url: Api.batchGroup, data: params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess();
+      });
+    },
+  });
+};
 
 //更新分组中间表
 export const updateGroupUser = (params) => {

src/views/cees/waiTeacher/CeesWaiTeacherList.vue

@@ -22,6 +22,10 @@
                 <Icon icon="ant-design:delete-outlined" />
                 删除
               </a-menu-item>
+              <a-menu-item key="1" @click="batchHandleGroup">
+                <Icon icon="ant-design:usergroup-add-outlined" />
+                分组
+              </a-menu-item>
             </a-menu>
           </template>
           <a-button
@@ -85,6 +89,7 @@
     </BasicTable>
     <!-- 表单区域 -->
     <CeesWaiTeacherModal @register="registerModal" @success="handleSuccess" />
+    <GroupSelectModal ref="groupModalRef" @register="registerGroupModal" @success="handleGroupSuccess" />
   </div>
 </template>
 
@@ -92,6 +97,7 @@
   import { ref, reactive, computed, unref, onMounted } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useModal } from '/@/components/Modal';
+  import GroupSelectModal from './components/GroupSelectModal.vue';
   import { useListPage } from '/@/hooks/system/useListPage';
   import CeesWaiTeacherModal from './components/CeesWaiTeacherModal.vue';
   import { columns, searchFormSchema, superQuerySchema, updateGroupOptions } from './CeesWaiTeacher.data';
@@ -105,6 +111,7 @@
     updateDormitory,
     cancelCheckIn,
     confirmCheckIn,
+    batchGroup,
   } from './CeesWaiTeacher.api';
   import { selectBySex } from '/@/views/cees/dormitory/CeesDormitoryInfo.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
@@ -121,6 +128,8 @@
 
   //注册model
   const [registerModal, { openModal }] = useModal();
+  const [registerGroupModal, { openModal: openGroupModal }] = useModal();
+  const groupModalRef = ref<any>(null);
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     tableProps: {
@@ -255,6 +264,29 @@
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
+
+  /**
+   * 批量分组事件
+   */
+  async function batchHandleGroup() {
+    //if (selectedRowKeys.value.length === 0) {
+    //  return;
+    //}
+    groupModalRef.value?.setGroupOptions(groupOptions.value);
+    openGroupModal(true);
+  }
+  /**
+   * 分组选好后的确认事件
+   */
+  async function handleGroupSuccess(groupId) {
+    console.log('asdfasd');
+    try {
+      console.log('111');
+      await batchGroup({ ids: selectedRowKeys.value, groupId }, handleSuccess);
+    } catch (error) {
+      console.error('批量分组失败:', error);
+    }
+  }
   /**
    * 成功回调
    */

src/views/cees/waiTeacher/components/GroupSelectModal.vue

@@ -0,0 +1,84 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" title="所属分组" @ok="handleOk" :canFullscreen="false">
+    <div class="group-select-modal">
+      <div class="form-wrapper">
+        <div class="form-item">
+          <span class="required-label">所属分组：</span>
+          <a-select v-model:value="formState.groupId" placeholder="请选择所属分组" class="select-width">
+            <a-select-option v-for="item in groupOptions" :key="item.value" :value="item.value">
+              {{ item.label }}
+            </a-select-option>
+          </a-select>
+        </div>
+      </div>
+    </div>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { message } from 'ant-design-vue';
+
+  const emit = defineEmits(['register', 'success']);
+  const formState = ref({
+    groupId: null,
+  });
+
+  const groupOptions = ref<{ label: string; value: number }[]>([]);
+
+  const [registerModal, { closeModal }] = useModalInner(async (data) => {
+    formState.value.groupId = null;
+    if (data?.options) {
+      groupOptions.value = data.options;
+    }
+  });
+
+  function setGroupOptions(options) {
+    groupOptions.value = options;
+  }
+
+  function handleOk() {
+    if (!formState.value.groupId) {
+      message.warning('请选择分组!');
+      return;
+    }
+    emit('success', formState.value.groupId);
+    closeModal();
+  }
+
+  defineExpose({
+    setGroupOptions,
+  });
+</script>
+
+<style lang="less" scoped>
+  .group-select-modal {
+    padding: 20px 24px;
+
+    .form-wrapper {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+    .form-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+    }
+
+    .required-label {
+      white-space: nowrap;
+      &::before {
+        content: '*';
+        color: #ff4d4f;
+        margin-right: 4px;
+      }
+    }
+
+    .select-width {
+      width: 200px;
+    }
+  }
+</style>