diff --git a/src/views/cees/group/CeesGroup.api.ts b/src/views/cees/group/CeesGroup.api.ts index 429affb..8736dd1 100644 --- a/src/views/cees/group/CeesGroup.api.ts +++ b/src/views/cees/group/CeesGroup.api.ts @@ -30,8 +30,8 @@ export const list = (params) => defHttp.get({url: Api.list, params}).then((res) => { //添加组员信息 res.records.map((item) => { - getRowUser({id: item.id}).then((data) => { - item.rowUser = data.map((item) => item).join(','); + getRowUser({groupId: item.id}).then((data) => { + item.rowUser = data.map((item2) => item2.userName).join(','); }).catch((error) => { item.rowUser = '加载失败'; }); diff --git a/src/views/cees/group/CeesGroup.data.ts b/src/views/cees/group/CeesGroup.data.ts index 02c32b7..63ca4d4 100644 --- a/src/views/cees/group/CeesGroup.data.ts +++ b/src/views/cees/group/CeesGroup.data.ts @@ -4,14 +4,16 @@ import { rules} from '/@/utils/helper/validator'; import { render } from '/@/utils/common/renderUtils'; //import { getRowUser } from '/@/views/cees/group/CeesGroup.api'; //列表数据 + export const columns: BasicColumn[] = [ { title: '组名', align:"center", - dataIndex: 'name' + dataIndex: 'name', + width: 150 }, // { - // title: '操作', + // title: '分组', // align: 'center', // width: 150, // slots: { customRender: 'action2' }, // 使用插槽自定义操作列 @@ -54,14 +56,22 @@ export const formSchema: FormSchema[] = [ }, }, { - label: '专业id', + label: '学科', field: 'majorId', - component: 'InputNumber', + component: 'Select', + componentProps: { + options: [ + { label: '语文', value: 1 }, + { label: '地理', value: 4 }, + { label: '历史', value: 7 }, + { label: '政治', value: 8 }, + ], + }, dynamicRules: ({model,schema}) => { - return [ - { required: true, message: '请输入专业id!'}, - ]; - }, + return [ + { required: true, message: '请选择学科!'}, + ]; + }, }, // TODO 主键隐藏字段,目前写死为ID { diff --git a/src/views/cees/group/CeesGroupList.vue b/src/views/cees/group/CeesGroupList.vue index 29123dc..3f17ca5 100644 --- a/src/views/cees/group/CeesGroupList.vue +++ b/src/views/cees/group/CeesGroupList.vue @@ -36,6 +36,10 @@ + + @@ -43,10 +47,11 @@ import { ref, reactive, computed, unref, onMounted } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useModal } from '/@/components/Modal'; +import CeesGroupTransferModal from './components/CeesGroupTransferModal.vue' import { useListPage } from '/@/hooks/system/useListPage' import CeesGroupModal from './components/CeesGroupModal.vue' import { columns, searchFormSchema, superQuerySchema } from './CeesGroup.data'; -import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, getRowUser } from './CeesGroup.api'; +import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, getRowUser, addGroupMembers, removeGroupMembers } from './CeesGroup.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import { useUserStore } from '/@/store/modules/user'; @@ -93,15 +98,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext + // 高级查询配置 const superQueryConfig = reactive(superQuerySchema); -//分组 -const addOrUpdateHandle = (record) => { - console.log('分组操作:', record); -} - /** * 高级查询事件 */ diff --git a/src/views/cees/group/components/CeesGroupTransferModal.vue b/src/views/cees/group/components/CeesGroupTransferModal.vue new file mode 100644 index 0000000..1219407 --- /dev/null +++ b/src/views/cees/group/components/CeesGroupTransferModal.vue @@ -0,0 +1,44 @@ + + + \ No newline at end of file