diff --git a/src/api/erp/mold/index.ts b/src/api/erp/mold/index.ts
index 275bacc7..0b3fb016 100644
--- a/src/api/erp/mold/index.ts
+++ b/src/api/erp/mold/index.ts
@@ -14,7 +14,24 @@ export interface MoldBrandVO {
   remark: string // 备注
   isEnable: boolean // 是否启用
 }
-
+// 模具 VO
+export interface MoldVO {
+  id: number // ID
+  code: string // 模具编码
+  name: string // 模具名称
+  unitId: number // 单位ID
+  machineId: number // 机台ID
+  useTime: number // 使用时间(小时)
+  inTime: Date // 入库时间
+  status: number // 状态
+  images: string // 模具图片
+  remark: string // 备注
+  isEnable: boolean // 是否启用
+  brandId: number // 型号id
+  lastMaintainTime: Date // 上次保养
+  lastRepairTime: Date // 上次维修
+  lastMoldTime: Date // 上次换模
+}
 // 模具型号 API
 export const MoldBrandApi = {
   // 查询模具型号分页
@@ -46,9 +63,15 @@ export const MoldBrandApi = {
   exportMoldBrand: async (params) => {
     return await request.download({ url: `/erp/mold-brand/export-excel`, params })
   },
-
+  // 查询模具型号列表
+  getBrandList: async (params) => {
+    return await request.get({ url: `/erp/mold-brand/getBrandList`, params })
+  },
 // ==================== 子表（模具） ====================
-
+  // 查询模具列表
+  getMoldList: async (params) => {
+    return await request.get({ url: `/erp/mold-brand/getMoldList`, params  })
+  },
   // 获得模具分页
   getMoldPage: async (params) => {
     return await request.get({ url: `/erp/mold-brand/mold/page`, params })
diff --git a/src/api/mes/moldrecordsubject/index.ts b/src/api/mes/moldrecordsubject/index.ts
index 77168a0b..bce8c6fc 100644
--- a/src/api/mes/moldrecordsubject/index.ts
+++ b/src/api/mes/moldrecordsubject/index.ts
@@ -33,9 +33,13 @@ export const MoldRecordSubjectApi = {
   deleteMoldRecordSubject: async (id: number) => {
     return await request.delete({ url: `/mes/mold-record-subject/delete?id=` + id })
   },
-
+  // 查询维保项目列表
+  getList: async (params: any) => {
+    return await request.get({ url: `/mes/mold-record-subject/getList`, params })
+  },
   // 导出维保项目 Excel
   exportMoldRecordSubject: async (params) => {
     return await request.download({ url: `/mes/mold-record-subject/export-excel`, params })
   }
-}
\ No newline at end of file
+
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index def7aed9..3018eb47 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -253,6 +253,7 @@ export enum DICT_TYPE {
   MES_PROGRESS_TYPE = "mes_progress_type",
   MES_MOLD_RECORD_STATUS = "mes_mold_record_status",
   MES_MOLD_RECORD_TYPE = "mes_mold_record_type",
+  MES_PASS_OR_NOPASS = "mes_pass_or_nopass",
   //====iot
   IOT_SIEMENS_TYPE = "iot_siemens_type",
   IOT_MODBUS_TYPE = "iot_modbus_type",
diff --git a/src/views/erp/mold/components/MoldList.vue b/src/views/erp/mold/components/MoldList.vue
index 6353f39d..897c893e 100644
--- a/src/views/erp/mold/components/MoldList.vue
+++ b/src/views/erp/mold/components/MoldList.vue
@@ -44,6 +44,14 @@
       />
        <el-table-column label="操作" align="center"  fixed="right" width="150px">
         <template #default="scope">
+          <el-button
+            link
+            type="success"
+            @click="openRecordForm('create', scope.row.id, scope.row.brandId)"
+            v-hasPermi="['mes:mold-record:update']"
+          >
+            维保
+          </el-button>
           <el-button
             link
             type="primary"
@@ -73,12 +81,16 @@
   </ContentWrap>
     <!-- 表单弹窗：添加/修改 -->
     <MoldForm ref="formRef" @success="getList" />
+
+  <!-- 表单弹窗：添加/修改 -->
+  <MoldRecordForm ref="recordFormRef" @success="getList" />
 </template>
 <script setup lang="ts">
 import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import { MoldBrandApi } from '@/api/erp/mold'
 import MoldForm from './MoldForm.vue'
+import MoldRecordForm from "@/views/erp/mold/components/MoldRecordForm.vue";
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -148,4 +160,11 @@ const handleDelete = async (id: number) => {
     await getList()
   } catch {}
 }
+
+/** 添加/修改操作 */
+const recordFormRef = ref()
+const openRecordForm = (type: string, id?: number, brandId?:number) => {
+  recordFormRef.value.open(type, id, brandId)
+}
+
 </script>
diff --git a/src/views/erp/mold/components/MoldRecordForm.vue b/src/views/erp/mold/components/MoldRecordForm.vue
new file mode 100644
index 00000000..513de31a
--- /dev/null
+++ b/src/views/erp/mold/components/MoldRecordForm.vue
@@ -0,0 +1,269 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1000px">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="单号" prop="code">
+        <el-input :disabled="editDisable" v-model="formData.flowCode" placeholder="保存自动生成" />
+      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="模具型号" prop="brandId">
+            <el-select
+              :disabled='editDisable'
+              v-model="formData.brandId"
+              clearable
+              filterable
+              placeholder="请选择模具型号"
+              @change="changeBrand"
+            >
+              <el-option
+                v-for="item in brandList"
+                :key="item.id"
+                :label="item.code+'/'+item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="模具" prop="moldId">
+            <el-select
+              :disabled='editDisable'
+              v-model="formData.moldId"
+              clearable
+              filterable
+              placeholder="请选择模具"
+            >
+              <el-option
+                v-for="item in moldList"
+                :key="item.id"
+                :label="item.code+'/'+item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="单据类型" prop="recordType">
+        <el-radio-group v-model="formData.recordType">
+          <el-radio
+            v-for="dict in getStrDictOptions(DICT_TYPE.MES_MOLD_RECORD_TYPE)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-row v-if="formData.recordType=='换模'">
+        <el-col :span="12">
+          <el-form-item label="机台" prop="machineId">
+            <el-select
+              v-model="formData.machineId"
+              clearable
+              filterable
+              placeholder="请选择机台"
+            >
+              <el-option
+                v-for="item in machineList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="前模具" prop="oldMoldId">
+            <el-input disabled v-model="formData.oldMoldId" placeholder="请输入前模具" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="负责人" prop="userId">
+            <el-select v-model="formData.userId" clearable filterable placeholder="请选择负责人">
+              <el-option
+                v-for="item in userList"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker
+              v-model="formData.startTime"
+              type="date"
+              value-format="x"
+              placeholder="选择开始时间"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="结束时间" prop="endTime">
+            <el-date-picker
+              v-model="formData.endTime"
+              type="date"
+              value-format="x"
+              placeholder="选择结束时间"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="备注" prop="remark">
+
+        <Editor v-model="formData.remark" height="200px" />
+      </el-form-item>
+    </el-form>
+    <!-- 子表的表单 -->
+    <el-tabs v-model="subTabsName">
+      <el-tab-pane label="模具维保明细" name="moldRecordSubjectDetail">
+        <MoldRecordSubjectDetailForm ref="moldRecordSubjectDetailFormRef" :record-id="formData.id" />
+      </el-tab-pane>
+    </el-tabs>
+    <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 { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { MoldRecordApi, MoldRecordVO } from '@/api/mes/moldrecord'
+import MoldRecordSubjectDetailForm from './MoldRecordSubjectDetailForm.vue'
+import {MoldBrandApi, MoldBrandVO, MoldVO} from "@/api/erp/mold";
+import * as UserApi from "@/api/system/user";
+import {MachineComponentApi, MachineComponentVO} from "@/api/mes/machine";
+
+/** 模具维保 表单 */
+defineOptions({ name: 'MoldRecordForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const editDisable = ref(false)
+const brandList = ref<MoldBrandVO[]>([]) // 模具型号列表
+const moldList = ref<MoldVO[]>([]) // 模具列表
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+const machineList = ref<MachineComponentVO[]>([]) // 模具列表
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  flowCode: undefined,
+  brandId: undefined,
+  moldId: undefined,
+  oldMoldId: undefined,
+  machineId: undefined,
+  userId: undefined,
+  recordType: undefined,
+  recordStatus: undefined,
+  remark: undefined
+})
+const formRules = reactive({
+  brandId: [{ required: true, message: '模具型号ID不能为空', trigger: 'blur' }],
+  moldId: [{ required: true, message: '模具ID不能为空', trigger: 'blur' }],
+  userId: [{ required: true, message: '负责人ID不能为空', trigger: 'blur' }],
+  recordType: [{ required: true, message: '单据类型不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 子表的表单 */
+const subTabsName = ref('moldRecordSubjectDetail')
+const moldRecordSubjectDetailFormRef = ref()
+
+/** 打开弹窗 */
+const open = async (type: string, moldId?: number,brandId?:number, machineId?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = "新建换模单"
+  formType.value = type
+  resetForm()
+  editDisable.value = false
+  // 加载列表
+  brandList.value = await MoldBrandApi.getBrandList()
+  // 获得用户列表
+  userList.value = await UserApi.getSimpleUserList()
+  // 获得用户列表
+  machineList.value = await MachineComponentApi.getMachineComponentList()
+
+  formData.value.brandId = brandId
+  formData.value.moldId = moldId
+  formData.value.machineId = machineId
+  if(brandId){
+    query.brandId = formData.value.brandId
+    // 加载列表
+    moldList.value = await MoldBrandApi.getMoldList(query)
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 校验子表单
+  try {
+    await moldRecordSubjectDetailFormRef.value.validate()
+  } catch (e) {
+    subTabsName.value = 'moldRecordSubjectDetail'
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as MoldRecordVO
+    // 拼接子表的数据
+    data.moldRecordSubjectDetails = moldRecordSubjectDetailFormRef.value.getData()
+    if (formType.value === 'create') {
+      await MoldRecordApi.createMoldRecord(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await MoldRecordApi.updateMoldRecord(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    flowCode: undefined,
+    brandId: undefined,
+    moldId: undefined,
+    oldMoldId: undefined,
+    machineId: undefined,
+    userId: undefined,
+    recordType: undefined,
+    recordStatus: undefined,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+
+const query = reactive({
+  brandId: undefined
+})
+const changeBrand = async(e) => {
+  query.brandId = formData.value.brandId
+  // 加载列表
+  moldList.value = await MoldBrandApi.getMoldList(query)
+}
+
+</script>
diff --git a/src/views/erp/mold/components/MoldRecordSubjectDetailForm.vue b/src/views/erp/mold/components/MoldRecordSubjectDetailForm.vue
new file mode 100644
index 00000000..ef9ab50c
--- /dev/null
+++ b/src/views/erp/mold/components/MoldRecordSubjectDetailForm.vue
@@ -0,0 +1,144 @@
+<template>
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    v-loading="formLoading"
+    label-width="0px"
+    :inline-message="true"
+  >
+    <el-table :data="formData" class="-mt-10px">
+      <el-table-column label="序号" type="index" width="100" />
+      <el-table-column label="项目" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.subject`" :rules="formRules.subject" class="mb-0px!">
+            <el-select
+              v-model="row.subject"
+              clearable
+              filterable
+              placeholder="请选择项目"
+            >
+              <el-option
+                v-for="item in subjectList"
+                :key="item.subject"
+                :label="item.subject"
+                :value="item.subject"
+              />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="预期" min-width="400">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.expect`" :rules="formRules.expect">
+<!--            <Editor v-model="row.expect" height="150px" />-->
+            <el-input type="textarea" v-model="row.expect" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="结果" min-width="400">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.result`" :rules="formRules.result">
+            <el-input type="textarea" v-model="row.result" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="明细状态" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.detailStatus`" :rules="formRules.detailStatus" class="mb-0px!">
+            <el-radio-group v-model="row.detailStatus">
+                <el-radio
+                  v-for="dict in getStrDictOptions(DICT_TYPE.MES_PASS_OR_NOPASS)"
+                  :key="dict.value"
+                  :label="dict.value"
+                >
+                  {{ dict.label }}
+                </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </template>
+      </el-table-column>
+       <el-table-column align="center" fixed="right" label="操作" width="60">
+        <template #default="{ $index }">
+          <el-button type="danger" @click="handleDelete($index)" link>
+            <Icon icon="ep:delete" />
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <el-row justify="center" class="mt-3">
+    <el-button @click="handleAdd" round>+ 添加模具维保明细</el-button>
+  </el-row>
+</template>
+<script setup lang="ts">
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { MoldRecordApi } from '@/api/mes/moldrecord'
+import {MoldBrandApi, MoldBrandVO} from "@/api/erp/mold";
+import {MoldRecordSubjectApi, MoldRecordSubjectVO} from "@/api/mes/moldrecordsubject";
+
+const props = defineProps<{
+  recordId: undefined // 维保记录id（主表的关联字段）
+}>()
+const formLoading = ref(false) // 表单的加载中
+const formData = ref([])
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+const subjectList = ref<MoldRecordSubjectVO[]>([]) // 模具型号列表
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.recordId,
+  async (val) => {
+    // 1. 重置表单
+    formData.value = []
+    // 2. val 非空，则加载数据
+    if (!val) {
+      return;
+    }
+    try {
+      formLoading.value = true
+      formData.value = await MoldRecordApi.getMoldRecordSubjectDetailListByRecordId(val)
+    } finally {
+      formLoading.value = false
+    }
+  },
+  { immediate: true }
+)
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  const row = {
+    id: undefined,
+    subject: undefined,
+    expect: undefined,
+    result: undefined,
+    detailStatus: undefined,
+    recordId: undefined
+  }
+  row.recordId = props.recordId
+  formData.value.push(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (index) => {
+  formData.value.splice(index, 1)
+}
+
+/** 表单校验 */
+const validate = () => {
+  return formRef.value.validate()
+}
+
+/** 表单值 */
+const getData = () => {
+  return formData.value
+}
+
+/** 初始化 */
+onMounted(async () => {
+  // 加载列表
+  subjectList.value = await MoldRecordSubjectApi.getList()
+})
+defineExpose({ validate, getData })
+</script>
diff --git a/src/views/mes/machine/index.vue b/src/views/mes/machine/index.vue
index 547b2a71..8a4c6c9b 100644
--- a/src/views/mes/machine/index.vue
+++ b/src/views/mes/machine/index.vue
@@ -145,6 +145,7 @@
         </template>
       </el-table-column>
       <el-table-column label="显示顺序" align="center" prop="sort" />
+      <el-table-column label="模具" align="center" prop="moldName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
         label="创建时间"
@@ -170,11 +171,11 @@
           </el-button>
           <el-button
             link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
+            type="success"
+            @click="openRecordForm('create', scope.row.id)"
             v-hasPermi="['mes:machine-component:update']"
           >
-            替换
+            换模
           </el-button>
           <el-button
             link
@@ -198,6 +199,8 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <MachineComponentForm ref="formRef" @success="getList" />
+  <!-- 表单弹窗：添加/修改 -->
+  <MoldRecordForm ref="recordFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
@@ -207,6 +210,7 @@ import { handleTree } from '@/utils/tree'
 import download from '@/utils/download'
 import { MachineComponentApi, MachineComponentVO } from '@/api/mes/machine'
 import MachineComponentForm from './MachineComponentForm.vue'
+import MoldRecordForm from "@/views/erp/mold/components/MoldRecordForm.vue";
 
 /** 机台 列表 */
 defineOptions({ name: 'MachineComponent' })
@@ -312,4 +316,10 @@ const handleTabClick = (tab: TabsPaneContext) => {
   queryParams.machineType = tab.paneName
   handleQuery()
 }
+
+/** 添加/修改操作 */
+const recordFormRef = ref()
+const openRecordForm = (type: string, id?: number) => {
+  recordFormRef.value.open(type, null, null,id)
+}
 </script>
diff --git a/src/views/mes/moldrecord/MoldRecordForm.vue b/src/views/mes/moldrecord/MoldRecordForm.vue
index 153b82ac..774661d5 100644
--- a/src/views/mes/moldrecord/MoldRecordForm.vue
+++ b/src/views/mes/moldrecord/MoldRecordForm.vue
@@ -8,17 +8,44 @@
       v-loading="formLoading"
     >
       <el-form-item label="单号" prop="code">
-        <el-input :disabled="true" v-model="formData.flowCode" placeholder="保存自动生成" />
+        <el-input :disabled="editDisable" v-model="formData.flowCode" placeholder="保存自动生成" />
       </el-form-item>
       <el-row>
         <el-col :span="12">
           <el-form-item label="模具型号" prop="brandId">
-            <el-input v-model="formData.brandId" placeholder="请输入模具型号" />
+            <el-select
+              :disabled='editDisable'
+              v-model="formData.brandId"
+              clearable
+              filterable
+              placeholder="请选择模具型号"
+              @change="changeBrand"
+            >
+              <el-option
+                v-for="item in brandList"
+                :key="item.id"
+                :label="item.code+'/'+item.name"
+                :value="item.id"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="模具" prop="moldId">
-            <el-input v-model="formData.moldId" placeholder="请输入模具" />
+            <el-select
+              :disabled='editDisable'
+              v-model="formData.moldId"
+              clearable
+              filterable
+              placeholder="请选择模具"
+            >
+              <el-option
+                v-for="item in moldList"
+                :key="item.id"
+                :label="item.code+'/'+item.name"
+                :value="item.id"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -33,20 +60,44 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-row>
+      <el-row v-if="formData.recordType=='换模'">
         <el-col :span="12">
           <el-form-item label="机台" prop="machineId">
-            <el-input v-model="formData.machineId" placeholder="请输入机台ID" />
+            <el-select
+              v-model="formData.machineId"
+              clearable
+              filterable
+              placeholder="请选择机台"
+            >
+              <el-option
+                v-for="item in machineList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="前模具" prop="oldMoldId">
-            <el-input v-model="formData.oldMoldId" placeholder="请输入前模具ID" />
+            <el-input v-model="formData.oldMoldId" placeholder="请输入前模具" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="12">
+        <el-col :span="8">
+          <el-form-item label="负责人" prop="userId">
+            <el-select v-model="formData.userId" clearable filterable placeholder="请选择负责人">
+              <el-option
+                v-for="item in userList"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label="开始时间" prop="startTime">
             <el-date-picker
               v-model="formData.startTime"
@@ -56,7 +107,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="结束时间" prop="endTime">
             <el-date-picker
               v-model="formData.endTime"
@@ -67,12 +118,9 @@
           </el-form-item>
         </el-col>
       </el-row>
-
-      <el-form-item label="负责人" prop="userId">
-        <el-input v-model="formData.userId" placeholder="请输入负责人ID" />
-      </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注" />
+
+        <Editor v-model="formData.remark" height="200px" />
       </el-form-item>
     </el-form>
     <!-- 子表的表单 -->
@@ -91,12 +139,20 @@
 import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import { MoldRecordApi, MoldRecordVO } from '@/api/mes/moldrecord'
 import MoldRecordSubjectDetailForm from './components/MoldRecordSubjectDetailForm.vue'
+import {MoldBrandApi, MoldBrandVO, MoldVO} from "@/api/erp/mold";
+import * as UserApi from "@/api/system/user";
+import {MachineComponentApi, MachineComponentVO} from "@/api/mes/machine";
 
 /** 模具维保 表单 */
 defineOptions({ name: 'MoldRecordForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
+const editDisable = ref(false)
+const brandList = ref<MoldBrandVO[]>([]) // 模具型号列表
+const moldList = ref<MoldVO[]>([]) // 模具列表
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+const machineList = ref<MachineComponentVO[]>([]) // 模具列表
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
@@ -118,9 +174,7 @@ const formRules = reactive({
   brandId: [{ required: true, message: '模具型号ID不能为空', trigger: 'blur' }],
   moldId: [{ required: true, message: '模具ID不能为空', trigger: 'blur' }],
   userId: [{ required: true, message: '负责人ID不能为空', trigger: 'blur' }],
-  recordType: [{ required: true, message: '单据类型不能为空', trigger: 'blur' }],
-  recordStatus: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
-  remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }]
+  recordType: [{ required: true, message: '单据类型不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -139,10 +193,17 @@ const open = async (type: string, id?: number) => {
     formLoading.value = true
     try {
       formData.value = await MoldRecordApi.getMoldRecord(id)
+      editDisable.value = true
     } finally {
       formLoading.value = false
     }
   }
+  // 加载列表
+  brandList.value = await MoldBrandApi.getBrandList()
+  // 获得用户列表
+  userList.value = await UserApi.getSimpleUserList()
+  // 获得用户列表
+  machineList.value = await MachineComponentApi.getMachineComponentList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -195,4 +256,14 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
+
+const query = reactive({
+  brandId: undefined
+})
+const changeBrand = async(e) => {
+  query.brandId = formData.value.brandId
+  // 加载列表
+  moldList.value = await MoldBrandApi.getMoldList(query)
+}
+
 </script>
diff --git a/src/views/mes/moldrecord/components/MoldRecordSubjectDetailForm.vue b/src/views/mes/moldrecord/components/MoldRecordSubjectDetailForm.vue
index 8381e057..ef9ab50c 100644
--- a/src/views/mes/moldrecord/components/MoldRecordSubjectDetailForm.vue
+++ b/src/views/mes/moldrecord/components/MoldRecordSubjectDetailForm.vue
@@ -12,21 +12,34 @@
       <el-table-column label="项目" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.subject`" :rules="formRules.subject" class="mb-0px!">
-            <el-input v-model="row.subject" placeholder="请输入项目" />
+            <el-select
+              v-model="row.subject"
+              clearable
+              filterable
+              placeholder="请选择项目"
+            >
+              <el-option
+                v-for="item in subjectList"
+                :key="item.subject"
+                :label="item.subject"
+                :value="item.subject"
+              />
+            </el-select>
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="预期" min-width="400">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.expect`" :rules="formRules.expect" class="mb-0px!">
-            <Editor v-model="row.expect" height="150px" />
+          <el-form-item :prop="`${$index}.expect`" :rules="formRules.expect">
+<!--            <Editor v-model="row.expect" height="150px" />-->
+            <el-input type="textarea" v-model="row.expect" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="结果" min-width="400">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.result`" :rules="formRules.result" class="mb-0px!">
-            <Editor v-model="row.result" height="150px" />
+          <el-form-item :prop="`${$index}.result`" :rules="formRules.result">
+            <el-input type="textarea" v-model="row.result" />
           </el-form-item>
         </template>
       </el-table-column>
@@ -47,7 +60,9 @@
       </el-table-column>
        <el-table-column align="center" fixed="right" label="操作" width="60">
         <template #default="{ $index }">
-          <el-button @click="handleDelete($index)" link>—</el-button>
+          <el-button type="danger" @click="handleDelete($index)" link>
+            <Icon icon="ep:delete" />
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -59,6 +74,8 @@
 <script setup lang="ts">
 import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import { MoldRecordApi } from '@/api/mes/moldrecord'
+import {MoldBrandApi, MoldBrandVO} from "@/api/erp/mold";
+import {MoldRecordSubjectApi, MoldRecordSubjectVO} from "@/api/mes/moldrecordsubject";
 
 const props = defineProps<{
   recordId: undefined // 维保记录id（主表的关联字段）
@@ -68,7 +85,7 @@ const formData = ref([])
 const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
-
+const subjectList = ref<MoldRecordSubjectVO[]>([]) // 模具型号列表
 /** 监听主表的关联字段的变化，加载对应的子表数据 */
 watch(
   () => props.recordId,
@@ -118,5 +135,10 @@ const getData = () => {
   return formData.value
 }
 
+/** 初始化 */
+onMounted(async () => {
+  // 加载列表
+  subjectList.value = await MoldRecordSubjectApi.getList()
+})
 defineExpose({ validate, getData })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/mes/moldrecord/index.vue b/src/views/mes/moldrecord/index.vue
index adb195b3..b140ac3f 100644
--- a/src/views/mes/moldrecord/index.vue
+++ b/src/views/mes/moldrecord/index.vue
@@ -17,24 +17,22 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="模具" prop="moldId">
-        <el-input
-          v-model="queryParams.moldId"
-          placeholder="请输入模具"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
 
       <el-form-item label="负责人" prop="userId">
-        <el-input
+        <el-select
           v-model="queryParams.userId"
-          placeholder="请输入负责人"
           clearable
-          @keyup.enter="handleQuery"
+          filterable
+          placeholder="请选择负责人"
+          @change="handleQuery"
           class="!w-240px"
-        />
+        ><el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="状态" prop="recordStatus">
         <el-select
@@ -137,14 +135,14 @@
         label="开始时间"
         align="center"
         prop="startTime"
-        :formatter="dateFormatter"
+        :formatter="dateFormatter2"
         width="180px"
       />
       <el-table-column
         label="结束时间"
         align="center"
         prop="endTime"
-        :formatter="dateFormatter"
+        :formatter="dateFormatter2"
         width="180px"
       />
       <el-table-column
@@ -190,11 +188,12 @@
 
 <script setup lang="ts">
 import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
 import download from '@/utils/download'
 import { MoldRecordApi, MoldRecordVO } from '@/api/mes/moldrecord'
 import MoldRecordForm from './MoldRecordForm.vue'
 import MoldRecordSubjectDetailList from './components/MoldRecordSubjectDetailList.vue'
+import * as UserApi from "@/api/system/user";
 
 /** 模具维保 列表 */
 defineOptions({ name: 'MoldRecord' })
@@ -204,6 +203,7 @@ const { t } = useI18n() // 国际化
 
 const loading = ref(true) // 列表的加载中
 const list = ref<MoldRecordVO[]>([]) // 列表的数据
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
@@ -281,8 +281,10 @@ const handleExport = async () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
-  getList()
+onMounted(async () => {
+  await getList()
+  // 获得用户列表
+  userList.value = await UserApi.getSimpleUserList()
 })
 /** tab 切换 */
 let activeName = ''