Compare commits

..

No commits in common. "be44e6195a9b70cc82cc5f991a06344fb0da4c97" and "6a46bdb45ab0ddbee237c3cd71ef4a5e0336df69" have entirely different histories.

14 changed files with 465 additions and 1186 deletions

View File

@ -1,80 +0,0 @@
import {defHttp} from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
list = '/cees/ceesGroup/list',
save='/cees/ceesGroup/add',
edit='/cees/ceesGroup/edit',
deleteOne = '/cees/ceesGroup/delete',
deleteBatch = '/cees/ceesGroup/deleteBatch',
importExcel = '/cees/ceesGroup/importExcel',
exportXls = '/cees/ceesGroup/exportXls',
getRowUser = '/cees/ceesGroup/getRowUser',
}
/**
* api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* api
*/
export const getImportUrl = Api.importExcel;
/**
*
* @param params
*/
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(',');
}).catch((error) => {
item.rowUser = '加载失败';
});
});
console.log(res.records);
return res.records;
});
//查询组员
export const getRowUser = (params) =>
defHttp.get({url: Api.getRowUser, params});
/**
*
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
*
* @param params
*/
export const batchDelete = (params, handleSuccess) => {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
*
* @param params
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({url: url, params});
}

View File

@ -1,88 +0,0 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
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'
},
// {
// title: '操作',
// align: 'center',
// width: 150,
// slots: { customRender: 'action2' }, // 使用插槽自定义操作列
//},
{
title: '组员信息',
align: 'center',
dataIndex: 'rowUser',
//customRender: ({ record }) => {
// // 使用Promise处理异步操作
// return getRowUser({ id: record.id }).then((data) => {
// console.log(data);
// // 假设getRowUser返回的数据是一个字符串数组
// return data.map((item) => item).join(',');
// }).catch((error) => {
// console.error(error);
// return '加载失败';
// });
//},
}
// {
// title: '专业id',
// align:"center",
// dataIndex: 'majorId'
// },
];
//查询数据
export const searchFormSchema: FormSchema[] = [
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '组名',
field: 'name',
component: 'Input',
dynamicRules: ({model,schema}) => {
return [
{ required: true, message: '请输入分组名!'},
];
},
},
{
label: '专业id',
field: 'majorId',
component: 'InputNumber',
dynamicRules: ({model,schema}) => {
return [
{ required: true, message: '请输入专业id!'},
];
},
},
// TODO 主键隐藏字段目前写死为ID
{
label: '',
field: 'id',
component: 'Input',
show: false
},
];
// 高级查询数据
export const superQuerySchema = {
name: {title: '组名',order: 0,view: 'text', type: 'string',},
majorId: {title: '专业id',order: 1,view: 'number', type: 'number',},
};
/**
* formSchema
* @param param
*/
export function getBpmFormSchema(_formData): FormSchema[]{
// 默认和原始表单保持一致 如果流程中配置了权限数据这里需要单独处理formSchema
return formSchema;
}

View File

@ -1,194 +0,0 @@
<template>
<div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
</template>
<!--操作栏-->
<template #action2="{ record }">
<a-button type="link" @click="addOrUpdateHandle(record)">分组</a-button>
</template>
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
</template>
<!--字段回显插槽-->
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
</BasicTable>
<!-- 表单区域 -->
<CeesGroupModal @register="registerModal" @success="handleSuccess"></CeesGroupModal>
</div>
</template>
<script lang="ts" name="cees-ceesGroup" setup>
import { ref, reactive, computed, unref, onMounted } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
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 { downloadFile } from '/@/utils/common/renderUtils';
import { useUserStore } from '/@/store/modules/user';
const queryParam = reactive<any>({});
const checkedKeys = ref<Array<string | number>>([]);
const userStore = useUserStore();
//model
const [registerModal, { openModal }] = useModal();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '分组表',
api: list,
columns,
canResize: false,
formConfig: {
//labelWidth: 120,
schemas: searchFormSchema,
autoSubmitOnEnter: true,
showAdvancedButton: true,
fieldMapToNumber: [
],
fieldMapToTime: [
],
},
actionColumn: {
width: 120,
fixed: 'right'
},
beforeFetch: (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: "分组表",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
})
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext
//
const superQueryConfig = reactive(superQuerySchema);
//
const addOrUpdateHandle = (record) => {
console.log('分组操作:', record);
}
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
}
]
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
}
}
]
}
</script>
<style scoped></style>

View File

@ -1,70 +0,0 @@
<template>
<div style="min-height: 400px">
<BasicForm @register="registerForm"></BasicForm>
<div style="width: 100%;text-align: center" v-if="!formDisabled">
<a-button @click="submitForm" pre-icon="ant-design:check" type="primary"> </a-button>
</div>
</div>
</template>
<script lang="ts">
import {BasicForm, useForm} from '/@/components/Form/index';
import {computed, defineComponent} from 'vue';
import {defHttp} from '/@/utils/http/axios';
import { propTypes } from '/@/utils/propTypes';
import {getBpmFormSchema} from '../CeesGroup.data';
import {saveOrUpdate} from '../CeesGroup.api';
export default defineComponent({
name: "CeesGroupForm",
components:{
BasicForm
},
props:{
formData: propTypes.object.def({}),
formBpm: propTypes.bool.def(true),
},
setup(props){
const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
labelWidth: 150,
schemas: getBpmFormSchema(props.formData),
showActionButtonGroup: false,
baseColProps: {span: 24}
});
const formDisabled = computed(()=>{
if(props.formData.disabled === false){
return false;
}
return true;
});
let formData = {};
const queryByIdUrl = '/cees/ceesGroup/queryById';
async function initFormData(){
let params = {id: props.formData.dataId};
const data = await defHttp.get({url: queryByIdUrl, params});
formData = {...data}
//
await setFieldsValue(formData);
//
await setProps({disabled: formDisabled.value})
}
async function submitForm() {
let data = getFieldsValue();
let params = Object.assign({}, formData, data);
console.log('表单数据', params)
await saveOrUpdate(params, true)
}
initFormData();
return {
registerForm,
formDisabled,
submitForm,
}
}
});
</script>

View File

@ -1,66 +0,0 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
<BasicForm @register="registerForm"/>
</BasicModal>
</template>
<script lang="ts" setup>
import {ref, computed, unref} from 'vue';
import {BasicModal, useModalInner} from '/@/components/Modal';
import {BasicForm, useForm} from '/@/components/Form/index';
import {formSchema} from '../CeesGroup.data';
import {saveOrUpdate} from '../CeesGroup.api';
// Emits
const emit = defineEmits(['register','success']);
const isUpdate = ref(true);
//
const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
//labelWidth: 150,
schemas: formSchema,
showActionButtonGroup: false,
baseColProps: {span: 24}
});
//
const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
//
await resetFields();
setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
isUpdate.value = !!data?.isUpdate;
if (unref(isUpdate)) {
//
await setFieldsValue({
...data.record,
});
}
//
setProps({ disabled: !data?.showFooter })
});
//
const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
//
async function handleSubmit(v) {
try {
let values = await validate();
setModalProps({confirmLoading: true});
//
await saveOrUpdate(values, isUpdate.value);
//
closeModal();
//
emit('success');
} finally {
setModalProps({confirmLoading: false});
}
}
</script>
<style lang="less" scoped>
/** 时间和数字输入框样式 */
:deep(.ant-input-number){
width: 100%
}
:deep(.ant-calendar-picker){
width: 100%
}
</style>

View File

@ -11,14 +11,7 @@ enum Api {
deleteBatch = '/CEES/ceesLocalTeacher/deleteBatch', deleteBatch = '/CEES/ceesLocalTeacher/deleteBatch',
importExcel = '/CEES/ceesLocalTeacher/importExcel', importExcel = '/CEES/ceesLocalTeacher/importExcel',
exportXls = '/CEES/ceesLocalTeacher/exportXls', exportXls = '/CEES/ceesLocalTeacher/exportXls',
updateGroupUser = '/cees/ceesGroup/updateGroupUser',
} }
//获取分组
export const getGroup = () =>
defHttp.get({url: '/cees/ceesGroup/list'}).then((res) => {
return res.records;
});
/** /**
* api * api
* @param params * @param params
@ -61,23 +54,11 @@ export const batchDelete = (params, handleSuccess) => {
} }
}); });
} }
//更新分组中间表
export const updateGroupUser = (params) => {
return defHttp.post({url: Api.updateGroupUser, params});
}
/** /**
* *
* @param params * @param params
*/ */
export const saveOrUpdate = (params, isUpdate) => { export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save; let url = isUpdate ? Api.edit : Api.save;
// 更新分组中间表
const groupUserParams = {
userId: params.userId,
groupId: params.groupId
}
updateGroupUser(groupUserParams);
return defHttp.post({url: url, params}); return defHttp.post({url: url, params});
} }

View File

@ -7,16 +7,6 @@ const filterMajor = (value, row) => {
console.log(value, row); // 打印过滤值和行数据 console.log(value, row); // 打印过滤值和行数据
return row === value; return row === value;
}; };
import { ref, onMounted,reactive } from 'vue';
const groupOptions=ref()
// 创建一个简单的事件总线
export const updateGroupOptions = reactive({
updateGroupOptions(newOptions: any) {
groupOptions.value = newOptions;
},
});
//列表数据 //列表数据
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
@ -56,14 +46,7 @@ export const columns: BasicColumn[] = [
{ {
title: '所属分组', title: '所属分组',
align: 'center', align: 'center',
//dataIndex: 'groupId', dataIndex: 'groupId',
customRender: ({ text }) => {
const group = groupOptions.value.find(item => item.value === text.groupId);
if (group) {
return group.label;
}
return '未知分组';
},
}, },
{ {
title: '是否第一次阅卷', title: '是否第一次阅卷',
@ -153,13 +136,10 @@ export const formSchema: FormSchema[] = [
{ {
label: '所属组', label: '所属组',
field: 'groupId', field: 'groupId',
component: 'Select', component: 'InputNumber',
componentProps: { //dynamicRules: ({ model, schema }) => {
options: groupOptions, // 动态设置分组选项 // return [{ required: true, message: '请输入所属分组!' }];
}, //},
dynamicRules: ({ model, schema }) => {
return [{ required: true, message: '请选择分组!' }];
},
}, },
//{ //{
// label: '使用次数', // label: '使用次数',

View File

@ -16,7 +16,8 @@
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</template> </template>
<a-button>批量操作 <a-button
>批量操作
<Icon icon="mdi:chevron-down" /> <Icon icon="mdi:chevron-down" />
</a-button> </a-button>
</a-dropdown> </a-dropdown>
@ -44,211 +45,145 @@
</template> </template>
<script lang="ts" name="CEES-ceesLocalTeacher" setup> <script lang="ts" name="CEES-ceesLocalTeacher" setup>
import { ref, reactive, computed, unref, onMounted } from 'vue'; import { ref, reactive, computed, unref } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage'; import { useListPage } from '/@/hooks/system/useListPage';
import CeesLocalTeacherModal from './components/CeesLocalTeacherModal.vue'; import CeesLocalTeacherModal from './components/CeesLocalTeacherModal.vue';
import { columns, searchFormSchema, superQuerySchema, updateGroupOptions } from './CeesLocalTeacher.data'; import { columns, searchFormSchema, superQuerySchema } from './CeesLocalTeacher.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, getGroup } from './CeesLocalTeacher.api'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './CeesLocalTeacher.api';
import { downloadFile } from '/@/utils/common/renderUtils'; import { downloadFile } from '/@/utils/common/renderUtils';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
const queryParam = reactive<any>({}); const queryParam = reactive<any>({});
const checkedKeys = ref<Array<string | number>>([]); const checkedKeys = ref<Array<string | number>>([]);
const userStore = useUserStore(); const userStore = useUserStore();
//model //model
const [registerModal, { openModal }] = useModal(); const [registerModal, { openModal }] = useModal();
//table //table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: { tableProps: {
title: '本校教师表', title: '本校教师表',
api: list, api: list,
columns, columns,
canResize: false, canResize: false,
formConfig: { formConfig: {
//labelWidth: 120, //labelWidth: 120,
schemas: searchFormSchema, schemas: searchFormSchema,
autoSubmitOnEnter: true, autoSubmitOnEnter: true,
showAdvancedButton: true, showAdvancedButton: true,
fieldMapToNumber: [], fieldMapToNumber: [],
fieldMapToTime: [], fieldMapToTime: [],
}, },
actionColumn: { actionColumn: {
width: 120, width: 120,
fixed: 'right', fixed: 'right',
}, },
beforeFetch: (params) => { beforeFetch: (params) => {
return Object.assign(params, queryParam); return Object.assign(params, queryParam);
},
},
exportConfig: {
name: '本校教师表',
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess,
},
});
import { ref, reactive, computed, unref } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage';
import CeesLocalTeacherModal from './components/CeesLocalTeacherModal.vue';
import { columns, searchFormSchema, superQuerySchema } from './CeesLocalTeacher.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './CeesLocalTeacher.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import { useUserStore } from '/@/store/modules/user';
const queryParam = reactive<any>({});
const checkedKeys = ref<Array<string | number>>([]);
const userStore = useUserStore();
//model
const [registerModal, { openModal }] = useModal();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '本校教师表',
api: list,
columns,
canResize: false,
formConfig: {
//labelWidth: 120,
schemas: searchFormSchema,
autoSubmitOnEnter: true,
showAdvancedButton: true,
fieldMapToNumber: [],
fieldMapToTime: [],
},
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: '本校教师表',
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess,
},
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
//
const groupOptions = ref<{ label: string; value: number }[]>([]);
onMounted(async () => {
console.log('组件已加载');
try {
const res = await getGroup();
console.log('获取分组数据成功:', res);
groupOptions.value = res.map((group) => ({
label: group.name, // name
value: group.id, // ID id
}));
console.log('分组数据:', groupOptions.value);
updateGroupOptions.updateGroupOptions(groupOptions.value)
} catch (error) {
console.error('获取分组数据失败:', error);
}
});
//
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
}, },
}, },
]; exportConfig: {
} name: '本校教师表',
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess,
},
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
//
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
},
];
}
</script> </script>
<style scoped></style> <style scoped></style>

View File

@ -11,14 +11,7 @@ enum Api {
deleteBatch = '/cees/student/deleteBatch', deleteBatch = '/cees/student/deleteBatch',
importExcel = '/cees/student/importExcel', importExcel = '/cees/student/importExcel',
exportXls = '/cees/student/exportXls', exportXls = '/cees/student/exportXls',
updateGroupUser = '/cees/ceesGroup/updateGroupUser',
} }
//获取分组
export const getGroup = () =>
defHttp.get({url: '/cees/ceesGroup/list'}).then((res) => {
return res.records;
});
/** /**
* api * api
* @param params * @param params
@ -61,21 +54,11 @@ export const batchDelete = (params, handleSuccess) => {
} }
}); });
} }
//更新分组中间表
export const updateGroupUser = (params) => {
return defHttp.post({url: Api.updateGroupUser, params});
}
/** /**
* *
* @param params * @param params
*/ */
export const saveOrUpdate = (params, isUpdate) => { export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save; let url = isUpdate ? Api.edit : Api.save;
// 更新分组中间表
const groupUserParams = {
userId: params.userId,
groupId: params.groupId
}
updateGroupUser(groupUserParams);
return defHttp.post({url: url, params}); return defHttp.post({url: url, params});
} }

View File

@ -1,10 +1,7 @@
import { BasicColumn } from '/@/components/Table'; import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table'; import { FormSchema } from '/@/components/Table';
import { rules } from '/@/utils/helper/validator'; import { rules } from '/@/utils/helper/validator';
import { ref, onMounted,reactive } from 'vue';
import { render } from '/@/utils/common/renderUtils'; import { render } from '/@/utils/common/renderUtils';
import {defHttp} from '/@/utils/http/axios';
import { getOption } from 'showdown';
// 学科映射 // 学科映射
const majorMap = { const majorMap = {
@ -13,13 +10,7 @@ const majorMap = {
7: '历史', 7: '历史',
8: '政治', 8: '政治',
}; };
const groupOptions=ref()
// 创建一个简单的事件总线
export const updateGroupOptions = reactive({
updateGroupOptions(newOptions: any) {
groupOptions.value = newOptions;
},
});
// 根据 majorId 获取学科名称 // 根据 majorId 获取学科名称
const isMajor = (majorId) => { const isMajor = (majorId) => {
return majorMap[majorId] || '未知学科'; return majorMap[majorId] || '未知学科';
@ -27,9 +18,9 @@ const isMajor = (majorId) => {
// 学科过滤方法 // 学科过滤方法
const filterMajor = (value, row) => { const filterMajor = (value, row) => {
console.log(value, row); // 打印过滤值和行数据
return row === value; return row === value;
}; };
//列表数据 //列表数据
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
@ -72,16 +63,7 @@ export const columns: BasicColumn[] = [
{ {
title: '所属分组', title: '所属分组',
align: 'center', align: 'center',
customRender: ({ text }) => { dataIndex: 'groupId',
if (!groupOptions.value) {
return '加载中...'; // 如果未加载,显示加载中
}
const group = groupOptions.value.find(item => item.value === text.groupId);
if (group) {
return group.label;
}
return '未知分组';
},
}, },
{ {
title: '是否第一次阅卷', title: '是否第一次阅卷',
@ -191,17 +173,7 @@ export const formSchema: FormSchema[] = [
// return [{ required: true, message: '请选择是否第一次阅卷!' }]; // return [{ required: true, message: '请选择是否第一次阅卷!' }];
//}, //},
}, },
{
label: '所属分组',
field: 'groupId',
component: 'Select',
componentProps: {
options: groupOptions, // 动态设置分组选项
},
dynamicRules: ({ model, schema }) => {
return [{ required: true, message: '请选择分组!' }];
},
},
//{ //{
// label: '使用次数', // label: '使用次数',
// field: 'numberuse', // field: 'numberuse',

View File

@ -16,7 +16,8 @@
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</template> </template>
<a-button>批量操作 <a-button
>批量操作
<Icon icon="mdi:chevron-down" /> <Icon icon="mdi:chevron-down" />
</a-button> </a-button>
</a-dropdown> </a-dropdown>
@ -48,161 +49,145 @@
</template> </template>
<script lang="ts" name="cees-student" setup> <script lang="ts" name="cees-student" setup>
import { ref, reactive, computed, unref, onMounted } from 'vue'; import { ref, reactive, computed, unref } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage'; import { useListPage } from '/@/hooks/system/useListPage';
import StudentModal from './components/StudentModal.vue'; import StudentModal from './components/StudentModal.vue';
import { columns, searchFormSchema, superQuerySchema, updateGroupOptions } from './Student.data'; import { columns, searchFormSchema, superQuerySchema } from './Student.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, getGroup } from './Student.api'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Student.api';
import { downloadFile } from '/@/utils/common/renderUtils'; import { downloadFile } from '/@/utils/common/renderUtils';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import { defHttp } from '/@/utils/http/axios'; const queryParam = reactive<any>({});
const queryParam = reactive<any>({}); const checkedKeys = ref<Array<string | number>>([]);
const checkedKeys = ref<Array<string | number>>([]); const userStore = useUserStore();
const userStore = useUserStore(); //model
//model const [registerModal, { openModal }] = useModal();
const [registerModal, { openModal }] = useModal(); //table
//table const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: {
tableProps: { title: '研究生表',
title: '研究生表', api: list,
api: list, columns,
columns, canResize: false,
canResize: false, formConfig: {
formConfig: { //labelWidth: 120,
//labelWidth: 120, schemas: searchFormSchema,
schemas: searchFormSchema, autoSubmitOnEnter: true,
autoSubmitOnEnter: true, showAdvancedButton: true,
showAdvancedButton: true, fieldMapToNumber: [],
fieldMapToNumber: [], fieldMapToTime: [],
fieldMapToTime: [], },
}, actionColumn: {
actionColumn: { width: 120,
width: 120, fixed: 'right',
fixed: 'right', },
}, beforeFetch: (params) => {
beforeFetch: (params) => { return Object.assign(params, queryParam);
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: '研究生表',
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess,
},
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
//
const groupOptions = ref<{ label: string; value: number }[]>([]);
onMounted(async () => {
try {
const res = await getGroup();
groupOptions.value = res.map((group) => ({
label: group.name, // name
value: group.id, // ID id
}));
updateGroupOptions.updateGroupOptions(groupOptions.value);
} catch (error) {
console.error('获取分组数据失败:', error);
}
});
//
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
}, },
}, },
]; exportConfig: {
} name: '研究生表',
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess,
},
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
//
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
},
];
}
</script> </script>
<style scoped></style> <style scoped></style>

View File

@ -11,14 +11,7 @@ enum Api {
deleteBatch = '/cees/ceesWaiTeacher/deleteBatch', deleteBatch = '/cees/ceesWaiTeacher/deleteBatch',
importExcel = '/cees/ceesWaiTeacher/importExcel', importExcel = '/cees/ceesWaiTeacher/importExcel',
exportXls = '/cees/ceesWaiTeacher/exportXls', exportXls = '/cees/ceesWaiTeacher/exportXls',
updateGroupUser = '/cees/ceesGroup/updateGroupUser',
} }
//获取分组
export const getGroup = () =>
defHttp.get({url: '/cees/ceesGroup/list'}).then((res) => {
return res.records;
});
/** /**
* api * api
* @param params * @param params
@ -61,22 +54,11 @@ export const batchDelete = (params, handleSuccess) => {
} }
}); });
} }
//更新分组中间表
export const updateGroupUser = (params) => {
return defHttp.post({url: Api.updateGroupUser, params});
}
/** /**
* *
* @param params * @param params
*/ */
export const saveOrUpdate = (params, isUpdate) => { export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save; let url = isUpdate ? Api.edit : Api.save;
// 更新分组中间表
const groupUserParams = {
userId: params.userId,
groupId: params.groupId
}
updateGroupUser(groupUserParams);
return defHttp.post({url: url, params}); return defHttp.post({url: url, params});
} }

View File

@ -8,17 +8,6 @@ const filterMajor = (value, row) => {
console.log(value, row); // 打印过滤值和行数据 console.log(value, row); // 打印过滤值和行数据
return row === value; return row === value;
}; };
import { ref, onMounted,reactive } from 'vue';
const groupOptions=ref()
// 创建一个简单的事件总线
export const updateGroupOptions = reactive({
updateGroupOptions(newOptions: any) {
groupOptions.value = newOptions;
},
});
//列表数据 //列表数据
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
@ -73,14 +62,7 @@ export const columns: BasicColumn[] = [
{ {
title: '所属分组', title: '所属分组',
align: 'center', align: 'center',
//dataIndex: 'groupId', dataIndex: 'groupId',
customRender: ({ text }) => {
const group = groupOptions.value.find(item => item.value === text.groupId);
if (group) {
return group.label;
}
return '未知分组';
},
}, },
{ {
title: '住宿信息', title: '住宿信息',
@ -329,17 +311,6 @@ export const formSchema: FormSchema[] = [
// return [{ required: true, message: '请输入是否住宿!' }]; // return [{ required: true, message: '请输入是否住宿!' }];
//}, //},
}, },
{
label: '所属分组',
field: 'groupId',
component: 'Select',
componentProps: {
options: groupOptions, // 动态设置分组选项
},
dynamicRules: ({ model, schema }) => {
return [{ required: true, message: '请选择分组!' }];
},
},
{ {
label: '车辆是否入校', label: '车辆是否入校',
field: 'carStatus', field: 'carStatus',
@ -350,11 +321,10 @@ export const formSchema: FormSchema[] = [
{ label: '否', value: 1 }, { label: '否', value: 1 },
], ],
}, },
}
//dynamicRules: ({ model, schema }) => { //dynamicRules: ({ model, schema }) => {
// return [{ required: true, message: '请输入车辆是否入校!' }]; // return [{ required: true, message: '请输入车辆是否入校!' }];
//}, //},
},
//{ //{
// label: '住宿信息', // label: '住宿信息',
// field: 'dormitory', // field: 'dormitory',

View File

@ -1,8 +1,15 @@
<template> <template>
<div> <div>
<!--引用表格--> <!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection" ref="tableRef" :expandedRowKeys="expandedKeys" <BasicTable
rowKey="id" :expandedRowRender="renderExpandedRow" @expand="handleExpand"> @register="registerTable"
:rowSelection="rowSelection"
ref="tableRef"
:expandedRowKeys="expandedKeys"
rowKey="id"
:expandedRowRender="renderExpandedRow"
@expand="handleExpand"
>
<!--插槽:table标题--> <!--插槽:table标题-->
<template #tableTitle> <template #tableTitle>
<a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
@ -17,7 +24,8 @@
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</template> </template>
<a-button>批量操作 <a-button
>批量操作
<Icon icon="mdi:chevron-down" /> <Icon icon="mdi:chevron-down" />
</a-button> </a-button>
</a-dropdown> </a-dropdown>
@ -57,192 +65,173 @@
</template> </template>
<script lang="tsx" name="cees-ceesWaiTeacher" setup> <script lang="tsx" name="cees-ceesWaiTeacher" setup>
import { ref, reactive, computed, unref, onMounted } from 'vue'; import { ref, reactive, computed, unref } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage'; import { useListPage } from '/@/hooks/system/useListPage';
import CeesWaiTeacherModal from './components/CeesWaiTeacherModal.vue'; import CeesWaiTeacherModal from './components/CeesWaiTeacherModal.vue';
import { columns, searchFormSchema, superQuerySchema, updateGroupOptions } from './CeesWaiTeacher.data'; import { columns, searchFormSchema, superQuerySchema } from './CeesWaiTeacher.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, getGroup } from './CeesWaiTeacher.api'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './CeesWaiTeacher.api';
import { downloadFile } from '/@/utils/common/renderUtils'; import { downloadFile } from '/@/utils/common/renderUtils';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
const queryParam = reactive<any>({}); const queryParam = reactive<any>({});
const checkedKeys = ref<Array<string | number>>([]); const checkedKeys = ref<Array<string | number>>([]);
const userStore = useUserStore(); const userStore = useUserStore();
//model //model
const [registerModal, { openModal }] = useModal(); const [registerModal, { openModal }] = useModal();
//table //table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: { tableProps: {
title: '外校老师管理', title: '外校老师管理',
api: list, api: list,
columns, columns,
canResize: false, canResize: false,
formConfig: { formConfig: {
//labelWidth: 120, //labelWidth: 120,
schemas: searchFormSchema, schemas: searchFormSchema,
autoSubmitOnEnter: true, autoSubmitOnEnter: true,
showAdvancedButton: true, showAdvancedButton: true,
fieldMapToNumber: [['majorId', ['majorId_begin', 'majorId_end']]], fieldMapToNumber: [['majorId', ['majorId_begin', 'majorId_end']]],
fieldMapToTime: [], fieldMapToTime: [],
}, },
actionColumn: { actionColumn: {
width: 120, width: 120,
fixed: 'right', fixed: 'right',
}, },
beforeFetch: (params) => { beforeFetch: (params) => {
return Object.assign(params, queryParam); return Object.assign(params, queryParam);
},
},
exportConfig: {
name: '外校老师管理',
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess,
},
});
// rowKey key
const expandedKeys = ref<string[]>(['1']); //
//
const renderExpandedRow = (record: Record<string, any>) => {
return (
<a-descriptions column = { 2} >
<a-descriptions - item label = "身份证号" > { record.record.identityId } </a-descriptions-item>
< a - descriptions - item label = "银行卡号" > { record.record.pyCard } </a-descriptions-item>
< a - descriptions - item label = "工作单位" > { record.record.workName } </a-descriptions-item>
< a - descriptions - item label = "开户所在地" > { record.record.bankAddress } </a-descriptions-item>
< a - descriptions - item label = "单位电话" > { record.record.workPhone } </a-descriptions-item>
< a - descriptions - item label = "开户行" > { record.record.bankName } </a-descriptions-item>
< a - descriptions - item label = "车牌号" > { record.record.carNumber } </a-descriptions-item>
< a - descriptions - item label = "饭卡号" > { record.record.mealCard } </a-descriptions-item>
</a-descriptions>
);
};
// / expandedKeys
const handleExpand = (expanded: boolean, record: Record<string, any>) => {
console.log('展开/收起', expanded, record);
if (expanded) {
if (!expandedKeys.value.includes(record.id)) {
expandedKeys.value.push(record.id);
}
} else {
expandedKeys.value = expandedKeys.value.filter((key) => key !== record.id);
}
};
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
//
const groupOptions = ref<{ label: string; value: number }[]>([]);
onMounted(async () => {
console.log('组件已加载');
try {
const res = await getGroup();
console.log('获取分组数据成功:', res);
groupOptions.value = res.map((group) => ({
label: group.name, // name
value: group.id, // ID id
}));
console.log('分组数据:', groupOptions.value);
updateGroupOptions.updateGroupOptions(groupOptions.value)
} catch (error) {
console.error('获取分组数据失败:', error);
}
});
//
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
}, },
}, },
]; exportConfig: {
} name: '外校老师管理',
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess,
},
});
// rowKey key
const expandedKeys = ref<string[]>(['1']); //
//
const renderExpandedRow = (record: Record<string, any>) => {
return (
<a-descriptions column={2}>
<a-descriptions-item label="身份证号">{record.record.identityId}</a-descriptions-item>
<a-descriptions-item label="银行卡号">{record.record.pyCard}</a-descriptions-item>
<a-descriptions-item label="工作单位">{record.record.workName}</a-descriptions-item>
<a-descriptions-item label="开户所在地">{record.record.bankAddress}</a-descriptions-item>
<a-descriptions-item label="单位电话">{record.record.workPhone}</a-descriptions-item>
<a-descriptions-item label="开户行">{record.record.bankName}</a-descriptions-item>
<a-descriptions-item label="车牌号">{record.record.carNumber}</a-descriptions-item>
<a-descriptions-item label="饭卡号">{record.record.mealCard}</a-descriptions-item>
</a-descriptions>
);
};
// / expandedKeys
const handleExpand = (expanded: boolean, record: Record<string, any>) => {
console.log('展开/收起', expanded, record);
if (expanded) {
if (!expandedKeys.value.includes(record.id)) {
expandedKeys.value.push(record.id);
}
} else {
expandedKeys.value = expandedKeys.value.filter((key) => key !== record.id);
}
};
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
//
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
},
];
}
</script> </script>
<style scoped></style> <style scoped></style>