diff --git a/src/api/infra/module/index.ts b/src/api/infra/module/index.ts
new file mode 100644
index 000000000..21b53aa73
--- /dev/null
+++ b/src/api/infra/module/index.ts
@@ -0,0 +1,42 @@
+import request from '@/config/axios'
+
+// 模块-阶段管理 VO
+export interface ModuleVO {
+  id: number // 主键Id
+  moduleName: string // 模块名称
+  stage: string // 阶段
+  revision: number // 乐观锁
+}
+
+// 模块-阶段管理 API
+export const ModuleApi = {
+  // 查询模块-阶段管理分页
+  getModulePage: async (params: any) => {
+    return await request.get({ url: `/infra/module/page`, params })
+  },
+
+  // 查询模块-阶段管理详情
+  getModule: async (id: number) => {
+    return await request.get({ url: `/infra/module/get?id=` + id })
+  },
+
+  // 新增模块-阶段管理
+  createModule: async (data: ModuleVO) => {
+    return await request.post({ url: `/infra/module/create`, data })
+  },
+
+  // 修改模块-阶段管理
+  updateModule: async (data: ModuleVO) => {
+    return await request.put({ url: `/infra/module/update`, data })
+  },
+
+  // 删除模块-阶段管理
+  deleteModule: async (id: number) => {
+    return await request.delete({ url: `/infra/module/delete?id=` + id })
+  },
+
+  // 导出模块-阶段管理 Excel
+  exportModule: async (params) => {
+    return await request.download({ url: `/infra/module/export-excel`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/api/infra/modulefile/index.ts b/src/api/infra/modulefile/index.ts
new file mode 100644
index 000000000..6d4e33cd2
--- /dev/null
+++ b/src/api/infra/modulefile/index.ts
@@ -0,0 +1,45 @@
+import request from '@/config/axios'
+
+// 模块文件管理 VO
+export interface ModuleFileVO {
+  id: number // 主键Id
+  fileName: string // 文件名称
+  fileType: string // 文件类型
+  revision: number // 乐观锁
+  moduleId: number // 模块id
+  required: boolean // 是否为必传
+  fileSize: number // 文件大小
+}
+
+// 模块文件管理 API
+export const ModuleFileApi = {
+  // 查询模块文件管理分页
+  getModuleFilePage: async (params: any) => {
+    return await request.get({ url: `/infra/module-file/page`, params })
+  },
+
+  // 查询模块文件管理详情
+  getModuleFile: async (id: number) => {
+    return await request.get({ url: `/infra/module-file/get?id=` + id })
+  },
+
+  // 新增模块文件管理
+  createModuleFile: async (data: ModuleFileVO) => {
+    return await request.post({ url: `/infra/module-file/create`, data })
+  },
+
+  // 修改模块文件管理
+  updateModuleFile: async (data: ModuleFileVO) => {
+    return await request.put({ url: `/infra/module-file/update`, data })
+  },
+
+  // 删除模块文件管理
+  deleteModuleFile: async (id: number) => {
+    return await request.delete({ url: `/infra/module-file/delete?id=` + id })
+  },
+
+  // 导出模块文件管理 Excel
+  exportModuleFile: async (params) => {
+    return await request.download({ url: `/infra/module-file/export-excel`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/api/patents/patents/index.ts b/src/api/patents/patents/index.ts
index c55b1888b..ace511982 100644
--- a/src/api/patents/patents/index.ts
+++ b/src/api/patents/patents/index.ts
@@ -50,10 +50,27 @@ export const MainApi = {
     return await request.download({ url: `/patents/main/export-excel`, params })
   },
 
+  //审核
+  auditPatent:  async (data: MainVO) => {
+    return await request.post({ url: `/patents/main/auditPatent`, data })
+  },
+  //提报
+  presentingPatent:  async (params: any) => {
+    return await request.post({ url: `/patents/main/presentingPatent`, params })
+  },
+  //审核记录
+  getAuditList:  async (params) => {
+    return await request.get({ url: `/patents/main/getAuditList`, params })
+  },
+  // 成文
+  generateDoc: async (id: number)=>{
+    return await request.download({ url: `/patents/main/generate-doc?id=` + id })
+  },
+
 // ==================== 子表（专利信息） ====================
 
   // 获得专利信息列表
   getInfoListByPatentsId: async (patentsId) => {
     return await request.get({ url: `/patents/main/info/list-by-patents-id?patentsId=` + patentsId })
   },
-}
\ No newline at end of file
+}
diff --git a/src/api/publicLab/equip/index.ts b/src/api/publicLab/equip/index.ts
new file mode 100644
index 000000000..fe69b0957
--- /dev/null
+++ b/src/api/publicLab/equip/index.ts
@@ -0,0 +1,42 @@
+import request from '@/config/axios'
+
+// 实验室设备 VO
+export interface LabEquipmentVO {
+  id: number // 主键ID
+  labId: number // 实验室ID
+  equipmentName: string // 设备名称
+  revision: number // 乐观锁
+}
+
+// 实验室设备 API
+export const LabEquipmentApi = {
+  // 查询实验室设备分页
+  getLabEquipmentPage: async (params: any) => {
+    return await request.get({ url: `/lab-equipment/page`, params })
+  },
+
+  // 查询实验室设备详情
+  getLabEquipment: async (id: number) => {
+    return await request.get({ url: `/lab-equipment/get?id=` + id })
+  },
+
+  // 新增实验室设备
+  createLabEquipment: async (data: LabEquipmentVO) => {
+    return await request.post({ url: `/lab-equipment/create`, data })
+  },
+
+  // 修改实验室设备
+  updateLabEquipment: async (data: LabEquipmentVO) => {
+    return await request.put({ url: `/lab-equipment/update`, data })
+  },
+
+  // 删除实验室设备
+  deleteLabEquipment: async (id: number) => {
+    return await request.delete({ url: `/lab-equipment/delete?id=` + id })
+  },
+
+  // 导出实验室设备 Excel
+  exportLabEquipment: async (params) => {
+    return await request.download({ url: `/lab-equipment/export-excel`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/api/publicLab/lab/index.ts b/src/api/publicLab/lab/index.ts
new file mode 100644
index 000000000..b49852d89
--- /dev/null
+++ b/src/api/publicLab/lab/index.ts
@@ -0,0 +1,48 @@
+import request from '@/config/axios'
+
+// 公共实验室 VO
+export interface LabVO {
+  id: number // 主键ID
+  labName: string // 实验室名称
+  revision: number // 乐观锁
+}
+
+// 公共实验室 API
+export const LabApi = {
+  // 查询公共实验室分页
+  getLabPage: async (params: any) => {
+    return await request.get({ url: `/Lab/page`, params })
+  },
+
+  // 查询公共实验室详情
+  getLab: async (id: number) => {
+    return await request.get({ url: `/Lab/get?id=` + id })
+  },
+
+  // 新增公共实验室
+  createLab: async (data: LabVO) => {
+    return await request.post({ url: `/Lab/create`, data })
+  },
+
+  // 修改公共实验室
+  updateLab: async (data: LabVO) => {
+    return await request.put({ url: `/Lab/update`, data })
+  },
+
+  // 删除公共实验室
+  deleteLab: async (id: number) => {
+    return await request.delete({ url: `/Lab/delete?id=` + id })
+  },
+
+  // 导出公共实验室 Excel
+  exportLab: async (params) => {
+    return await request.download({ url: `/Lab/export-excel`, params })
+  },
+
+  // ==================== 子表（实验室设备） ====================
+
+  // 获得实验室设备列表
+  getLabEquipmentListByLabId: async (labId) => {
+    return await request.get({ url: `/Lab/lab-equipment/list-by-lab-id?labId=` + labId })
+  }
+}
\ No newline at end of file
diff --git a/src/api/publicLab/publicLab/index.ts b/src/api/publicLab/publicLab/index.ts
index 33d73b191..c3ddaa7ea 100644
--- a/src/api/publicLab/publicLab/index.ts
+++ b/src/api/publicLab/publicLab/index.ts
@@ -14,6 +14,8 @@ export interface VO {
   deptId: number // 单位ID
   deptName: string // 单位名称
   revision: number // 乐观锁
+  checkout: string // 归还
+  state: number // 归还状态
 }
 
 // 公共实验室信 API
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 2dd5e0f30..79a51c3b8 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -54,7 +54,8 @@ export default {
     updateTime: '更新时间',
     copy: '复制',
     copySuccess: '复制成功',
-    copyError: '复制失败'
+    copyError: '复制失败',
+    checkoutSuccess: '归还成功',
   },
   lock: {
     lockScreen: '锁定屏幕',
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index f63bee6e4..a77fdc276 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -128,6 +128,54 @@ const remainingRouter: AppRouteRecordRaw[] = [
     ]
   },
 
+  {
+    path: '/lab',
+    component: Layout,
+    name: 'llab',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: 'equip/:labId',
+        component: () => import('@/views/publicLab/publicLab/equip/index.vue'),
+        name: 'eequip',
+        meta: {
+          title: '设备管理',
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          icon: '',
+          activeMenu: '/publicLab/lab'
+        }
+      }
+    ]
+  },
+
+  {
+    path: '/module-file',
+    component: Layout,
+    name: 'modulefile',
+    meta: {
+      hidden: true
+    },
+    children: [
+      {
+        path: 'file/:moduleId',
+        component: () => import('@/views/infra/modulefile/file/index.vue'),
+        name: 'modulefile-file',
+        meta: {
+          title: '文件管理',
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          icon: '',
+          activeMenu: '/infra/module-file'
+        }
+      }
+    ]
+  },
+
   {
     path: '/codegen',
     component: Layout,
diff --git a/src/views/infra/modulefile/ModuleForm.vue b/src/views/infra/modulefile/ModuleForm.vue
new file mode 100644
index 000000000..e211b4a68
--- /dev/null
+++ b/src/views/infra/modulefile/ModuleForm.vue
@@ -0,0 +1,115 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+    <el-form-item label="模块" prop="moduleName">
+        <el-select
+          v-model="formData.moduleName"
+          placeholder="选择文件所属模块"
+          clearable
+          class="!w-240px"
+        >
+        <el-option
+          v-for="dict in getStrDictOptions('module_type')"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="阶段" prop="stage">
+        <el-input v-model="formData.stage" placeholder="请输入阶段" />
+      </el-form-item>
+      <el-form-item label="乐观锁" prop="revision">
+        <el-input v-model="formData.revision" placeholder="请输入乐观锁" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { ModuleApi, ModuleVO } from '@/api/infra/module'
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+
+/** 模块-阶段管理 表单 */
+defineOptions({ name: 'ModuleForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  moduleName: undefined,
+  stage: undefined,
+  revision: undefined
+})
+const formRules = reactive({
+  moduleName: [{ required: true, message: '模块名称不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ModuleApi.getModule(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ModuleVO
+    if (formType.value === 'create') {
+      await ModuleApi.createModule(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ModuleApi.updateModule(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    moduleName: undefined,
+    stage: undefined,
+    revision: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/src/views/infra/modulefile/file/ModuleFileForm.vue b/src/views/infra/modulefile/file/ModuleFileForm.vue
new file mode 100644
index 000000000..a3b169493
--- /dev/null
+++ b/src/views/infra/modulefile/file/ModuleFileForm.vue
@@ -0,0 +1,137 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <!-- <el-form-item label="模块id" prop="moduleId">
+        <el-input v-model="formData.moduleId" placeholder="请输入模块id" />
+      </el-form-item> -->
+      <el-form-item label="文件名称" prop="fileName">
+        <el-input v-model="formData.fileName" placeholder="请输入文件名称" />
+      </el-form-item>
+      <el-form-item label="文件类型" prop="fileType">
+        <el-select
+          v-model="formData.fileType"
+          placeholder="请选择文件类型"
+          clearable
+          class="!w-240px"
+        >
+        <el-option
+          v-for="dict in getStrDictOptions('file_type')"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否为必传" prop="required">
+        <el-select
+          v-model="formData.required"
+          placeholder="请选择是否为必传"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="是" value=true />
+          <el-option label="否" value=false />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="乐观锁" prop="revision">
+        <el-input v-model="formData.revision" placeholder="请输入乐观锁" />
+      </el-form-item>
+      <el-form-item label="文件大小" prop="fileSize">
+        <el-input-number v-model="formData.fileSize" :min="1" placeholder="请输入文件大小（MB）" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { ModuleFileApi, ModuleFileVO } from '@/api/infra/modulefile'
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+
+/** 模块文件管理 表单 */
+defineOptions({ name: 'ModuleFileForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  moduleId: 0,
+  fileName: undefined,
+  fileType: undefined,
+  revision: undefined,
+  required: undefined,
+  fileSize: undefined,
+})
+const formRules = reactive({
+  fileName: [{ required: true, message: '文件名称不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, moduleid: number, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  formData.value.moduleId = moduleid
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ModuleFileApi.getModuleFile(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ModuleFileVO
+    if (formType.value === 'create') {
+      await ModuleFileApi.createModuleFile(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ModuleFileApi.updateModuleFile(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    moduleName: undefined,
+    fileName: undefined,
+    fileType: undefined,
+    revision: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/src/views/infra/modulefile/file/index.vue b/src/views/infra/modulefile/file/index.vue
new file mode 100644
index 000000000..bf924efdb
--- /dev/null
+++ b/src/views/infra/modulefile/file/index.vue
@@ -0,0 +1,281 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <!-- <el-form-item label="模块" prop="moduleName">
+        <el-select
+          v-model="queryParams.moduleName"
+          placeholder="选择文件所属模块"
+          clearable
+          class="!w-240px"
+        >
+        <el-option
+          v-for="dict in getStrDictOptions('module_type')"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+        </el-select>
+      </el-form-item> -->
+      <!-- <el-form-item label="模块id" prop="moduleId">
+        <el-input
+          v-model="queryParams.moduleId"
+          placeholder="请输入模块id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <el-form-item label="文件名称" prop="fileName">
+        <el-input
+          v-model="queryParams.fileName"
+          placeholder="请输入文件名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="文件类型" prop="fileType">
+        <el-select
+          v-model="queryParams.fileType"
+          placeholder="请选择文件类型"
+          clearable
+          class="!w-240px"
+        >
+        <el-option
+          v-for="dict in getStrDictOptions('file_type')"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="乐观锁" prop="revision" v-if="false">
+        <el-input
+          v-model="queryParams.revision"
+          placeholder="请输入乐观锁"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="文件大小" prop="fileSize">
+        <el-input
+          v-model="queryParams.fileSize"
+          placeholder="请输入文件大小（MB）"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="是否为必传" prop="required">
+        <el-select
+          v-model="queryParams.required"
+          placeholder="请选择是否为必传"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="是" value=true />
+          <el-option label="否" value=false />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="序号" align="center" width="60px" type="index" />
+      <!-- <el-table-column label="所属模块" align="center" prop="moduleName">
+        <template #default="scope">
+          <dict-tag :type="'module_type'" :value="scope.row.moduleName" />
+        </template>
+      </el-table-column> -->
+      <el-table-column label="文件名称" align="center" prop="fileName" />
+      <el-table-column label="文件类型" align="center" prop="fileType">
+        <template #default="scope">
+          <dict-tag :type="'file_type'" :value="scope.row.fileType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否为必传" align="center" prop="required">
+        <template #default="scope">
+          <span v-if="scope.row.required">是</span>
+          <span v-else>否</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="乐观锁" align="center" prop="revision" v-if="false"/>
+      <el-table-column label="文件大小" align="center">
+        <template v-slot="scope">
+          {{ scope.row.fileSize ? scope.row.fileSize + ' MB' : '' }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ModuleFileForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { ModuleFileApi, ModuleFileVO } from '@/api/infra/modulefile'
+import ModuleFileForm from './ModuleFileForm.vue'
+
+/** 模块文件管理 列表 */
+defineOptions({ name: 'ModuleFile' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ModuleFileVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  fileName: undefined,
+  fileType: undefined,
+  revision: undefined,
+  createTime: [],
+  moduleId: route.params.moduleId,
+  required: undefined,
+  fileSize: undefined,
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ModuleFileApi.getModuleFilePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, queryParams.moduleId, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ModuleFileApi.deleteModuleFile(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ModuleFileApi.exportModuleFile(queryParams)
+    download.excel(data, '模块文件管理.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/infra/modulefile/index.vue b/src/views/infra/modulefile/index.vue
new file mode 100644
index 000000000..b917fa92d
--- /dev/null
+++ b/src/views/infra/modulefile/index.vue
@@ -0,0 +1,223 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="模块" prop="moduleName">
+        <el-select
+          v-model="queryParams.moduleName"
+          placeholder="选择文件所属模块"
+          clearable
+          class="!w-240px"
+        >
+        <el-option
+          v-for="dict in getStrDictOptions('module_type')"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="阶段" prop="stage">
+        <el-input
+          v-model="queryParams.stage"
+          placeholder="请输入阶段"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="乐观锁" prop="revision" v-if="false">
+        <el-input
+          v-model="queryParams.revision"
+          placeholder="请输入乐观锁"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['infra:module:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['infra:module:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="模块" align="center" prop="moduleName">
+        <template #default="scope">
+          <dict-tag :type="'module_type'" :value="scope.row.moduleName" />
+        </template>
+      </el-table-column>
+      <el-table-column label="阶段" align="center" prop="stage" />
+      <el-table-column label="乐观锁" align="center" prop="revision" v-if="false"/>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <router-link :to="'/module-file/file/' + scope.row.id">
+            <el-button link type="primary">文件管理</el-button>
+          </router-link>
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['infra:module:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['infra:module:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ModuleForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { ModuleApi, ModuleVO } from '@/api/infra/module'
+import ModuleForm from './ModuleForm.vue'
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+
+/** 模块-阶段管理 列表 */
+defineOptions({ name: 'Module' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ModuleVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  moduleName: undefined,
+  stage: undefined,
+  revision: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ModuleApi.getModulePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ModuleApi.deleteModule(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ModuleApi.exportModule(queryParams)
+    download.excel(data, '模块-阶段管理.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/patents/patents/index.vue b/src/views/patents/patents/index.vue
index 54b4006c8..029d37f4b 100644
--- a/src/views/patents/patents/index.vue
+++ b/src/views/patents/patents/index.vue
@@ -122,7 +122,8 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center" fixed="right" width="150">
+      <el-table-column label="状态" align="center" prop="state" width="150" />
+      <el-table-column label="操作" align="center" fixed="right" width="280">
         <template #default="scope">
           <el-button
             link
@@ -140,6 +141,23 @@
           >
             删除
           </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="generateDoc(scope.row.id,scope.row.name)"
+          >
+            成文
+          </el-button>
+          <el-button link type="primary" @click="handlePresenting(scope.row.id)" v-if="scope.row.state == '1' || scope.row.state == '3'">
+              提报
+          </el-button>
+          <el-button link type="primary" @click="handleauditPatent(scope.row.id)" v-if="scope.row.state == '2'">
+            审核
+          </el-button>
+          <el-button link type="primary" @click="handleRecord(scope.row.id)" 
+            v-if="scope.row.state == '2' || scope.row.state == '3' || scope.row.state == '4'">
+            审核记录
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -152,6 +170,46 @@
     />
   </ContentWrap>
 
+  <Dialog title="审核" v-model="dialogVisible1">
+    <ContentWrap>
+      <el-form label-width="80px" :model="formData" class="m-t-8px" :rules="formRules">
+        <el-form-item label="" prop="status">
+          <el-radio-group v-model="formData.status">
+            <el-radio label="1">审核通过</el-radio>
+            <el-radio label="0">审核不通过</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="comment" v-if="formData.status == '0'">
+          <el-input type="textarea" v-model="formData.comment" resize="vertical" :autosize="{ minRows: 2, maxRows: 4 }" />
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+    <template #footer>
+      <el-button type="primary" @click="submitForm1">确 定</el-button>
+      <el-button @click="dialogVisible1 = false">取 消</el-button>
+    </template>
+  </Dialog>
+  <Dialog title="审核记录" v-model="dialogVisible2">
+    <ContentWrap>
+      <el-timeline>
+        <el-timeline-item :timestamp="formatDate(log.createTime)" placement="top" v-for="(log, index) in logList"
+          :key="index">
+          <el-card>
+            <div>{{ log.creatorName }}</div>
+            <p>{{ log.comment }}</p>
+            <el-tag class="mr-10px" type="danger" v-if="log.status == '0'">审核不通过</el-tag>
+            <el-tag class="mr-10px" type="success" v-if="log.status == '1'">审核通过</el-tag>
+          </el-card>
+        </el-timeline-item>
+
+
+      </el-timeline>
+
+      <div v-if="logList.length == 0"> 暂无审核记录</div>
+    </ContentWrap>
+
+  </Dialog>
+
   <!-- 表单弹窗：添加/修改 -->
   <MainForm ref="formRef" @success="getList" />
 </template>
@@ -162,6 +220,8 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { MainApi, MainVO } from '@/api/patents/patents'
 import MainForm from './MainForm.vue'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 
 /** 专利信息 列表 */
 defineOptions({ name: 'PatentsMain' })
@@ -187,6 +247,22 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
+const dialogVisible1 = ref(false) // 弹窗的是否展示
+const dialogVisible2 = ref(false) // 弹窗的是否展示
+const logList = ref([]) // 弹窗的是否展示
+
+const { wsCache } = useCache()
+const user = wsCache.get(CACHE_KEY.USER).user
+const formData = ref({
+  itemId: undefined,
+  moduleId: "7",
+  creatorName: user.nickname,
+  status: '1',
+  comment: '',
+})
+const formRules = reactive({
+  comment: [{ required: true, message: '审核意见不能为空', trigger: 'blur' }],
+})
 
 /** 查询列表 */
 const getList = async () => {
@@ -246,6 +322,61 @@ const handleExport = async () => {
   }
 }
 
+//提报
+const handlePresenting = async (id: number) => {
+  try {
+    var par = { id: id }
+    await MainApi.presentingPatent(par)
+    await getList()
+  } catch { }
+}
+
+//审核
+const handleauditPatent = async (id: number) => {
+  formData.value.itemId = id;
+  formData.value.comment = ''
+  dialogVisible1.value = true
+}
+
+//审核记录
+const handleRecord = async (id: number) => {
+  dialogVisible2.value = true
+  try {
+    const data = await MainApi.getAuditList({ id: id })
+    logList.value = data
+
+  } finally {
+    loading.value = false
+  }
+}
+
+const submitForm1 = async () => {
+  try {
+    await MainApi.auditPatent(formData.value as unknown as MainVO)
+    message.success("审核成功")
+    await getList()
+  } finally {
+    // 关闭弹窗
+    //currentRow.value = undefined
+    //currentRowValue.value = undefined
+    dialogVisible1.value = false
+  }
+}
+
+const generateDoc = async (id: number,name:string) =>{
+  //todo
+  try{
+    // 发起导出
+    // exportLoading.value = true
+    const filename = name +'.docx'
+    const data = await MainApi.generateDoc(id)
+    download.word(data, filename)
+  } catch {
+  } finally {
+    // exportLoading.value = false
+  }
+}
+
 /** 初始化 **/
 onMounted(() => {
   getList()
diff --git a/src/views/publicLab/publicLab/equip/LabEquipmentForm.vue b/src/views/publicLab/publicLab/equip/LabEquipmentForm.vue
new file mode 100644
index 000000000..ba4e2319b
--- /dev/null
+++ b/src/views/publicLab/publicLab/equip/LabEquipmentForm.vue
@@ -0,0 +1,103 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="实验室ID" prop="labId">
+        <el-input v-model="formData.labId" placeholder="请输入实验室ID" />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="equipmentName">
+        <el-input v-model="formData.equipmentName" placeholder="请输入设备名称" />
+      </el-form-item>
+      <el-form-item label="乐观锁" prop="revision" v-if="false">
+        <el-input v-model="formData.revision" placeholder="请输入乐观锁" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { LabEquipmentApi, LabEquipmentVO } from '@/api/publicLab/equip'
+
+/** 实验室设备 表单 */
+defineOptions({ name: 'LabEquipmentForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  labId: 0,
+  equipmentName: undefined,
+  revision: undefined
+})
+const formRules = reactive({
+  labId: [{ required: true, message: '实验室ID不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, labid: number, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  formData.value.labId = labid
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await LabEquipmentApi.getLabEquipment(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as LabEquipmentVO
+    if (formType.value === 'create') {
+      await LabEquipmentApi.createLabEquipment(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await LabEquipmentApi.updateLabEquipment(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    labId: undefined,
+    equipmentName: undefined,
+    revision: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/src/views/publicLab/publicLab/equip/index.vue b/src/views/publicLab/publicLab/equip/index.vue
new file mode 100644
index 000000000..d9b41ecd5
--- /dev/null
+++ b/src/views/publicLab/publicLab/equip/index.vue
@@ -0,0 +1,206 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <!-- <el-form-item label="实验室ID" prop="labId">
+        <el-input
+          v-model="queryParams.labId"
+          placeholder="请输入实验室ID"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <el-form-item label="设备名称" prop="equipmentName">
+        <el-input
+          v-model="queryParams.equipmentName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="乐观锁" prop="revision" v-if="false">
+        <el-input
+          v-model="queryParams.revision"
+          placeholder="请输入乐观锁"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="实验室ID" align="center" prop="labId" />
+      <el-table-column label="设备名称" align="center" prop="equipmentName" />
+      <el-table-column label="乐观锁" align="center" prop="revision" v-if="false"/>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <LabEquipmentForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { LabEquipmentApi, LabEquipmentVO } from '@/api/publicLab/equip'
+import LabEquipmentForm from './LabEquipmentForm.vue'
+
+/** 实验室设备 列表 */
+defineOptions({ name: 'LabEquipment' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由
+
+const loading = ref(true) // 列表的加载中
+const list = ref<LabEquipmentVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  labId: route.params.labId,
+  equipmentName: undefined,
+  revision: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await LabEquipmentApi.getLabEquipmentPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, queryParams.labId, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await LabEquipmentApi.deleteLabEquipment(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await LabEquipmentApi.exportLabEquipment(queryParams)
+    download.excel(data, '实验室设备.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/publicLab/publicLab/lab/Form.vue b/src/views/publicLab/publicLab/lab/Form.vue
new file mode 100644
index 000000000..a8a3e5d92
--- /dev/null
+++ b/src/views/publicLab/publicLab/lab/Form.vue
@@ -0,0 +1,98 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+      v-if="formType!='equip'"
+    >
+      <el-form-item label="实验室名称" prop="labName">
+        <el-input v-model="formData.labName" placeholder="请输入实验室名称" />
+      </el-form-item>
+      <el-form-item label="乐观锁" prop="revision" v-if="false">
+        <el-input v-model="formData.revision" placeholder="请输入乐观锁" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="formType!='equip'">确 定</el-button>
+      <el-button @click="dialogVisible = false" v-if="formType!='equip'">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { LabApi, LabVO } from '@/api/publicLab/lab'
+
+/** 公共实验室 表单 */
+defineOptions({ name: 'LabForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  labName: undefined,
+  revision: undefined
+})
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await LabApi.getLab(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as LabVO
+    if (formType.value === 'create') {
+      await LabApi.createLab(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await LabApi.updateLab(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    labName: undefined,
+    revision: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/src/views/publicLab/publicLab/lab/index.vue b/src/views/publicLab/publicLab/lab/index.vue
new file mode 100644
index 000000000..b70d56bf5
--- /dev/null
+++ b/src/views/publicLab/publicLab/lab/index.vue
@@ -0,0 +1,202 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="实验室名称" prop="labName">
+        <el-input
+          v-model="queryParams.labName"
+          placeholder="请输入实验室名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="乐观锁" prop="revision" v-if="false">
+        <el-input
+          v-model="queryParams.revision"
+          placeholder="请输入乐观锁"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+          
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['public:lab:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['public:lab:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="实验室名称" align="center" prop="labName" />
+      <el-table-column label="乐观锁" align="center" prop="revision" v-if="false"/>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['public:lab:update']"
+          >
+            编辑
+          </el-button>
+          <router-link :to="'/lab/equip/' + scope.row.id">
+            <el-button link type="primary">设备管理</el-button>
+          </router-link>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['public:lab:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <LabForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { LabApi, LabVO } from '@/api/publicLab/lab'
+import LabForm from './Form.vue'
+
+/** 公共实验室 列表 */
+defineOptions({ name: 'Lab' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<LabVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  labName: undefined,
+  revision: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await LabApi.getLabPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await LabApi.deleteLab(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await LabApi.exportLab(queryParams)
+    download.excel(data, '公共实验室.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/publicLab/publicLab/reservation/CheckoutForm.vue b/src/views/publicLab/publicLab/reservation/CheckoutForm.vue
new file mode 100644
index 000000000..7c7cb712a
--- /dev/null
+++ b/src/views/publicLab/publicLab/reservation/CheckoutForm.vue
@@ -0,0 +1,187 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <div v-html="formData.checkout" style="padding: 20px;" v-if="formData.state>0"></div>
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+      v-if="formData.state===0"
+    >
+      <!-- <el-row gutter="20">
+        <el-col :span="6">
+        <el-form-item label="实验室名称" prop="labName">
+          <el-select v-model="formData.labName" placeholder="请选择实验室">
+            <el-option v-for="dict in getStrDictOptions(DICT_TYPE.LAB_NAME)" :key="dict.value"
+                       :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        </el-col>
+        <el-col :span="6">
+        <el-form-item label="实验设备" prop="equipment">
+          <el-select v-model="formData.equipment" placeholder="请选择实验设备">
+            <el-option v-for="dict in getStrDictOptions(DICT_TYPE.EQUIPMENT)" :key="dict.value"
+                       :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        </el-col>
+        <el-col :span="6">
+        <el-form-item label="用户姓名" prop="userName">
+          <el-input v-model="formData.userName" placeholder="请输入用户姓名" />
+        </el-form-item>
+        </el-col>
+        <el-col :span="6">
+        <el-form-item label="用户联系方式" prop="userContact">
+          <el-input v-model="formData.userContact" placeholder="请输入用户联系方式" />
+        </el-form-item>
+        </el-col>
+        <el-col :span="6">
+        <el-form-item label="预约开始时间" prop="reservationDate">
+          <el-date-picker
+            v-model="formData.reservationDate"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="选择预约开始时间"
+            class="!w-260px"
+          />
+        </el-form-item>
+        </el-col>
+        <el-col :span="6">
+        <el-form-item label="预约结束时间" prop="reservationTime">
+          <el-date-picker
+            v-model="formData.reservationTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="选择预约结束时间"
+            class="!w-260px"
+          />
+        </el-form-item>
+        </el-col>
+        <el-col :span="6">
+        <el-form-item label="参与人员" prop="joinPeople">
+          <el-input v-model="formData.joinPeople" placeholder="请输入参与人员" />
+        </el-form-item>
+        </el-col> -->
+        <!-- <el-col :span="6">
+        <el-form-item label="备注" prop="reservationNotes">
+          <el-input v-model="formData.reservationNotes" placeholder="请输入备注" />
+        </el-form-item>
+        </el-col> -->
+      <!-- </el-row> -->
+      <el-form-item label="归还信息" prop="checkout">
+        <Editor v-model="formData.checkout" height="150px" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="formData.state===0">确 定</el-button>
+      <el-button @click="dialogVisible = false" v-if="formData.state===0">取 消</el-button>
+      <el-button @click="dialogVisible = false" v-if="formData.state===1">关 闭</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { Api, VO } from '@/api/publicLab/publicLab';
+import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
+import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
+const { wsCache } = useCache()
+const user = wsCache.get(CACHE_KEY.USER).user
+/** 公共实验室信 表单 */
+defineOptions({ name: 'Form' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  // userName: user.nickname,
+  // userContact: undefined,
+  // reservationDate: undefined,
+  // reservationTime: undefined,
+  // labName: undefined,
+  // joinPeople: undefined,
+  // equipment: undefined,
+  // reservationNotes: undefined,
+  // deptId: undefined,
+  // deptName: undefined,
+  // revision: undefined,
+  checkout: '',
+  state: 1,
+})
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+const isEditorDisabled = computed(() => formData.value.state === 1);
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = type
+  formType.value = 'update'
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await Api.get(id)
+      if (formData.value.checkout === null) {
+        formData.value.checkout = '' 
+      }
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    formData.value.state = 1
+    const data = formData.value as unknown as VO
+    if (formType.value === 'create') {
+      await Api.create(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await Api.update(data)
+      message.success(t('common.checkoutSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    // userName: undefined,
+    // userContact: undefined,
+    // reservationDate: undefined,
+    // reservationTime: undefined,
+    // labName: undefined,
+    // joinPeople: undefined,
+    // equipment: undefined,
+    // reservationNotes: undefined,
+    // deptId: undefined,
+    // deptName: undefined,
+    // revision: undefined,
+    checkout: '',
+    state: 0,
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/publicLab/publicLab/Form.vue b/src/views/publicLab/publicLab/reservation/Form.vue
similarity index 100%
rename from src/views/publicLab/publicLab/Form.vue
rename to src/views/publicLab/publicLab/reservation/Form.vue
diff --git a/src/views/publicLab/publicLab/index.vue b/src/views/publicLab/publicLab/reservation/index.vue
similarity index 76%
rename from src/views/publicLab/publicLab/index.vue
rename to src/views/publicLab/publicLab/reservation/index.vue
index 91fe1416d..54ab803f4 100644
--- a/src/views/publicLab/publicLab/index.vue
+++ b/src/views/publicLab/publicLab/reservation/index.vue
@@ -8,7 +8,7 @@
       :inline="true"
       label-width="100px"
     >
-      <el-form-item label="预约日期" prop="reservationDate">
+      <el-form-item label="预约时间" prop="reservationDate">
         <el-date-picker
           v-model="queryParams.reservationDate"
           value-format="YYYY-MM-DD HH:mm:ss"
@@ -83,7 +83,14 @@
         :formatter="dateFormatter"
         width="180"
       />
-      <el-table-column label="操作" align="center" fixed="right" width="200">
+      <el-table-column label="归还状态" align="center" prop="state" width="120">
+        <template #default="scope">
+          <span v-if="scope.row.state === 0">未归还</span>
+          <span v-else-if="scope.row.state === 1">待确认</span>
+          <span v-else>已确认</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" fixed="right" width="270">
         <template #default="scope">
           <el-button
             link
@@ -101,6 +108,30 @@
           >
             删除
           </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="openReturnDialog(scope.row.id)"
+            v-if="scope.row.state === 0"
+          >
+            归还
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="checkoutInfo(scope.row.id)"
+            v-if="scope.row.state > 0"
+          >
+            归还信息
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="handleVerification(scope.row.id)"
+            v-if="scope.row.state === 1"
+          >
+            确认归还
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -115,6 +146,8 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <Form ref="formRef" @success="getList" />
+  <R ref="rRef" @success="getList" />
+
 </template>
 
 <script setup lang="ts">
@@ -122,6 +155,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { Api, VO } from '@/api/publicLab/publicLab'
 import Form from './Form.vue'
+import R from './CheckoutForm.vue'
 import {DICT_TYPE} from "@/utils/dict";
 
 /** 公共实验室信 列表 */
@@ -152,6 +186,11 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
+const verificationData = ref({
+  id: undefined,
+  state: 2,
+})
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -210,6 +249,34 @@ const handleExport = async () => {
   }
 }
 
+/** 归还按钮操作 */
+const rRef = ref()
+
+const openReturnDialog = (id: number) => {
+  rRef.value.open("归还", id)
+}
+
+const checkoutInfo = (id: number) => {
+  rRef.value.open("归还信息", id)
+}
+
+/** 确认归还按钮操作 */
+const handleVerification = async (id: number) => {
+  verificationData.value.id = id
+  
+  try {
+    // 删除的二次确认
+    await message.confirm("确认该实验室已成功归还")
+    //
+    const data = verificationData.value as unknown as VO
+    // 发起删除
+    await Api.update(data)
+    message.success(t('common.checkoutSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
 /** 初始化 **/
 onMounted(() => {
   getList()