diff --git a/src/api/mes/planmaintenance/index.ts b/src/api/mes/planmaintenance/index.ts
new file mode 100644
index 00000000..a2a875ad
--- /dev/null
+++ b/src/api/mes/planmaintenance/index.ts
@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+export interface PlanMaintenanceVO {
+  id?: number | string
+  planName: string
+  planType: number | string
+  description?: string
+  subjectIdS?: string
+  creator?: string
+  creatorName?: string
+  createTime?: string | number | Date
+  updateTime?: string | number | Date
+}
+
+export interface PlanMaintenanceSubjectVO {
+  id?: number | string
+  subjectCode?: string
+  subjectName?: string
+  inspectionMethod?: string
+  judgmentCriteria?: string
+}
+
+export const PlanMaintenanceApi = {
+  getPlanMaintenancePage: async (params: any) => {
+    return await request.get({ url: `/mes/plan-maintenance/page`, params })
+  },
+
+  getSubjectList: async (id: number | string) => {
+    return await request.get({ url: `/mes/plan-maintenance/getSubjectList`, params: { id } })
+  },
+
+  createPlanMaintenance: async (data: any) => {
+    return await request.post({ url: `/mes/plan-maintenance/create`, data })
+  },
+
+  updatePlanMaintenance: async (data: any) => {
+    return await request.put({ url: `/mes/plan-maintenance/update`, params: data })
+  },
+
+  deletePlanMaintenance: async (ids: string) => {
+    return await request.delete({ url: `/mes/plan-maintenance/delete?ids=` + ids })
+  },
+
+  exportPlanMaintenance: async (params: any) => {
+    return await request.download({ url: `/mes/plan-maintenance/export-excel`, params })
+  }
+}
diff --git a/src/views/mes/dvsubject/index.vue b/src/views/mes/dvsubject/index.vue
index be44f5e9..060d4ffe 100644
--- a/src/views/mes/dvsubject/index.vue
+++ b/src/views/mes/dvsubject/index.vue
@@ -3,15 +3,18 @@
     <!-- 搜索工作栏 -->
     <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
       <el-form-item label="编码" prop="subjectCode">
-        <el-input v-model="queryParams.subjectCode" placeholder="请输入编码" clearable @keyup.enter="handleQuery"
+        <el-input
+v-model="queryParams.subjectCode" placeholder="请输入编码" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="名称" prop="subjectName">
-        <el-input v-model="queryParams.subjectName" placeholder="请输入名称" clearable @keyup.enter="handleQuery"
+        <el-input
+v-model="queryParams.subjectName" placeholder="请输入名称" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="判定基准" prop="judgmentCriteria">
-        <el-input v-model="queryParams.judgmentCriteria" placeholder="请输入判定基准" clearable @keyup.enter="handleQuery"
+        <el-input
+v-model="queryParams.judgmentCriteria" placeholder="请输入判定基准" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
       </el-form-item>
       <el-form-item>
@@ -27,7 +30,8 @@
         <el-button type="danger" plain @click="handleBatchDelete" v-hasPermi="['mes:dv-subject:delete']">
           <Icon icon="ep:delete" class="mr-5px" /> 批量删除
         </el-button>
-        <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+        <el-button
+type="success" plain @click="handleExport" :loading="exportLoading"
           v-hasPermi="['mes:dv-subject:export']">
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
@@ -37,7 +41,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
+    <el-table
+ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" fixed="left" reserve-selection />
       <el-table-column label="序号" align="center" width="80" fixed="left">
@@ -49,7 +54,8 @@
       <el-table-column label="名称" align="center" prop="subjectName" />
       <el-table-column label="检验方式" align="center" prop="inspectionMethod" width="120px">
         <template #default="scope">
-          <el-tag effect="light" :type="getTagType('Inspection_method', scope.row.inspectionMethod)"
+          <el-tag
+effect="light" :type="getTagType('Inspection_method', scope.row.inspectionMethod)"
             :color="getTagColor('Inspection_method', scope.row.inspectionMethod)"
             :style="getTagStyle('Inspection_method', scope.row.inspectionMethod)" disable-transitions>
             {{ getTagLabel('Inspection_method', scope.row.inspectionMethod) }}
@@ -58,7 +64,8 @@
       </el-table-column>
       <el-table-column label="值类型" align="center" prop="valueType" width="120px">
         <template #default="scope">
-          <el-tag effect="light" :type="getTagType('value_types', scope.row.valueType)"
+          <el-tag
+effect="light" :type="getTagType('value_types', scope.row.valueType)"
             :color="getTagColor('value_types', scope.row.valueType)"
             :style="getTagStyle('value_types', scope.row.valueType)" disable-transitions>
             {{ getTagLabel('value_types', scope.row.valueType) }}
@@ -70,7 +77,8 @@
       <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
       <el-table-column label="操作" align="center" fixed="right" width="160px">
         <template #default="scope">
-          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+          <el-button
+link type="primary" @click="openForm('update', scope.row.id)"
             v-hasPermi="['mes:dv-subject:update']">
             编辑
           </el-button>
@@ -81,7 +89,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+    <Pagination
+:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
       @pagination="getList" />
   </ContentWrap>
 
diff --git a/src/views/mes/planMaintenance/PlanMaintenanceForm.vue b/src/views/mes/planMaintenance/PlanMaintenanceForm.vue
new file mode 100644
index 00000000..123a3444
--- /dev/null
+++ b/src/views/mes/planMaintenance/PlanMaintenanceForm.vue
@@ -0,0 +1,138 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="720px">
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
+      <el-form-item label="方案名称" prop="planName" required>
+        <el-input v-model="formData.planName" placeholder="请输入方案名称" />
+      </el-form-item>
+
+      <el-form-item label="方案类型" prop="planType" required>
+        <el-select v-model="formData.planType" placeholder="请选择方案类型" class="!w-full">
+          <el-option :value="1" label="保养" />
+          <el-option :value="2" label="维护" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="描述" prop="description">
+        <el-input v-model="formData.description" placeholder="请输入描述" type="textarea" />
+      </el-form-item>
+
+      <el-form-item label="关联项目" prop="subjectIds">
+        <el-select
+          v-model="formData.subjectIds"
+          multiple
+          filterable
+          clearable
+          placeholder="请选择关联项目"
+          class="!w-full"
+        >
+          <el-option v-for="item in subjectOptions" :key="item.id" :label="item.subjectName" :value="item.id" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+
+    <template #footer>
+      <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import type { FormRules } from 'element-plus'
+import { DvSubjectApi, DvSubjectVO } from '@/api/mes/dvsubject'
+import { PlanMaintenanceApi, PlanMaintenanceVO } from '@/api/mes/planmaintenance'
+
+defineOptions({ name: 'PlanMaintenanceForm' })
+
+const { t } = useI18n()
+const message = useMessage()
+
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+const formLoading = ref(false)
+const formType = ref<'create' | 'update'>('create')
+
+const subjectOptions = ref<DvSubjectVO[]>([])
+const ensureSubjectOptionsLoaded = async () => {
+  if (subjectOptions.value.length) return
+  const res = await DvSubjectApi.getDvSubjectPage({})
+  const list = Array.isArray(res) ? res : res?.list
+  subjectOptions.value = (list ?? []) as DvSubjectVO[]
+}
+
+const parseIds = (value: any): Array<number | string> => {
+  if (!value) return []
+  if (Array.isArray(value)) return value
+  return String(value)
+    .split(',')
+    .map((v) => v.trim())
+    .filter((v) => v !== '')
+}
+
+const initFormData = () => ({
+  id: undefined as PlanMaintenanceVO['id'],
+  planName: '' as string,
+  planType: undefined as any,
+  description: '' as string,
+  subjectIds: [] as Array<number | string>
+})
+
+const formData = ref(initFormData())
+const formRules = reactive<FormRules>({
+  planName: [{ required: true, message: '方案名称不能为空', trigger: 'blur' }],
+  planType: [{ required: true, message: '方案类型不能为空', trigger: 'change' }]
+})
+const formRef = ref()
+
+const open = async (type: 'create' | 'update', row?: Partial<PlanMaintenanceVO>) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  await ensureSubjectOptionsLoaded()
+
+  if (type === 'update' && row) {
+    formData.value = {
+      ...initFormData(),
+      id: row.id,
+      planName: (row.planName as any) ?? '',
+      planType: (row.planType as any) ?? undefined,
+      description: (row.description as any) ?? '',
+      subjectIds: parseIds((row as any).subjectIdS)
+    }
+  }
+}
+
+defineExpose({ open })
+
+const emit = defineEmits(['success'])
+const submitForm = async () => {
+  await formRef.value.validate()
+  formLoading.value = true
+  try {
+    const data = {
+      id: formData.value.id,
+      planName: formData.value.planName,
+      planType: formData.value.planType,
+      description: formData.value.description,
+      subjectIdS: formData.value.subjectIds?.length ? formData.value.subjectIds.join(',') : undefined
+    }
+    if (formType.value === 'create') {
+      await PlanMaintenanceApi.createPlanMaintenance(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PlanMaintenanceApi.updatePlanMaintenance(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+const resetForm = () => {
+  formData.value = initFormData()
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/mes/planMaintenance/index.vue b/src/views/mes/planMaintenance/index.vue
new file mode 100644
index 00000000..67511475
--- /dev/null
+++ b/src/views/mes/planMaintenance/index.vue
@@ -0,0 +1,327 @@
+<template>
+  <ContentWrap>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="60px">
+      <el-form-item label="名称" prop="planName">
+        <el-input
+          v-model="queryParams.planName"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="planType">
+        <el-select v-model="queryParams.planType" placeholder="请选择类型" clearable class="!w-240px">
+          <el-option :value="1" label="保养" />
+          <el-option :value="2" label="维护" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="描述" prop="description">
+        <el-input
+          v-model="queryParams.description"
+          placeholder="请输入描述"
+          clearable
+          @keyup.enter="handleQuery"
+          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="['mes:plan-maintenance:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button type="danger" plain @click="handleBatchDelete" v-hasPermi="['mes:plan-maintenance:delete']">
+          <Icon icon="ep:delete" class="mr-5px" /> 批量删除
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['mes:plan-maintenance:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      ref="tableRef"
+      v-loading="loading"
+      :data="list"
+      row-key="id"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      @expand-change="handleExpandChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" fixed="left" reserve-selection />
+      <el-table-column type="expand" width="48">
+        <template #default="scope">
+          <div class="p-12px">
+            <el-table
+              v-loading="subjectLoadingMap[String(scope.row.id)]"
+              :data="subjectListMap[String(scope.row.id)] ?? []"
+              :stripe="true"
+              :show-overflow-tooltip="true"
+              size="small"
+            >
+              <el-table-column label="序号" align="center" width="80">
+                <template #default="s2">
+                  {{ s2.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="编码" align="center" prop="subjectCode" />
+              <el-table-column label="名称" align="center" prop="subjectName" />
+              <el-table-column label="检验方式" align="center" prop="inspectionMethod" width="120">
+                <template #default="s2">
+                  <span v-if="s2.row.inspectionMethod === undefined || s2.row.inspectionMethod === null || s2.row.inspectionMethod === ''">-</span>
+                  <el-tag
+                    v-else
+                    effect="light"
+                    :type="getTagType('Inspection_method', s2.row.inspectionMethod)"
+                    :color="getTagColor('Inspection_method', s2.row.inspectionMethod)"
+                    :style="getTagStyle('Inspection_method', s2.row.inspectionMethod)"
+                    disable-transitions
+                  >
+                    {{ getTagLabel('Inspection_method', s2.row.inspectionMethod) }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="判定基准" align="center" prop="judgmentCriteria" />
+            </el-table>
+          </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="序号" align="center" width="80">
+        <template #default="scope">
+          {{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="名称" align="center" prop="planName" min-width="160" />
+      <el-table-column label="类型" align="center" prop="planType" width="110">
+        <template #default="scope">
+          <el-tag effect="light" :type="getPlanTypeTagType(scope.row.planType)">
+            {{ getPlanTypeLabel(scope.row.planType) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="描述" align="center" prop="description" min-width="220" />
+      <el-table-column label="创建人" align="center" prop="creatorName" width="140" />
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" :formatter="dateFormatter" width="180" />
+      <el-table-column label="操作" align="center" fixed="right" width="160">
+        <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row)" v-hasPermi="['mes:plan-maintenance:update']">
+            编辑
+          </el-button>
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['mes:plan-maintenance: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>
+
+  <PlanMaintenanceForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getStrDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { PlanMaintenanceApi, PlanMaintenanceSubjectVO, PlanMaintenanceVO } from '@/api/mes/planmaintenance'
+import PlanMaintenanceForm from './PlanMaintenanceForm.vue'
+import { isHexColor } from '@/utils/color'
+import { useDictStoreWithOut } from '@/store/modules/dict'
+
+defineOptions({ name: 'PlanMaintenance' })
+
+const message = useMessage()
+const { t } = useI18n()
+
+const dictStore = useDictStoreWithOut()
+const dictReady = ref(false)
+
+const loading = ref(false)
+const list = ref<PlanMaintenanceVO[]>([])
+const total = ref(0)
+const exportLoading = ref(false)
+
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  planName: undefined as string | undefined,
+  planType: undefined as number | undefined,
+  description: undefined as string | undefined
+})
+
+const queryFormRef = ref()
+
+const tableRef = ref()
+const selectedIds = ref<(number | string)[]>([])
+const handleSelectionChange = (rows: any[]) => {
+  selectedIds.value = rows?.map((row) => row.id).filter((id) => id !== undefined && id !== null && id !== '') ?? []
+}
+
+const subjectListMap = ref<Record<string, PlanMaintenanceSubjectVO[]>>({})
+const subjectLoadingMap = ref<Record<string, boolean>>({})
+
+const getTagDict = (dictType: string, value: any) => {
+  if (!dictReady.value) return undefined
+  const v = value === '' || value === null || value === undefined ? undefined : String(value)
+  if (!v) return undefined
+  return getStrDictOptions(dictType).find((d) => d.value === v)
+}
+
+const getTagLabel = (dictType: string, value: any) => {
+  const found = getTagDict(dictType, value)
+  return found?.label ?? (value ?? '')
+}
+
+const getTagType = (dictType: string, value: any) => {
+  const found = getTagDict(dictType, value)
+  const type = found?.colorType
+  if (type + '' === 'primary' || type + '' === 'default') return '' as any
+  return (type ?? '') as any
+}
+
+const getTagColor = (dictType: string, value: any) => {
+  const found = getTagDict(dictType, value)
+  if (found?.cssClass && isHexColor(found.cssClass)) return found.cssClass
+  return ''
+}
+
+const getTagStyle = (dictType: string, value: any) => {
+  const color = getTagColor(dictType, value)
+  if (!color) return ''
+  return 'color: #fff'
+}
+
+const normalizeList = (res: any): { list: any[]; total: number } => {
+  if (Array.isArray(res)) return { list: res, total: res.length }
+  return { list: res?.list ?? [], total: res?.total ?? 0 }
+}
+
+const getList = async () => {
+  loading.value = true
+  try {
+    const res = await PlanMaintenanceApi.getPlanMaintenancePage({
+      pageNo: queryParams.pageNo,
+      pageSize: queryParams.pageSize,
+      planName: queryParams.planName,
+      planType: queryParams.planType,
+      description: queryParams.description
+    })
+    const normalized = normalizeList(res)
+    list.value = normalized.list as PlanMaintenanceVO[]
+    total.value = normalized.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+const resetQuery = () => {
+  queryFormRef.value?.resetFields?.()
+  handleQuery()
+}
+
+const ensureSubjectListLoaded = async (id: number | string) => {
+  const key = String(id)
+  if (!key) return
+  if (subjectListMap.value[key]) return
+  subjectLoadingMap.value[key] = true
+  try {
+    const res = await PlanMaintenanceApi.getSubjectList(id)
+    const data = Array.isArray(res) ? res : res?.list ?? res ?? []
+    subjectListMap.value[key] = (data ?? []) as PlanMaintenanceSubjectVO[]
+  } finally {
+    subjectLoadingMap.value[key] = false
+  }
+}
+
+const handleExpandChange = async (row: PlanMaintenanceVO, expandedRows: PlanMaintenanceVO[]) => {
+  const isExpanded = expandedRows.some((r) => String(r.id) === String(row.id))
+  if (!isExpanded) return
+  if (row?.id === undefined || row?.id === null || row?.id === '') return
+  await ensureSubjectListLoaded(row.id)
+}
+
+const getPlanTypeLabel = (value: any) => {
+  const v = value === '' || value === null || value === undefined ? undefined : Number(value)
+  if (v === 1) return '保养'
+  if (v === 2) return '维护'
+  return value ?? ''
+}
+
+const getPlanTypeTagType = (value: any) => {
+  const v = value === '' || value === null || value === undefined ? undefined : Number(value)
+  if (v === 1) return 'success'
+  if (v === 2) return 'primary'
+  return ''
+}
+
+const formRef = ref()
+const openForm = (type: 'create' | 'update', row?: PlanMaintenanceVO) => {
+  formRef.value?.open(type, row)
+}
+
+const buildIdsParam = (ids: number | string | Array<number | string>) => {
+  return Array.isArray(ids) ? ids.join(',') : String(ids)
+}
+
+const handleDelete = async (ids: number | string | Array<number | string>) => {
+  try {
+    await message.delConfirm()
+    await PlanMaintenanceApi.deletePlanMaintenance(buildIdsParam(ids))
+    message.success(t('common.delSuccess'))
+    selectedIds.value = []
+    tableRef.value?.clearSelection?.()
+    await getList()
+  } catch {}
+}
+
+const handleBatchDelete = async () => {
+  if (!selectedIds.value.length) {
+    message.error('请选择需要删除的数据')
+    return
+  }
+  await handleDelete(selectedIds.value)
+}
+
+const handleExport = async () => {
+  if (!selectedIds.value.length) {
+    message.error('请选择需要导出的数据')
+    return
+  }
+  try {
+    await message.exportConfirm()
+    exportLoading.value = true
+    const data = await PlanMaintenanceApi.exportPlanMaintenance({ ids: selectedIds.value.join(',') })
+    download.excel(data, '方案维护.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+onMounted(async () => {
+  await dictStore.setDictMap()
+  dictReady.value = true
+  getList()
+})
+</script>