From 84a94783ba79ecdce9b9a854f230465830bc8c46 Mon Sep 17 00:00:00 2001
From: Qi <3194726156@qq.com>
Date: Mon, 9 Jun 2025 22:54:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cees/group/CeesGroup.data.ts        |  70 ++---
 src/views/cees/group/CeesGroupList.vue        | 296 +++++++++---------
 .../cees/group/components/CeesGroupForm.vue   | 124 ++++----
 .../cees/group/components/CeesGroupModal.vue  | 110 +++----
 4 files changed, 296 insertions(+), 304 deletions(-)

diff --git a/src/views/cees/group/CeesGroup.data.ts b/src/views/cees/group/CeesGroup.data.ts
index a18e62a..650a326 100644
--- a/src/views/cees/group/CeesGroup.data.ts
+++ b/src/views/cees/group/CeesGroup.data.ts
@@ -1,17 +1,17 @@
-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();
 
 export const columns: BasicColumn[] = [
-   {
+  {
     title: '组名',
-    align:"center",
+    align: 'center',
     dataIndex: 'name',
-    width: 150
-   },
+    width: 150,
+  },
   // {
   //  title: '分组',
   //  align: 'center',
@@ -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,11 +82,9 @@ export const formSchema: FormSchema[] = [
     label: '组名',
     field: 'name',
     component: 'Input',
-    dynamicRules: ({model,schema}) => {
-          return [
-                 { required: true, message: '请输入分组名!'},
-          ];
-     },
+    dynamicRules: ({ model, schema }) => {
+      return [{ required: true, message: '请输入分组名!' }];
+    },
   },
   {
     label: '学科',
@@ -100,40 +98,42 @@ 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: '评卷地点',
     field: 'markingLocation',
     component: 'Input',
   },
-	// TODO 主键隐藏字段，目前写死为ID
-	{
-	  label: '',
-	  field: 'id',
-	  component: 'Input',
-	  show: false
-	},
+  // 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',},
+  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;
-}
\ No newline at end of file
+}
diff --git a/src/views/cees/group/CeesGroupList.vue b/src/views/cees/group/CeesGroupList.vue
index 6134857..c629414 100644
--- a/src/views/cees/group/CeesGroupList.vue
+++ b/src/views/cees/group/CeesGroupList.vue
@@ -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,165 +31,159 @@
 </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({
-  tableProps: {
-    title: '分组表',
-    api: list,
-    columns,
-    canResize: false,
-    formConfig: {
-      //labelWidth: 120,
-      schemas: searchFormSchema,
-      autoSubmitOnEnter: true,
-      showAdvancedButton: true,
-      fieldMapToNumber: [
-      ],
-      fieldMapToTime: [
-      ],
+  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,
+      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);
+      },
     },
-    actionColumn: {
-      width: 120,
-      fixed: 'right'
+    exportConfig: {
+      name: '分组表',
+      url: getExportUrl,
+      params: queryParam,
     },
-    beforeFetch: (params) => {
-      return Object.assign(params, queryParam);
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
     },
-  },
-  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() {
-  if (selectedRowKeys.value.length < 1) {
-    message.warning('请至少选择一个用户！');
-    return;
+
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
   }
-  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-}
-/**
- * 成功回调
- */
-function handleSuccess() {
-  (selectedRowKeys.value = []) && 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() {
+    if (selectedRowKeys.value.length < 1) {
+      message.warning('请至少选择一个用户！');
+      return;
+    }
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+  /**
    * 操作栏
    */
-function getTableAction(record) {
-  const actions = [
-    {
-      label: '编辑',
-      onClick: handleEdit.bind(null, record),
-    },
-  ];
+  function getTableAction(record) {
+    const actions = [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
 
-  return actions;
-}
-/**
+    return actions;
+  }
+  /**
    * 下拉操作栏
    */
-function getDropDownAction(record) {
-  return [
-    {
-      label: '详情',
-      onClick: handleDetail.bind(null, record),
-    },
-    {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-        placement: 'topLeft',
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
       },
-      ifShow: () => {
-        return hasPermission('group:delete');
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+        ifShow: () => {
+          return hasPermission('group:delete');
+        },
       },
-    },
-  ];
-}
-
-
+    ];
+  }
 </script>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped></style>
diff --git a/src/views/cees/group/components/CeesGroupForm.vue b/src/views/cees/group/components/CeesGroupForm.vue
index dd7caa3..c758185 100644
--- a/src/views/cees/group/components/CeesGroupForm.vue
+++ b/src/views/cees/group/components/CeesGroupForm.vue
@@ -1,70 +1,70 @@
 <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 style="min-height: 400px">
+    <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 { 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}
-            });
+  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';
 
-            const formDisabled = computed(()=>{
-                if(props.formData.disabled === false){
-                    return false;
-                }
-                return true;
-            });
+  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 },
+      });
 
-            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,
-            }
+      const formDisabled = computed(() => {
+        if (props.formData.disabled === false) {
+          return false;
         }
-    });
-</script>
\ No newline at end of file
+        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>
diff --git a/src/views/cees/group/components/CeesGroupModal.vue b/src/views/cees/group/components/CeesGroupModal.vue
index 31bf248..8f89bd0 100644
--- a/src/views/cees/group/components/CeesGroupModal.vue
+++ b/src/views/cees/group/components/CeesGroupModal.vue
@@ -1,66 +1,66 @@
 <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';
-    // 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});
-        }
+  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-input-number) {
+    width: 100%;
+  }
 
-	:deep(.ant-calendar-picker){
-		width: 100%
-	}
-</style>
\ No newline at end of file
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>