Big-Data-Lab
/
CEES-manage
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分组优化

This commit is contained in:
Qi 2025-06-09 22:54:03 +08:00
parent 02df9af20b
commit 84a94783ba
4 changed files with 296 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/views/cees/group/CeesGroup.data.ts
View File

@ -1,6 +1,6 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table';
import { rules } from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import { usePermission } from '/@/hooks/web/usePermission';
const { hasPermission } = usePermission();
@ -8,9 +8,9 @@ const { hasPermission } = usePermission();
export const columns: BasicColumn[] = [
{
title: '组名',
align:"center",
align: 'center',
dataIndex: 'name',
width: 150
width: 150,
},
// {
// title: '分组',
@ -36,10 +36,10 @@ export const columns: BasicColumn[] = [
},
{
title: '评卷地点',
align: "center",
align: 'center',
dataIndex: 'markingLocation',
width: 200
}
width: 200,
},
// {
// title: '专业id',
// align:"center",
@ -74,7 +74,7 @@ export const searchFormSchema: FormSchema[] = [
label: '评卷地点',
field: 'markingLocation',
component: 'Input',
}
},
];
//表单数据
export const formSchema: FormSchema[] = [
@ -82,10 +82,8 @@ export const formSchema: FormSchema[] = [
label: '组名',
field: 'name',
component: 'Input',
dynamicRules: ({model,schema}) => {
return [
{ required: true, message: '请输入分组名!'},
];
dynamicRules: ({ model, schema }) => {
return [{ required: true, message: '请输入分组名!' }];
},
},
{
@ -100,14 +98,16 @@ export const formSchema: FormSchema[] = [
{ label: '政治', value: 8 },
],
},
dynamicRules: ({model,schema}) => {
return [
{ required: true, message: '请选择学科!'},
];
dynamicRules: ({ model, schema }) => {
if (!hasPermission('majorId:edit')) {
// 没有权限，不添加校验规则
return [];
}
return [{ required: true, message: '请选择学科!' }];
},
show: ({ values }) => {
return hasPermission('majorId:edit');
}
},
},
{
label: '评卷地点',
@ -119,21 +119,21 @@ export const formSchema: FormSchema[] = [
label: '',
field: 'id',
component: 'Input',
show: false
show: false,
},
];
// 高级查询数据
export const superQuerySchema = {
name: {title: '组名',order: 0,view: 'text', type: 'string',},
majorId: {title: '专业id',order: 1,view: 'number', type: 'number',},
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
* @param param
*/
export function getBpmFormSchema(_formData): FormSchema[] {
// 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
return formSchema;
}

128
src/views/cees/group/CeesGroupList.vue
View File

@ -7,8 +7,7 @@
<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-button type="primary" @click="batchHandleDelete" v-if="hasPermission('group:batchDelete')">批量删除
</a-button>
<a-button type="primary" @click="batchHandleDelete" v-if="hasPermission('group:batchDelete')">批量删除 </a-button>
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
</template>
@ -20,11 +19,10 @@
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
</template>
<!--字段回显插槽-->
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
<template #bodyCell="{ column, record, index, text }"> </template>
</BasicTable>
<!-- 表单区域 -->
<CeesGroupModal @register="registerModal" @success="handleSuccess"></CeesGroupModal>
<CeesGroupModal @register="registerModal" @success="handleSuccess" />
<!-- 分组对话框 -->
<!--<CeesGroupTransferModal v-model:visible="groupDialogVisible" :groupDialogTitle="groupDialogTitle"
:groupTitle="groupTitle" :dataSource="transferData" show-search @search="handleSearch" :targetKeys="targetKeys"
@ -33,27 +31,27 @@
</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 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, addGroupMembers, removeGroupMembers } from './CeesGroup.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import { useUserStore } from '/@/store/modules/user';
import { usePermission } from '/@/hooks/web/usePermission';
import { message } from 'ant-design-vue';
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, addGroupMembers, removeGroupMembers } from './CeesGroup.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import { useUserStore } from '/@/store/modules/user';
import { usePermission } from '/@/hooks/web/usePermission';
import { message } from 'ant-design-vue';
const { hasPermission } = usePermission();
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({
const { hasPermission } = usePermission();
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,
@ -64,101 +62,97 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
schemas: searchFormSchema,
autoSubmitOnEnter: true,
showAdvancedButton: true,
fieldMapToNumber: [
],
fieldMapToTime: [
],
fieldMapToNumber: [],
fieldMapToTime: [],
},
actionColumn: {
width: 120,
fixed: 'right'
fixed: 'right',
},
beforeFetch: (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: "分组表",
name: '分组表',
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
success: handleSuccess,
},
})
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
reload();
}
/**
}
/**
* 新增事件
*/
function handleAdd() {
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
/**
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
*/
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: false,
});
}
/**
}
/**
* 删除事件
*/
async function handleDelete(record) {
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
async function batchHandleDelete() {
if (selectedRowKeys.value.length < 1) {
message.warning('请至少选择一个用户！');
return;
}
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
}
/**
* 成功回调
*/
function handleSuccess() {
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
}
/**
* 操作栏
*/
function getTableAction(record) {
function getTableAction(record) {
const actions = [
{
label: '编辑',
@ -167,11 +161,11 @@ function getTableAction(record) {
];
return actions;
}
/**
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
function getDropDownAction(record) {
return [
{
label: '详情',
@ -189,9 +183,7 @@ function getDropDownAction(record) {
},
},
];
}
}
</script>
<style scoped></style>

48
src/views/cees/group/components/CeesGroupForm.vue
View File

@ -1,39 +1,39 @@
<template>
<div style="min-height: 400px">
<BasicForm @register="registerForm"></BasicForm>
<div style="width: 100%;text-align: center" v-if="!formDisabled">
<BasicForm @register="registerForm" />
<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 { 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';
import { getBpmFormSchema } from '../CeesGroup.data';
import { saveOrUpdate } from '../CeesGroup.api';
export default defineComponent({
name: "CeesGroupForm",
components:{
BasicForm
name: 'CeesGroupForm',
components: {
BasicForm,
},
props:{
props: {
formData: propTypes.object.def({}),
formBpm: propTypes.bool.def(true),
},
setup(props){
setup(props) {
const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
labelWidth: 150,
schemas: getBpmFormSchema(props.formData),
showActionButtonGroup: false,
baseColProps: {span: 24}
baseColProps: { span: 24 },
});
const formDisabled = computed(()=>{
if(props.formData.disabled === false){
const formDisabled = computed(() => {
if (props.formData.disabled === false) {
return false;
}
return true;
@ -41,21 +41,21 @@
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}
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})
await setProps({ disabled: formDisabled.value });
}
async function submitForm() {
let data = getFieldsValue();
let params = Object.assign({}, formData, data);
console.log('表单数据', params)
await saveOrUpdate(params, true)
console.log('表单数据', params);
await saveOrUpdate(params, true);
}
initFormData();
@ -64,7 +64,7 @@
registerForm,
formDisabled,
submitForm,
}
}
};
},
});
</script>

36
src/views/cees/group/components/CeesGroupModal.vue
View File

@ -1,30 +1,30 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
<BasicForm @register="registerForm"/>
<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';
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 emit = defineEmits(['register', 'success']);
const isUpdate = ref(true);
//表单配置
const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
const [registerForm, { setProps, resetFields, setFieldsValue, validate }] = useForm({
//labelWidth: 150,
schemas: formSchema,
showActionButtonGroup: false,
baseColProps: {span: 24}
baseColProps: { span: 24 },
});
//表单赋值
const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
//重置表单
await resetFields();
setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
setModalProps({ confirmLoading: false, showCancelBtn: !!data?.showFooter, showOkBtn: !!data?.showFooter });
isUpdate.value = !!data?.isUpdate;
if (unref(isUpdate)) {
//表单赋值
@ -33,7 +33,7 @@
});
}
// 隐藏底部时禁用整个表单
setProps({ disabled: !data?.showFooter })
setProps({ disabled: !data?.showFooter });
});
//设置标题
const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
@ -41,7 +41,7 @@
async function handleSubmit(v) {
try {
let values = await validate();
setModalProps({confirmLoading: true});
setModalProps({ confirmLoading: true });
//提交表单
await saveOrUpdate(values, isUpdate.value);
//关闭弹窗
@ -49,18 +49,18 @@
//刷新列表
emit('success');
} finally {
setModalProps({confirmLoading: false});
setModalProps({ confirmLoading: false });
}
}
</script>
<style lang="less" scoped>
/** 时间和数字输入框样式 */
:deep(.ant-input-number){
width: 100%
:deep(.ant-input-number) {
width: 100%;
}
:deep(.ant-calendar-picker){
width: 100%
:deep(.ant-calendar-picker) {
width: 100%;
}
</style>