From a662bfa16da69d3213e56992d33abad264365583 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 11 Feb 2026 21:02:31 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=85=8D=E6=96=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/recipeInfo/index.ts               |   29 +-
 src/api/mes/workReport/index.ts               |  120 ++
 src/router/index.ts                           |   14 +
 .../recipeInfo/components/MaterialSelect.vue  |   93 ++
 src/views/mes/recipeInfo/detail.vue           |  399 +++++++
 src/views/mes/recipeInfo/index.vue            | 1063 +++++++++--------
 src/views/mes/recipeWeight/index.vue          |   36 +-
 src/views/mes/toolingTypeRelation/index.vue   |  260 ++++
 8 files changed, 1479 insertions(+), 535 deletions(-)
 create mode 100644 src/api/mes/workReport/index.ts
 create mode 100644 src/views/mes/recipeInfo/components/MaterialSelect.vue
 create mode 100644 src/views/mes/recipeInfo/detail.vue
 create mode 100644 src/views/mes/toolingTypeRelation/index.vue

diff --git a/src/api/mes/recipeInfo/index.ts b/src/api/mes/recipeInfo/index.ts
index 369d884..e6205d0 100644
--- a/src/api/mes/recipeInfo/index.ts
+++ b/src/api/mes/recipeInfo/index.ts
@@ -1,6 +1,8 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { RecipeInfoVO, RecipeInfoForm, RecipeInfoQuery } from '@/api/mes/recipeInfo/types';
+import type { RecipeWeightForm } from '@/api/mes/recipeWeight/types';
+import type { RecipeMixingForm } from '@/api/mes/recipeMixing/types';
 
 /**
  * 查询配方-基础信息列表
@@ -69,9 +71,26 @@ export const delRecipeInfo = (recipeId: string | number | Array<string | number>
  * @returns {*}
  */
 export function getProdRecipeInfoList (query) {
-    return request({
-        url: '/mes/recipeInfo/getProdRecipeInfoList',
-        method: 'get',
-        params: query
-    });
+  return request({
+    url: '/mes/recipeInfo/getProdRecipeInfoList',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 配方明细一次保存（基本信息+称量信息+混炼信息）
+ */
+export interface RecipeDetailSaveDto {
+  recipeInfo: RecipeInfoForm;
+  weightList: RecipeWeightForm[];
+  mixingList: RecipeMixingForm[];
+}
+
+export const saveRecipeDetail = (data: RecipeDetailSaveDto) => {
+  return request({
+    url: '/mes/recipeInfo/saveDetail',
+    method: 'post',
+    data
+  });
 };
diff --git a/src/api/mes/workReport/index.ts b/src/api/mes/workReport/index.ts
new file mode 100644
index 0000000..d861a37
--- /dev/null
+++ b/src/api/mes/workReport/index.ts
@@ -0,0 +1,120 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 获取待处理工单列表（按工位）
+ * @param query
+ * @returns {*}
+ */
+export const listPendingWorkOrders = (query?: any): AxiosPromise<any> => {
+  return request({
+    url: '/mes/workReport/pendingWorkOrders',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 获取当前工单（按工位）
+ * @param query
+ * @returns {*}
+ */
+export const getCurrentWorkOrder = (query?: any): AxiosPromise<any> => {
+  return request({
+    url: '/mes/workReport/currentWorkOrder',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 下发工单（更新工单状态为已开始）
+ * @param data
+ * @returns {*}
+ */
+export const issueWorkOrder = (data: any) => {
+  return request({
+    url: '/mes/workReport/issueWorkOrder',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 开工
+ * @param data
+ * @returns {*}
+ */
+export const startWork = (data: any) => {
+  return request({
+    url: '/mes/workReport/startWork',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 停工
+ * @param data
+ * @returns {*}
+ */
+export const stopWork = (data: any) => {
+  return request({
+    url: '/mes/workReport/stopWork',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 复工
+ * @param data
+ * @returns {*}
+ */
+export const resumeWork = (data: any) => {
+  return request({
+    url: '/mes/workReport/resumeWork',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 报工
+ * @param data
+ * @returns {*}
+ */
+export const reportWork = (data: any) => {
+  return request({
+    url: '/mes/workReport/reportWork',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 获取报工记录列表
+ * @param query
+ * @returns {*}
+ */
+export const listWorkReportRecords = (query?: any): AxiosPromise<any> => {
+  return request({
+    url: '/mes/workReport/records',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 获取工艺文件列表
+ * @param query
+ * @returns {*}
+ */
+export const listProcessDocuments = (query?: any): AxiosPromise<any> => {
+  return request({
+    url: '/mes/workReport/processDocuments',
+    method: 'get',
+    params: query
+  });
+};
+
diff --git a/src/router/index.ts b/src/router/index.ts
index d2deca8..b124e23 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -219,6 +219,20 @@ export const constantRoutes: RouteRecordRaw[] = [
         meta: { title: '不合格品主管审批', activeMenu: '/qms/qcUnqualifiedApproval', noCache: true }
       }
     ]
+  },
+  {
+    path: '/mes/recipeInfoDetail',
+    component: Layout,
+    hidden: true,
+    redirect: '/mes/recipeInfoDetail/index',
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/mes/recipeInfo/detail.vue'),
+        name: 'RecipeInfoDetail',
+        meta: { title: '配方明细信息', activeMenu: '/mes/recipeInfo', noCache: true }
+      }
+    ]
   }
 ];
 
diff --git a/src/views/mes/recipeInfo/components/MaterialSelect.vue b/src/views/mes/recipeInfo/components/MaterialSelect.vue
new file mode 100644
index 0000000..c7366b3
--- /dev/null
+++ b/src/views/mes/recipeInfo/components/MaterialSelect.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="material-select">
+    <el-form :inline="true" class="mb-2">
+      <el-form-item label="物料编码">
+        <el-input v-model="queryParams.materialCode" placeholder="物料编码" clearable style="width: 160px" @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="物料名称">
+        <el-input v-model="queryParams.materialName" placeholder="物料名称" clearable style="width: 160px" @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      ref="tableRef"
+      v-loading="loading"
+      :data="materialList"
+      highlight-current-row
+      @row-click="handleRowClick"
+      max-height="360"
+    >
+      <el-table-column label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip />
+      <el-table-column label="物料名称" prop="materialName" min-width="160" show-overflow-tooltip />
+      <el-table-column label="物料规格" prop="materialSpec" width="120" show-overflow-tooltip />
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { listBaseMaterialInfo } from '@/api/mes/baseMaterialInfo';
+import type { BaseMaterialInfoVO } from '@/api/mes/baseMaterialInfo/types';
+
+const tableRef = ref<ElTableInstance>();
+const loading = ref(false);
+const materialList = ref<BaseMaterialInfoVO[]>([]);
+const total = ref(0);
+const selectedRow = ref<BaseMaterialInfoVO | null>(null);
+
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+  materialCode: undefined as string | undefined,
+  materialName: undefined as string | undefined
+});
+
+const getList = async () => {
+  loading.value = true;
+  try {
+    const res = await listBaseMaterialInfo(queryParams.value);
+    materialList.value = (res as any).rows ?? res.data ?? [];
+    total.value = (res as any).total ?? 0;
+  } finally {
+    loading.value = false;
+  }
+};
+
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+const resetQuery = () => {
+  queryParams.value.materialCode = undefined;
+  queryParams.value.materialName = undefined;
+  queryParams.value.pageNum = 1;
+  handleQuery();
+};
+
+const handleRowClick = (row: BaseMaterialInfoVO) => {
+  selectedRow.value = row;
+};
+
+/** 获取当前选中的物料，供父组件在确认时调用 */
+const getSelected = () => selectedRow.value;
+
+defineExpose({ getSelected, getList });
+
+onMounted(() => {
+  getList();
+});
+</script>
+
+<style scoped>
+.material-select { padding: 0 8px; }
+</style>
diff --git a/src/views/mes/recipeInfo/detail.vue b/src/views/mes/recipeInfo/detail.vue
new file mode 100644
index 0000000..c36569c
--- /dev/null
+++ b/src/views/mes/recipeInfo/detail.vue
@@ -0,0 +1,399 @@
+<template>
+  <div class="recipe-detail-page p-2">
+    <div class="page-header">
+      <span class="page-title">配方明细信息</span>
+      <div class="header-actions">
+        <el-button type="primary" :icon="isEdit ? 'Select' : 'Edit'" @click="toggleEdit">
+          {{ isEdit ? '取消编辑' : '编辑' }}
+        </el-button>
+        <el-button type="success" icon="Select" :loading="saveLoading" :disabled="!isEdit" @click="handleSave">
+          保存
+        </el-button>
+      </div>
+    </div>
+
+    <el-tabs v-model="activeTab" type="border-card">
+      <el-tab-pane label="基本信息" name="basic">
+        <el-card shadow="never" class="mb-4">
+          <template #header>配方基本信息</template>
+          <el-form ref="basicFormRef" :model="recipeInfo" :disabled="!isEdit" label-width="140px" class="form-grid">
+            <el-row :gutter="16">
+              <el-col :span="8">
+                <el-form-item label="配方代码" prop="recipeCode">
+                  <el-input v-model="recipeInfo.recipeCode" placeholder="配方代码" />
+                </el-form-item>
+                <el-form-item label="超时时间(秒)" prop="overtimeTime">
+                  <el-input-number v-model="recipeInfo.overtimeTime" :min="0" controls-position="right" style="width: 100%" />
+                </el-form-item>
+                <el-form-item label="超温最短时间(秒)" prop="overtempMintime">
+                  <el-input-number v-model="recipeInfo.overtempMintime" :min="0" controls-position="right" style="width: 100%" />
+                </el-form-item>
+                <el-form-item label="最小间隔时间(秒)" prop="miniTime">
+                  <el-input-number v-model="recipeInfo.miniTime" :min="0" controls-position="right" style="width: 100%" />
+                </el-form-item>
+                <el-form-item label="每架车数(车)" prop="shelfNum">
+                  <el-input-number v-model="recipeInfo.shelfNum" :min="0" controls-position="right" style="width: 100%" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="物料名称" prop="recipeCode">
+                  <el-input v-model="recipeInfo.recipeCode" placeholder="物料名称" />
+                </el-form-item>
+                <el-form-item label="超温温度(℃)" prop="overtempTemp">
+                  <el-input-number v-model="recipeInfo.overtempTemp" :min="0" controls-position="right" style="width: 100%" />
+                </el-form-item>
+                <el-form-item label="最低进胶温度(℃)" prop="minInpolytemp">
+                  <el-input-number v-model="recipeInfo.minInpolytemp" controls-position="right" style="width: 100%" />
+                </el-form-item>
+                <el-form-item label="配方总重(千克)" prop="totalWeight">
+                  <el-input-number v-model="recipeInfo.totalWeight" :min="0" controls-position="right" style="width: 100%" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="配方状态" prop="recipeState">
+                  <el-select v-model="recipeInfo.recipeState" placeholder="配方状态" style="width: 100%">
+                    <el-option v-for="d in recipe_state" :key="d.value" :label="d.label" :value="d.value" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="机台名称" prop="machineId">
+                  <el-select v-model="recipeInfo.machineId" placeholder="请选择机台" style="width: 100%">
+                    <el-option v-for="m in machineOptions" :key="m.machineId" :label="m.machineName || m.machineCode" :value="m.machineId" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="超能能量(kw/h)" prop="overTemp">
+                  <el-input-number v-model="recipeInfo.overTemp" :min="0" controls-position="right" style="width: 100%" />
+                </el-form-item>
+                <el-form-item label="最高进胶温度(℃)" prop="maxInpolytemp">
+                  <el-input-number v-model="recipeInfo.maxInpolytemp" :min="0" controls-position="right" style="width: 100%" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
+      </el-tab-pane>
+
+      <el-tab-pane label="称量信息" name="weight">
+        <div class="tab-toolbar mb-3">
+          <el-button type="primary" size="small" @click="calcWeight">计算重量</el-button>
+          <el-button size="small" @click="refreshWeight">刷新称量信息</el-button>
+        </div>
+        <el-card shadow="never" class="mb-3">
+          <template #header>称量明细</template>
+          <el-table :data="weightList" border>
+            <el-table-column type="index" label="序号" width="60" align="center" />
+            <el-table-column label="物料名称/炭黑名称" prop="childCode" min-width="120">
+              <template #default="{ row }">
+                <el-input v-if="isEdit" v-model="row.childCode" size="small" placeholder="物料编码" />
+                <span v-else>{{ row.childCode || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="物料编码" prop="fatherCode" min-width="100">
+              <template #default="{ row }">
+                <el-input v-if="isEdit" v-model="row.fatherCode" size="small" />
+                <span v-else>{{ row.fatherCode || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="称量动作" prop="actCode" width="100">
+              <template #default="{ row }">
+                <el-input v-if="isEdit" v-model="row.actCode" size="small" />
+                <span v-else>{{ row.actCode || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="设定重量(千克)" prop="setWeight" width="140">
+              <template #default="{ row }">
+                <el-input-number v-if="isEdit" v-model="row.setWeight" :min="0" :precision="3" size="small" controls-position="right" style="width: 100%" />
+                <span v-else>{{ row.setWeight ?? '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="允许误差(千克)" prop="errorAllow" width="140">
+              <template #default="{ row }">
+                <el-input-number v-if="isEdit" v-model="row.errorAllow" :min="0" :precision="3" size="small" controls-position="right" style="width: 100%" />
+                <span v-else>{{ row.errorAllow ?? '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="isEdit" label="操作" width="180" fixed="right" align="center">
+              <template #default="{ $index }">
+                <el-button link type="primary" size="small" @click="addWeightRow($index)">添加</el-button>
+                <el-button link type="primary" size="small" @click="insertWeightRow($index)">插入</el-button>
+                <el-button link type="danger" size="small" @click="removeWeightRow($index)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="mt-2 text-secondary">
+            总计 {{ weightTotalWeight }} 千克，允许误差 {{ weightTotalError }} 千克，共 {{ weightList.length }} 条
+          </div>
+        </el-card>
+      </el-tab-pane>
+
+      <el-tab-pane label="混炼信息" name="mixing">
+        <div class="tab-toolbar mb-3">
+          <el-button type="primary" size="small" @click="refreshMixing">调用混炼信息</el-button>
+          <el-button size="small" @click="refreshMixing">刷新混炼信息</el-button>
+        </div>
+        <el-card shadow="never">
+          <el-table :data="mixingList" border>
+            <el-table-column type="index" label="步骤" width="70" align="center" />
+            <el-table-column label="动作" prop="actCode" min-width="120">
+              <template #default="{ row }">
+                <el-input v-if="isEdit" v-model="row.actCode" size="small" />
+                <span v-else>{{ row.actCode || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="条件" prop="condCode" width="100">
+              <template #default="{ row }">
+                <el-input v-if="isEdit" v-model="row.condCode" size="small" />
+                <span v-else>{{ row.condCode || '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="时间(s)" prop="setTime" width="90">
+              <template #default="{ row }">
+                <el-input-number v-if="isEdit" v-model="row.setTime" :min="0" size="small" controls-position="right" style="width: 100%" />
+                <span v-else>{{ row.setTime ?? '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="温度(°C)" prop="setTemp" width="90">
+              <template #default="{ row }">
+                <el-input-number v-if="isEdit" v-model="row.setTemp" :min="0" size="small" controls-position="right" style="width: 100%" />
+                <span v-else>{{ row.setTemp ?? '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="能量(kw/h)" prop="setEnergy" width="100">
+              <template #default="{ row }">
+                <el-input-number v-if="isEdit" v-model="row.setEnergy" :min="0" size="small" controls-position="right" style="width: 100%" />
+                <span v-else>{{ row.setEnergy ?? '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="功率(kw)" prop="setPower" width="90">
+              <template #default="{ row }">
+                <el-input-number v-if="isEdit" v-model="row.setPower" :min="0" size="small" controls-position="right" style="width: 100%" />
+                <span v-else>{{ row.setPower ?? '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="压力" prop="setPres" width="80">
+              <template #default="{ row }">
+                <el-input-number v-if="isEdit" v-model="row.setPres" :min="0" size="small" controls-position="right" style="width: 100%" />
+                <span v-else>{{ row.setPres ?? '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="转速(rpm)" prop="setRota" width="100">
+              <template #default="{ row }">
+                <el-input-number v-if="isEdit" v-model="row.setRota" :min="0" size="small" controls-position="right" style="width: 100%" />
+                <span v-else>{{ row.setRota ?? '-' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="isEdit" label="操作" width="120" fixed="right" align="center">
+              <template #default="{ $index }">
+                <el-button link type="primary" size="small" @click="insertMixingRow($index)">插入</el-button>
+                <el-button link type="danger" size="small" @click="removeMixingRow($index)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="mt-2 text-secondary">共 {{ mixingList.length }} 条</div>
+        </el-card>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup name="RecipeInfoDetail" lang="ts">
+import { getRecipeInfo, saveRecipeDetail } from '@/api/mes/recipeInfo';
+import { listRecipeWeight } from '@/api/mes/recipeWeight';
+import { listRecipeMixing } from '@/api/mes/recipeMixing';
+import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo';
+import type { RecipeInfoForm } from '@/api/mes/recipeInfo/types';
+import type { RecipeWeightForm } from '@/api/mes/recipeWeight/types';
+import type { RecipeMixingForm } from '@/api/mes/recipeMixing/types';
+import type { ProdBaseMachineInfoVO } from '@/api/mes/prodBaseMachineInfo/types';
+
+const route = useRoute();
+const router = useRouter();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { recipe_state } = toRefs<any>(proxy?.useDict('recipe_state'));
+
+const recipeId = computed(() => route.query.recipeId as string || '');
+const activeTab = ref('basic');
+const isEdit = ref(false);
+const saveLoading = ref(false);
+const basicFormRef = ref<ElFormInstance>();
+
+const recipeInfo = ref<RecipeInfoForm>({});
+const weightList = ref<RecipeWeightForm[]>([]);
+const mixingList = ref<RecipeMixingForm[]>([]);
+const machineOptions = ref<ProdBaseMachineInfoVO[]>([]);
+
+const weightTotalWeight = computed(() =>
+  weightList.value.reduce((s, r) => s + (Number(r.setWeight) || 0), 0).toFixed(3)
+);
+const weightTotalError = computed(() =>
+  weightList.value.reduce((s, r) => s + (Number(r.errorAllow) || 0), 0).toFixed(3)
+);
+
+function toggleEdit() {
+  isEdit.value = !isEdit.value;
+}
+
+async function loadData() {
+  if (!recipeId.value) {
+    proxy?.$modal.msgWarning('缺少配方ID');
+    return;
+  }
+  try {
+    const [infoRes, weightRes, mixingRes] = await Promise.all([
+      getRecipeInfo(recipeId.value),
+      listRecipeWeight({ recipeId: recipeId.value, pageNum: 1, pageSize: 9999 }),
+      listRecipeMixing({ recipeId: recipeId.value, pageNum: 1, pageSize: 9999 })
+    ]);
+    const infoData = (infoRes as any).data ?? infoRes;
+    recipeInfo.value = { ...infoData };
+    weightList.value = (weightRes.rows || []).map((r: any) => ({ ...r }));
+    const mixRows = mixingRes.rows || [];
+    mixingList.value = mixRows.map((r: any) => ({ ...r }));
+  } catch (e) {
+    proxy?.$modal.msgError('加载失败');
+  }
+}
+
+async function loadMachines() {
+  try {
+    const res = await getProdBaseMachineInfoList({});
+    machineOptions.value = res.data || [];
+  } catch {
+    machineOptions.value = [];
+  }
+}
+
+function addWeightRow(index: number) {
+  const base = weightList.value[index] || {};
+  weightList.value.splice(index + 1, 0, {
+    recipeId: recipeId.value,
+    machineId: recipeInfo.value.machineId,
+    edtCode: recipeInfo.value.edtCode,
+    weightSeq: (weightList.value.length + 1) as any,
+    weightType: base.weightType || '',
+    scaleCode: base.scaleCode,
+    actCode: base.actCode || '称量',
+    setWeight: undefined,
+    errorAllow: undefined,
+    fatherCode: '',
+    unitId: undefined,
+    childCode: '',
+    ifUseBat: '',
+    maxRate: ''
+  } as RecipeWeightForm);
+}
+
+function insertWeightRow(index: number) {
+  const base = weightList.value[index] || {};
+  weightList.value.splice(index, 0, {
+    recipeId: recipeId.value,
+    machineId: recipeInfo.value.machineId,
+    edtCode: recipeInfo.value.edtCode,
+    weightSeq: (index + 1) as any,
+    weightType: base.weightType || '',
+    scaleCode: base.scaleCode,
+    actCode: base.actCode || '称量',
+    setWeight: undefined,
+    errorAllow: undefined,
+    fatherCode: '',
+    unitId: undefined,
+    childCode: '',
+    ifUseBat: '',
+    maxRate: ''
+  } as RecipeWeightForm);
+}
+
+function removeWeightRow(index: number) {
+  weightList.value.splice(index, 1);
+}
+
+function insertMixingRow(index: number) {
+  const base = mixingList.value[index] || {};
+  mixingList.value.splice(index, 0, {
+    recipeId: recipeId.value,
+    machineId: recipeInfo.value.machineId,
+    edtCode: recipeInfo.value.edtCode,
+    mixId: index + 1,
+    condCode: base.condCode || '',
+    actCode: base.actCode || '',
+    setTime: undefined,
+    setTemp: undefined,
+    setEnergy: undefined,
+    setPower: undefined,
+    setPres: undefined,
+    setRota: undefined,
+    fatherCode: '',
+    childCode: '',
+    termCode: ''
+  } as RecipeMixingForm);
+}
+
+function removeMixingRow(index: number) {
+  mixingList.value.splice(index, 1);
+}
+
+function calcWeight() {
+  proxy?.$modal.msg('计算重量功能可按业务规则扩展');
+}
+
+async function refreshWeight() {
+  await loadData();
+  activeTab.value = 'weight';
+}
+
+async function refreshMixing() {
+  await loadData();
+  activeTab.value = 'mixing';
+}
+
+async function handleSave() {
+  if (!recipeId.value) return;
+  saveLoading.value = true;
+  try {
+    const payload = {
+      recipeInfo: { ...recipeInfo.value, recipeId: recipeId.value },
+      weightList: weightList.value.map((w, i) => ({
+        ...w,
+        recipeId: recipeId.value,
+        machineId: recipeInfo.value.machineId ?? w.machineId,
+        edtCode: recipeInfo.value.edtCode ?? w.edtCode,
+        weightSeq: (w.weightSeq ?? i + 1) as number
+      })),
+      mixingList: mixingList.value.map((m, i) => ({
+        ...m,
+        recipeId: recipeId.value,
+        machineId: recipeInfo.value.machineId ?? m.machineId,
+        edtCode: recipeInfo.value.edtCode ?? m.edtCode,
+        mixId: (m.mixId ?? i + 1) as number
+      }))
+    };
+    await saveRecipeDetail(payload);
+    proxy?.$modal.msgSuccess('保存成功');
+    isEdit.value = false;
+    await loadData();
+  } catch (e) {
+    proxy?.$modal.msgError('保存失败');
+  } finally {
+    saveLoading.value = false;
+  }
+}
+
+onMounted(() => {
+  loadMachines();
+  loadData();
+});
+</script>
+
+<style lang="scss" scoped>
+.recipe-detail-page {
+  .page-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 16px;
+    .page-title { font-size: 18px; font-weight: 600; }
+    .header-actions { display: flex; gap: 8px; }
+  }
+  .tab-toolbar { display: flex; gap: 8px; }
+  .form-grid .el-input-number { width: 100%; }
+}
+</style>
diff --git a/src/views/mes/recipeInfo/index.vue b/src/views/mes/recipeInfo/index.vue
index 31390b6..3ca5223 100644
--- a/src/views/mes/recipeInfo/index.vue
+++ b/src/views/mes/recipeInfo/index.vue
@@ -1,350 +1,304 @@
 <template>
-  <div class='p-2'>
-    <transition :enter-active-class='proxy?.animate.searchAnimate.enter'
-                :leave-active-class='proxy?.animate.searchAnimate.leave'>
-      <div v-show='showSearch' class='mb-[10px]'>
-        <el-card shadow='hover'>
-          <el-form ref='queryFormRef' :model='queryParams' :inline='true'>
-            <el-form-item label='配方状态' prop='recipeState'>
-              <el-select v-model='queryParams.recipeState' placeholder='请选择配方状态' clearable>
-                <el-option v-for='dict in recipe_state' :key='dict.value' :label='dict.label' :value='dict.value' />
+  <div class="recipe-info-page p-2">
+    <!-- 顶部：标题 + 操作按钮 -->
+    <div class="page-header">
+      <span class="page-title">工艺配方维护</span>
+      <div class="header-actions">
+        <el-button type="primary" icon="Plus" @click="handleAdd" v-hasPermi="['mes:recipeInfo:add']">
+          新增工艺配方
+        </el-button>
+        <el-button type="danger" icon="Delete" :disabled="multiple" @click="handleDelete()"
+                   v-hasPermi="['mes:recipeInfo:remove']">
+          配方删除
+        </el-button>
+        <el-button type="warning" icon="CopyDocument" :disabled="single" @click="handleSaveAs"
+                   v-hasPermi="['mes:recipeInfo:add']">
+          配方另存
+        </el-button>
+      </div>
+    </div>
+
+    <!-- 搜索/筛选区域 -->
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+                :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="search-area mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <!-- <el-form-item label="胶料名称" prop="recipeCode">
+              <el-input v-model="queryParams.recipeCode" placeholder="请输入胶料名称" clearable
+                        style="width: 180px" @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <el-form-item label="配方类型" prop="recipeType">
+              <el-select v-model="queryParams.recipeType" placeholder="请选择配方类型" clearable style="width: 140px">
+                <el-option v-for="dict in recipe_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="配方状态" prop="recipeState">
+              <el-select v-model="queryParams.recipeState" placeholder="请选择配方状态" clearable style="width: 140px">
+                <el-option v-for="dict in recipe_state" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="机台" prop="machineId">
+              <el-select v-model="queryParams.machineId" placeholder="请选择机台" clearable style="width: 180px">
+                <el-option
+                  v-for="item in machineOptions"
+                  :key="item.machineId"
+                  :label="item.machineName || item.machineCode"
+                  :value="item.machineId"
+                />
               </el-select>
             </el-form-item>
             <el-form-item>
-              <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
-              <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>
       </div>
     </transition>
 
-    <el-card shadow='never'>
-      <template #header>
-        <el-row :gutter='10' class='mb8'>
-          <el-col :span='1.5'>
-            <el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['mes:recipeInfo:add']">新增
-            </el-button>
+    <!-- 主体：左侧树 + 右侧内容 -->
+    <el-row :gutter="10" class="main-row">
+      <!-- 左侧树形 -->
+      <el-col :span="5" :xs="24" class="left-tree-col">
+        <el-card shadow="never" class="tree-card">
+          <template #header>
+            <span>胶料名称</span>
+          </template>
+          <el-input
+            v-model="treeFilterText"
+            placeholder="请输入胶料名称"
+            clearable
+            size="default"
+            class="tree-filter-input"
+            prefix-icon="Search"
+          />
+          <div class="tree-container">
+            <el-tree
+              ref="treeRef"
+              :data="treeData"
+              :props="{ label: 'label', children: 'children' }"
+              :expand-on-click-node="false"
+              :filter-node-method="filterTreeNode"
+              node-key="id"
+              highlight-current
+              default-expand-all
+              @node-click="handleTreeNodeClick"
+            />
+          </div>
+        </el-card>
+      </el-col>
+
+      <!-- 右侧：表格 + 配方基本信息 -->
+      <el-col :span="19" :xs="24" class="right-content-col">
+        <!-- 机台配方基本信息 -->
+        <el-card shadow="never" class="table-card">
+          <template #header>
+            <div class="table-card-header">
+              <span>机台配方基本信息{{ selectedTreeLabel ? '[' + selectedTreeLabel + ']' : '' }}</span>
+              <div class="version-switch">
+                <el-checkbox v-model="showInUseOnly">显示正用版本</el-checkbox>
+                <el-checkbox v-model="showAllVersion">显示全部版本</el-checkbox>
+              </div>
+            </div>
+          </template>
+          <el-table
+            v-loading="loading"
+            :data="filteredTableList"
+            @selection-change="handleSelectionChange"
+            @current-change="handleTableCurrentChange"
+            highlight-current-row
+          >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="机台" align="center" prop="machineId" min-width="120" show-overflow-tooltip>
+              <template #default="scope">
+                {{ getMachineName(scope.row.machineId) || scope.row.machineId || '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="物料编码" align="center" min-width="110" show-overflow-tooltip>
+              <template #default="scope">
+                {{ getMaterialCode(scope.row.materialId) || scope.row.materialId || '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="物料名称" align="center" min-width="120" show-overflow-tooltip>
+              <template #default="scope">
+                {{ getMaterialName(scope.row.materialId) || '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="配方代号" align="center" prop="recipeCode" min-width="110" show-overflow-tooltip />
+            <el-table-column label="版本号" align="center" prop="edtCode" width="80" />
+            <el-table-column label="配方创建时间" align="center" prop="createTime" width="170">
+              <template #default="scope">
+                {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') || '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="配方类型" align="center" prop="recipeType" width="90">
+              <template #default="scope">
+                <dict-tag :options="recipe_type" :value="scope.row.recipeType" />
+              </template>
+            </el-table-column>
+            <el-table-column label="配方状态" align="center" prop="recipeState" width="90">
+              <template #default="scope">
+                <dict-tag :options="recipe_state" :value="scope.row.recipeState" />
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="审核标志" align="center" prop="auditFlag" width="90">
+              <template #default="scope">
+                {{ scope.row.auditFlag === '1' ? '已审核' : '未审核' }}
+              </template>
+            </el-table-column> -->
+            <el-table-column label="操作" align="center" width="200" fixed="right">
+              <template #default="scope">
+                <el-button link type="primary" @click="handleDetail(scope.row)"
+                           v-hasPermi="['mes:recipeInfo:query']">配方明细</el-button>
+                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                           v-hasPermi="['mes:recipeInfo:edit']">修改</el-button>
+                <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                           v-hasPermi="['mes:recipeInfo:remove']">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                      v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-card>
+
+        <!-- 配方基本信息（只读展示） -->
+        <el-card shadow="never" class="form-card">
+          <template #header>
+            <span>配方基本信息</span>
+          </template>
+          <el-descriptions :column="3" border>
+            <el-descriptions-item label="配方代码">{{ detailForm.recipeCode || '-' }}</el-descriptions-item>
+            <el-descriptions-item label="配方名称">{{ detailForm.recipeCode || '-' }}</el-descriptions-item>
+            <el-descriptions-item label="配方状态">
+              <dict-tag v-if="detailForm.recipeState" :options="recipe_state" :value="detailForm.recipeState" />
+              <span v-else>-</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="配方编号">{{ detailForm.recipeTypecode || '-' }}</el-descriptions-item>
+            <el-descriptions-item label="物料编码">{{ getMaterialCode(detailForm.materialId) || detailForm.materialId || '-' }}</el-descriptions-item>
+            <el-descriptions-item label="物料名称">{{ getMaterialName(detailForm.materialId) || '-' }}</el-descriptions-item>
+            <el-descriptions-item label="机台名称">{{ getMachineName(detailForm.machineId) || detailForm.machineId || '-' }}</el-descriptions-item>
+            <el-descriptions-item label="超时时间(秒)">{{ detailForm.overtimeTime ?? '-' }}</el-descriptions-item>
+            <el-descriptions-item label="超温温度(℃)">{{ detailForm.overtempTemp ?? '-' }}</el-descriptions-item>
+            <el-descriptions-item label="超能能量(kw/h)">{{ detailForm.overTemp ?? '-' }}</el-descriptions-item>
+            <el-descriptions-item label="超温最短时间(秒)">{{ detailForm.overtempMintime ?? '-' }}</el-descriptions-item>
+            <el-descriptions-item label="最低进胶温度(℃)">{{ detailForm.minInpolytemp ?? '-' }}</el-descriptions-item>
+            <el-descriptions-item label="最高进胶温度(℃)">{{ detailForm.maxInpolytemp ?? '-' }}</el-descriptions-item>
+            <el-descriptions-item label="最小间隔时间(秒)">{{ detailForm.miniTime ?? '-' }}</el-descriptions-item>
+            <el-descriptions-item label="配方总重(千克)">{{ detailForm.totalWeight ?? '-' }}</el-descriptions-item>
+            <el-descriptions-item label="每架车数(车)">{{ detailForm.shelfNum ?? '-' }}</el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改配方对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
+      <el-form ref="recipeInfoFormRef" :model="form" :rules="rules" label-width="140px">
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="配方编码" prop="recipeCode">
+              <el-input v-model="form.recipeCode" placeholder="请输入配方编码" />
+            </el-form-item>
+            <el-form-item label="物料" prop="materialId">
+              <el-input
+                :model-value="formMaterialDisplay"
+                placeholder="请选择物料"
+                readonly
+                style="width: 100%"
+                @click="openMaterialSelect"
+              >
+                <template #append>
+                  <el-button :icon="'Search'" @click.stop="openMaterialSelect">选择</el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="机台" prop="machineId">
+              <el-select v-model="form.machineId" placeholder="请选择机台" style="width: 100%" clearable>
+                <el-option
+                  v-for="item in machineOptions"
+                  :key="item.machineId"
+                  :label="item.machineName || item.machineCode"
+                  :value="item.machineId"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="版本号" prop="edtCode">
+              <el-input v-model="form.edtCode" placeholder="请输入版本号" />
+            </el-form-item>
+            <el-form-item label="配方类型" prop="recipeType">
+              <el-select v-model="form.recipeType" placeholder="请选择配方类型" style="width: 100%">
+                <el-option v-for="dict in recipe_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="配方状态" prop="recipeState">
+              <el-select v-model="form.recipeState" placeholder="请选择配方状态" style="width: 100%">
+                <el-option v-for="dict in recipe_state" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="超时时间(秒)" prop="overtimeTime">
+              <el-input-number v-model="form.overtimeTime" :min="0" controls-position="right" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="超温最短时间(秒)" prop="overtempMintime">
+              <el-input-number v-model="form.overtempMintime" :min="0" controls-position="right" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="最小间隔时间(秒)" prop="miniTime">
+              <el-input-number v-model="form.miniTime" :min="0" controls-position="right" style="width: 100%" />
+            </el-form-item>
           </el-col>
-          <el-col :span='1.5'>
-            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
-                       v-hasPermi="['mes:recipeInfo:edit']">修改
-            </el-button>
+          <el-col :span="12">
+            <el-form-item label="超温温度(℃)" prop="overtempTemp">
+              <el-input-number v-model="form.overtempTemp" :min="0" controls-position="right" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="最低进胶温度(℃)" prop="minInpolytemp">
+              <el-input-number v-model="form.minInpolytemp" controls-position="right" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="最高进胶温度(℃)" prop="maxInpolytemp">
+              <el-input-number v-model="form.maxInpolytemp" :min="0" controls-position="right" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="配方总重(千克)" prop="totalWeight">
+              <el-input-number v-model="form.totalWeight" :min="0" controls-position="right" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="每架车数(车)" prop="shelfNum">
+              <el-input-number v-model="form.shelfNum" :min="0" controls-position="right" style="width: 100%" />
+            </el-form-item>
+            <!-- <el-form-item label="审核标志" prop="auditFlag">
+              <el-select v-model="form.auditFlag" placeholder="请选择" style="width: 100%">
+                <el-option label="未审核" value="0" />
+                <el-option label="已审核" value="1" />
+              </el-select>
+            </el-form-item> -->
           </el-col>
-          <el-col :span='1.5'>
-            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
-                       v-hasPermi="['mes:recipeInfo:remove']">删除
-            </el-button>
-          </el-col>
-          <el-col :span='1.5'>
-            <el-button type='warning' plain icon='Download' @click='handleExport'
-                       v-hasPermi="['mes:recipeInfo:export']">导出
-            </el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
-                         @queryTable='getList'></right-toolbar>
         </el-row>
-      </template>
-
-      <el-table v-loading='loading' :data='recipeInfoList' @selection-change='handleSelectionChange'>
-        <el-table-column type='selection' width='55' align='center' />
-        <el-table-column label='主键标识' align='center' prop='recipeId' v-if='columns[0].visible' />
-        <el-table-column label='机台ID' align='center' prop='machineId' v-if='columns[1].visible' />
-        <el-table-column label='物料ID' align='center' prop='materialId' v-if='columns[2].visible' />
-        <el-table-column label='版本号' align='center' prop='edtCode' v-if='columns[3].visible' />
-        <el-table-column label='配方类型' align='center' prop='recipeType' v-if='columns[4].visible'>
-          <template #default='scope'>
-            <dict-tag :options='recipe_type' :value='scope.row.recipeType' />
-          </template>
-        </el-table-column>
-        <el-table-column label='用户版本' align='center' prop='userEdtCode' v-if='columns[5].visible' />
-        <el-table-column label='配方状态' align='center' prop='recipeState' v-if='columns[6].visible'>
-          <template #default='scope'>
-            <dict-tag :options='recipe_state' :value='scope.row.recipeState' />
-          </template>
-        </el-table-column>
-        <el-table-column label='完成时间' align='center' prop='doneTime' v-if='columns[7].visible' />
-        <el-table-column label='架子车数' align='center' prop='shelfNum' v-if='columns[8].visible' />
-        <el-table-column label='配方重量' align='center' prop='totalWeight' v-if='columns[9].visible' />
-        <el-table-column label='填充系数' align='center' prop='fillCoefficient' v-if='columns[10].visible' />
-        <el-table-column label='炭黑回收类型' align='center' prop='cbRecycleType' v-if='columns[11].visible' />
-        <el-table-column label='炭黑回收时间' align='center' prop='cbRecycleTime' v-if='columns[12].visible' />
-        <el-table-column label='超温排胶最短时间' align='center' prop='overtempMintime' v-if='columns[13].visible' />
-        <el-table-column label='超时排胶时间' align='center' prop='overtimeTime' v-if='columns[14].visible' />
-        <el-table-column label='超温排胶温度' align='center' prop='overtempTemp' v-if='columns[15].visible' />
-        <el-table-column label='最大进胶温度' align='center' prop='maxInpolytemp' v-if='columns[16].visible' />
-        <el-table-column label='最小进胶温度' align='center' prop='minInpolytemp' v-if='columns[17].visible' />
-        <el-table-column label='进胶时间' align='center' prop='inPolytime' v-if='columns[18].visible' />
-        <el-table-column label='进炭黑时间' align='center' prop='inCarbontime' v-if='columns[19].visible' />
-        <el-table-column label='进油时间' align='center' prop='inOiltime' v-if='columns[20].visible' />
-        <el-table-column label='进粉时间' align='center' prop='inPowdertime' v-if='columns[21].visible' />
-        <el-table-column label='辊速差' align='center' prop='rollSpeeddiff' v-if='columns[22].visible' />
-        <el-table-column label='上顶栓压力差' align='center' prop='ramPressdiff' v-if='columns[23].visible' />
-        <el-table-column label='是否使用区域温度' align='center' prop='isUseareatemp' v-if='columns[24].visible' />
-        <el-table-column label='侧温' align='center' prop='sideTemp' v-if='columns[25].visible' />
-        <el-table-column label='侧温温差' align='center' prop='sideTempdiff' v-if='columns[26].visible' />
-        <el-table-column label='辊温' align='center' prop='rollTemp' v-if='columns[27].visible' />
-        <el-table-column label='辊温温差' align='center' prop='rollTempdiff' v-if='columns[28].visible' />
-        <el-table-column label='卸料门温度' align='center' prop='ddoorTemp' v-if='columns[29].visible' />
-        <el-table-column label='卸料门温差' align='center' prop='ddoorTempdiff' v-if='columns[30].visible' />
-        <el-table-column label='操作者' align='center' prop='operCode' v-if='columns[31].visible' />
-        <el-table-column label='备注' align='center' prop='memNote' v-if='columns[32].visible' />
-        <el-table-column label='配方编码' align='center' prop='recipeCode' v-if='columns[33].visible' />
-        <el-table-column label='开始使用时间' align='center' prop='startDatetime' v-if='columns[34].visible' />
-        <el-table-column label='停用时间' align='center' prop='endDatetime' v-if='columns[35].visible' />
-        <el-table-column label='机台优先级' align='center' prop='equipPrior' v-if='columns[36].visible' />
-        <el-table-column label='配方类型编码' align='center' prop='recipeTypecode' v-if='columns[37].visible' />
-        <el-table-column label='胶种编码' align='center' prop='rubTypecode' v-if='columns[38].visible' />
-        <el-table-column label='胶种类型' align='center' prop='rubType' v-if='columns[39].visible' />
-        <el-table-column label='物料种类编码' align='center' prop='mkindCode' v-if='columns[40].visible' />
-        <el-table-column label='物料分类编码' align='center' prop='ikindCode' v-if='columns[41].visible' />
-        <el-table-column label='共混范围' align='center' prop='conglRang' v-if='columns[42].visible' />
-        <el-table-column label='SDS温度' align='center' prop='sdsTemp' v-if='columns[43].visible' />
-        <el-table-column label='最短时间' align='center' prop='miniTime' v-if='columns[44].visible' />
-        <el-table-column label='审核标志' align='center' prop='auditFlag' v-if='columns[45].visible' />
-        <el-table-column label='审核者' align='center' prop='auditName' v-if='columns[46].visible' />
-        <el-table-column label='审核日期' align='center' prop='auditDate' width='180' v-if='columns[47].visible'>
-          <template #default='scope'>
-            <span>{{ parseTime(scope.row.auditDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label='配方字典' align='center' prop='recipeDic' v-if='columns[48].visible' />
-        <el-table-column label='停放时间' align='center' prop='stayTime' v-if='columns[49].visible' />
-        <el-table-column label='研究编码' align='center' prop='rearchCode' v-if='columns[50].visible' />
-        <el-table-column label='黑胶回用' align='center' prop='blackReuse' v-if='columns[51].visible' />
-        <el-table-column label='回用时间' align='center' prop='reuseTime' v-if='columns[52].visible' />
-        <el-table-column label='过期时间' align='center' prop='expireTime' v-if='columns[53].visible' />
-        <el-table-column label='超温' align='center' prop='overTemp' v-if='columns[54].visible' />
-        <el-table-column label='最高温度' align='center' prop='maxTemp' v-if='columns[55].visible' />
-        <el-table-column label='最低温度' align='center' prop='minTemp' v-if='columns[56].visible' />
-        <el-table-column label='是否不控' align='center' prop='ifNot' v-if='columns[57].visible' />
-        <el-table-column label='主机温度' align='center' prop='zzTemp' v-if='columns[58].visible' />
-        <el-table-column label='卸料门温度(小料门)' align='center' prop='xlmTemp' v-if='columns[59].visible' />
-        <el-table-column label='排胶控制' align='center' prop='pjcontrl' v-if='columns[60].visible' />
-        <el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
-          <template #default='scope'>
-            <el-tooltip content='修改' placement='top'>
-              <el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
-                         v-hasPermi="['mes:recipeInfo:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content='删除' placement='top'>
-              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
-                         v-hasPermi="['mes:recipeInfo:remove']"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
-                  v-model:limit='queryParams.pageSize' @pagination='getList' />
-    </el-card>
-    <!-- 添加或修改配方-基础信息对话框 -->
-    <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
-      <el-form ref='recipeInfoFormRef' :model='form' :rules='rules' label-width='120px'>
-        <el-form-item label='主键标识' prop='recipeId'>
-          <el-input v-model='form.recipeId' placeholder='请输入主键标识' />
-        </el-form-item>
-        <el-form-item label='机台ID' prop='machineId'>
-          <el-input v-model='form.machineId' placeholder='请输入机台ID' />
-        </el-form-item>
-        <el-form-item label='物料ID' prop='materialId'>
-          <el-input v-model='form.materialId' placeholder='请输入物料ID' />
-        </el-form-item>
-        <el-form-item label='版本号' prop='edtCode'>
-          <el-input v-model='form.edtCode' placeholder='请输入版本号' />
-        </el-form-item>
-        <el-form-item label='配方类型' prop='recipeType'>
-          <el-select v-model='form.recipeType' placeholder='请选择配方类型'>
-            <el-option
-              v-for='dict in recipe_type'
-              :key='dict.value'
-              :label='dict.label'
-              :value='parseInt(dict.value)'
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label='用户版本' prop='userEdtCode'>
-          <el-input v-model='form.userEdtCode' placeholder='请输入用户版本' />
-        </el-form-item>
-        <el-form-item label='配方状态' prop='recipeState'>
-          <el-select v-model='form.recipeState' placeholder='请选择配方状态'>
-            <el-option
-              v-for='dict in recipe_state'
-              :key='dict.value'
-              :label='dict.label'
-              :value='dict.value'
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label='完成时间' prop='doneTime'>
-          <el-input v-model='form.doneTime' placeholder='请输入完成时间' />
-        </el-form-item>
-        <el-form-item label='架子车数' prop='shelfNum'>
-          <el-input v-model='form.shelfNum' placeholder='请输入架子车数' />
-        </el-form-item>
-        <el-form-item label='配方重量' prop='totalWeight'>
-          <el-input v-model='form.totalWeight' placeholder='请输入配方重量' />
-        </el-form-item>
-        <el-form-item label='填充系数' prop='fillCoefficient'>
-          <el-input v-model='form.fillCoefficient' placeholder='请输入填充系数' />
-        </el-form-item>
-        <el-form-item label='超温排胶最短时间' prop='overtempMintime'>
-          <el-input v-model='form.overtempMintime' placeholder='请输入超温排胶最短时间' />
-        </el-form-item>
-        <el-form-item label='超时排胶时间' prop='overtimeTime'>
-          <el-input v-model='form.overtimeTime' placeholder='请输入超时排胶时间' />
-        </el-form-item>
-        <el-form-item label='超温排胶温度' prop='overtempTemp'>
-          <el-input v-model='form.overtempTemp' placeholder='请输入超温排胶温度' />
-        </el-form-item>
-        <el-form-item label='最大进胶温度' prop='maxInpolytemp'>
-          <el-input v-model='form.maxInpolytemp' placeholder='请输入最大进胶温度' />
-        </el-form-item>
-        <el-form-item label='最小进胶温度' prop='minInpolytemp'>
-          <el-input v-model='form.minInpolytemp' placeholder='请输入最小进胶温度' />
-        </el-form-item>
-        <el-form-item label='进胶时间' prop='inPolytime'>
-          <el-input v-model='form.inPolytime' placeholder='请输入进胶时间' />
-        </el-form-item>
-        <el-form-item label='进炭黑时间' prop='inCarbontime'>
-          <el-input v-model='form.inCarbontime' placeholder='请输入进炭黑时间' />
-        </el-form-item>
-        <el-form-item label='进油时间' prop='inOiltime'>
-          <el-input v-model='form.inOiltime' placeholder='请输入进油时间' />
-        </el-form-item>
-        <el-form-item label='进粉时间' prop='inPowdertime'>
-          <el-input v-model='form.inPowdertime' placeholder='请输入进粉时间' />
-        </el-form-item>
-        <el-form-item label='辊速差' prop='rollSpeeddiff'>
-          <el-input v-model='form.rollSpeeddiff' placeholder='请输入辊速差' />
-        </el-form-item>
-        <el-form-item label='上顶栓压力差' prop='ramPressdiff'>
-          <el-input v-model='form.ramPressdiff' placeholder='请输入上顶栓压力差' />
-        </el-form-item>
-        <el-form-item label='侧温' prop='sideTemp'>
-          <el-input v-model='form.sideTemp' placeholder='请输入侧温' />
-        </el-form-item>
-        <el-form-item label='侧温温差' prop='sideTempdiff'>
-          <el-input v-model='form.sideTempdiff' placeholder='请输入侧温温差' />
-        </el-form-item>
-        <el-form-item label='辊温' prop='rollTemp'>
-          <el-input v-model='form.rollTemp' placeholder='请输入辊温' />
-        </el-form-item>
-        <el-form-item label='辊温温差' prop='rollTempdiff'>
-          <el-input v-model='form.rollTempdiff' placeholder='请输入辊温温差' />
-        </el-form-item>
-        <el-form-item label='卸料门温度' prop='ddoorTemp'>
-          <el-input v-model='form.ddoorTemp' placeholder='请输入卸料门温度' />
-        </el-form-item>
-        <el-form-item label='卸料门温差' prop='ddoorTempdiff'>
-          <el-input v-model='form.ddoorTempdiff' placeholder='请输入卸料门温差' />
-        </el-form-item>
-        <el-form-item label='操作者' prop='operCode'>
-          <el-input v-model='form.operCode' placeholder='请输入操作者' />
-        </el-form-item>
-        <el-form-item label='备注' prop='memNote'>
-          <el-input v-model='form.memNote' placeholder='请输入备注' />
-        </el-form-item>
-        <el-form-item label='配方编码' prop='recipeCode'>
-          <el-input v-model='form.recipeCode' placeholder='请输入配方编码' />
-        </el-form-item>
-        <el-form-item label='开始使用时间' prop='startDatetime'>
-          <el-input v-model='form.startDatetime' placeholder='请输入开始使用时间' />
-        </el-form-item>
-        <el-form-item label='停用时间' prop='endDatetime'>
-          <el-input v-model='form.endDatetime' placeholder='请输入停用时间' />
-        </el-form-item>
-        <el-form-item label='机台优先级' prop='equipPrior'>
-          <el-input v-model='form.equipPrior' placeholder='请输入机台优先级' />
-        </el-form-item>
-        <el-form-item label='配方类型编码' prop='recipeTypecode'>
-          <el-input v-model='form.recipeTypecode' placeholder='请输入配方类型编码' />
-        </el-form-item>
-        <el-form-item label='胶种编码' prop='rubTypecode'>
-          <el-input v-model='form.rubTypecode' placeholder='请输入胶种编码' />
-        </el-form-item>
-        <el-form-item label='物料种类编码' prop='mkindCode'>
-          <el-input v-model='form.mkindCode' placeholder='请输入物料种类编码' />
-        </el-form-item>
-        <el-form-item label='物料分类编码' prop='ikindCode'>
-          <el-input v-model='form.ikindCode' placeholder='请输入物料分类编码' />
-        </el-form-item>
-        <el-form-item label='共混范围' prop='conglRang'>
-          <el-input v-model='form.conglRang' placeholder='请输入共混范围' />
-        </el-form-item>
-        <el-form-item label='SDS温度' prop='sdsTemp'>
-          <el-input v-model='form.sdsTemp' placeholder='请输入SDS温度' />
-        </el-form-item>
-        <el-form-item label='最短时间' prop='miniTime'>
-          <el-input v-model='form.miniTime' placeholder='请输入最短时间' />
-        </el-form-item>
-        <el-form-item label='审核标志' prop='auditFlag'>
-          <el-input v-model='form.auditFlag' placeholder='请输入审核标志' />
-        </el-form-item>
-        <el-form-item label='审核者' prop='auditName'>
-          <el-input v-model='form.auditName' placeholder='请输入审核者' />
-        </el-form-item>
-        <el-form-item label='审核日期' prop='auditDate'>
-          <el-date-picker clearable
-                          v-model='form.auditDate'
-                          type='datetime'
-                          value-format='YYYY-MM-DD HH:mm:ss'
-                          placeholder='请选择审核日期'>
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label='配方字典' prop='recipeDic'>
-          <el-input v-model='form.recipeDic' placeholder='请输入配方字典' />
-        </el-form-item>
-        <el-form-item label='停放时间' prop='stayTime'>
-          <el-input v-model='form.stayTime' placeholder='请输入停放时间' />
-        </el-form-item>
-        <el-form-item label='研究编码' prop='rearchCode'>
-          <el-input v-model='form.rearchCode' placeholder='请输入研究编码' />
-        </el-form-item>
-        <el-form-item label='黑胶回用' prop='blackReuse'>
-          <el-input v-model='form.blackReuse' placeholder='请输入黑胶回用' />
-        </el-form-item>
-        <el-form-item label='回用时间' prop='reuseTime'>
-          <el-input v-model='form.reuseTime' placeholder='请输入回用时间' />
-        </el-form-item>
-        <el-form-item label='过期时间' prop='expireTime'>
-          <el-input v-model='form.expireTime' placeholder='请输入过期时间' />
-        </el-form-item>
-        <el-form-item label='超温' prop='overTemp'>
-          <el-input v-model='form.overTemp' placeholder='请输入超温' />
-        </el-form-item>
-        <el-form-item label='最高温度' prop='maxTemp'>
-          <el-input v-model='form.maxTemp' placeholder='请输入最高温度' />
-        </el-form-item>
-        <el-form-item label='最低温度' prop='minTemp'>
-          <el-input v-model='form.minTemp' placeholder='请输入最低温度' />
-        </el-form-item>
-        <el-form-item label='是否不控' prop='ifNot'>
-          <el-input v-model='form.ifNot' placeholder='请输入是否不控' />
-        </el-form-item>
-        <el-form-item label='主机温度' prop='zzTemp'>
-          <el-input v-model='form.zzTemp' placeholder='请输入主机温度' />
-        </el-form-item>
-        <el-form-item label='卸料门温度(小料门)' prop='xlmTemp'>
-          <el-input v-model='form.xlmTemp' placeholder='请输入卸料门温度(小料门)' />
-        </el-form-item>
-        <el-form-item label='排胶控制' prop='pjcontrl'>
-          <el-input v-model='form.pjcontrl' placeholder='请输入排胶控制' />
-        </el-form-item>
       </el-form>
       <template #footer>
-        <div class='dialog-footer'>
-          <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
-          <el-button @click='cancel'>取 消</el-button>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>
+
+    <!-- 选择物料对话框 -->
+    <el-dialog title="选择物料" v-model="materialSelectVisible" width="700px" append-to-body>
+      <MaterialSelect ref="materialSelectRef" v-if="materialSelectVisible" />
+      <template #footer>
+        <el-button type="primary" @click="confirmMaterialSelect">确 定</el-button>
+        <el-button @click="materialSelectVisible = false">取 消</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
-<script setup name='RecipeInfo' lang='ts'>
+<script setup name="RecipeInfo" lang="ts">
+import type { ElTree } from 'element-plus';
 import { listRecipeInfo, getRecipeInfo, delRecipeInfo, addRecipeInfo, updateRecipeInfo } from '@/api/mes/recipeInfo';
 import { RecipeInfoVO, RecipeInfoQuery, RecipeInfoForm } from '@/api/mes/recipeInfo/types';
+import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo';
+import { getBaseMaterialInfoList } from '@/api/mes/baseMaterialInfo';
+import type { ProdBaseMachineInfoVO } from '@/api/mes/prodBaseMachineInfo/types';
+import type { BaseMaterialInfoVO } from '@/api/mes/baseMaterialInfo/types';
+import MaterialSelect from './components/MaterialSelect.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { recipe_type, recipe_state } = toRefs<any>(proxy?.useDict('recipe_type', 'recipe_state'));
@@ -360,83 +314,41 @@ const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
 const recipeInfoFormRef = ref<ElFormInstance>();
+const treeRef = ref<InstanceType<typeof ElTree>>();
 
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
 
-// 列显隐信息
-const columns = ref<FieldOption[]>([
-  { key: 0, label: `主键标识`, visible: true },
-  { key: 1, label: `机台ID`, visible: true },
-  { key: 2, label: `物料ID`, visible: true },
-  { key: 3, label: `版本号`, visible: true },
-  { key: 4, label: `配方类型`, visible: true },
-  { key: 5, label: `用户版本`, visible: true },
-  { key: 6, label: `配方状态`, visible: true },
-  { key: 7, label: `完成时间`, visible: true },
-  { key: 8, label: `架子车数`, visible: true },
-  { key: 9, label: `配方重量`, visible: true },
-  { key: 10, label: `填充系数`, visible: true },
-  { key: 11, label: `炭黑回收类型`, visible: true },
-  { key: 12, label: `炭黑回收时间`, visible: true },
-  { key: 13, label: `超温排胶最短时间`, visible: true },
-  { key: 14, label: `超时排胶时间`, visible: true },
-  { key: 15, label: `超温排胶温度`, visible: true },
-  { key: 16, label: `最大进胶温度`, visible: true },
-  { key: 17, label: `最小进胶温度`, visible: true },
-  { key: 18, label: `进胶时间`, visible: true },
-  { key: 19, label: `进炭黑时间`, visible: true },
-  { key: 20, label: `进油时间`, visible: true },
-  { key: 21, label: `进粉时间`, visible: true },
-  { key: 22, label: `辊速差`, visible: true },
-  { key: 23, label: `上顶栓压力差`, visible: true },
-  { key: 24, label: `是否使用区域温度`, visible: true },
-  { key: 25, label: `侧温`, visible: true },
-  { key: 26, label: `侧温温差`, visible: true },
-  { key: 27, label: `辊温`, visible: true },
-  { key: 28, label: `辊温温差`, visible: true },
-  { key: 29, label: `卸料门温度`, visible: true },
-  { key: 30, label: `卸料门温差`, visible: true },
-  { key: 31, label: `操作者`, visible: true },
-  { key: 32, label: `备注`, visible: true },
-  { key: 33, label: `配方编码`, visible: true },
-  { key: 34, label: `开始使用时间`, visible: true },
-  { key: 35, label: `停用时间`, visible: true },
-  { key: 36, label: `机台优先级`, visible: true },
-  { key: 37, label: `配方类型编码`, visible: true },
-  { key: 38, label: `胶种编码`, visible: true },
-  { key: 39, label: `胶种类型`, visible: true },
-  { key: 40, label: `物料种类编码`, visible: true },
-  { key: 41, label: `物料分类编码`, visible: true },
-  { key: 42, label: `共混范围`, visible: true },
-  { key: 43, label: `SDS温度`, visible: true },
-  { key: 44, label: `最短时间`, visible: true },
-  { key: 45, label: `审核标志`, visible: true },
-  { key: 46, label: `审核者`, visible: true },
-  { key: 47, label: `审核日期`, visible: true },
-  { key: 48, label: `配方字典`, visible: true },
-  { key: 49, label: `停放时间`, visible: true },
-  { key: 50, label: `研究编码`, visible: true },
-  { key: 51, label: `黑胶回用`, visible: true },
-  { key: 52, label: `回用时间`, visible: true },
-  { key: 53, label: `过期时间`, visible: true },
-  { key: 54, label: `超温`, visible: true },
-  { key: 55, label: `最高温度`, visible: true },
-  { key: 56, label: `最低温度`, visible: true },
-  { key: 57, label: `是否不控`, visible: true },
-  { key: 58, label: `主机温度`, visible: true },
-  { key: 59, label: `卸料门温度(小料门)`, visible: true },
-  { key: 60, label: `排胶控制`, visible: true },
-  { key: 61, label: `租户编号`, visible: true },
-  { key: 62, label: `创建部门`, visible: true },
-  { key: 63, label: `创建者`, visible: true },
-  { key: 64, label: `创建时间`, visible: true },
-  { key: 65, label: `更新者`, visible: true },
-  { key: 66, label: `更新时间`, visible: true },
-  { key: 67, label: `删除标志`, visible: true }
-]);
+// 树相关
+const treeFilterText = ref('');
+const treeData = ref<any[]>([]);
+const selectedTreeNode = ref<any>(null);
+const selectedTreeLabel = ref('');
+
+// 表格版本筛选（与图片一致：显示正用版本 / 显示全部版本）
+const showInUseOnly = ref(true);
+const showAllVersion = ref(false);
+
+// 当前选中行，用于底部配方基本信息展示
+const currentTableRow = ref<RecipeInfoVO | null>(null);
+const detailForm = ref<RecipeInfoForm>({});
+
+// 机台下拉选项
+const machineOptions = ref<ProdBaseMachineInfoVO[]>([]);
+
+// 物料：选择弹窗 + 编码/名称映射（用于表格与详情展示）
+const materialSelectVisible = ref(false);
+const materialSelectRef = ref<InstanceType<typeof MaterialSelect>>();
+const materialMap = ref<Record<string, { materialCode: string; materialName: string }>>({});
+
+const formMaterialDisplay = computed(() => {
+  const id = form.value.materialId;
+  if (id == null || id === '') return '';
+  const m = materialMap.value[String(id)];
+  return m ? `${m.materialCode} ${m.materialName}`.trim() : String(id);
+});
 
 const initFormData: RecipeInfoForm = {
   recipeId: undefined,
@@ -501,6 +413,7 @@ const initFormData: RecipeInfoForm = {
   xlmTemp: undefined,
   pjcontrl: undefined
 };
+
 const data = reactive<PageData<RecipeInfoForm, RecipeInfoQuery>>({
   form: { ...initFormData },
   queryParams: {
@@ -509,103 +422,159 @@ const data = reactive<PageData<RecipeInfoForm, RecipeInfoQuery>>({
     recipeId: undefined,
     machineId: undefined,
     materialId: undefined,
-    edtCode: undefined,
-    recipeType: undefined,
-    userEdtCode: undefined,
-    recipeState: undefined,
-    doneTime: undefined,
-    shelfNum: undefined,
-    totalWeight: undefined,
-    fillCoefficient: undefined,
-    cbRecycleType: undefined,
-    cbRecycleTime: undefined,
-    overtempMintime: undefined,
-    overtimeTime: undefined,
-    overtempTemp: undefined,
-    maxInpolytemp: undefined,
-    minInpolytemp: undefined,
-    inPolytime: undefined,
-    inCarbontime: undefined,
-    inOiltime: undefined,
-    inPowdertime: undefined,
-    rollSpeeddiff: undefined,
-    ramPressdiff: undefined,
-    isUseareatemp: undefined,
-    sideTemp: undefined,
-    sideTempdiff: undefined,
-    rollTemp: undefined,
-    rollTempdiff: undefined,
-    ddoorTemp: undefined,
-    ddoorTempdiff: undefined,
-    operCode: undefined,
-    memNote: undefined,
     recipeCode: undefined,
-    startDatetime: undefined,
-    endDatetime: undefined,
-    equipPrior: undefined,
-    recipeTypecode: undefined,
-    rubTypecode: undefined,
-    rubType: undefined,
-    mkindCode: undefined,
-    ikindCode: undefined,
-    conglRang: undefined,
-    sdsTemp: undefined,
-    miniTime: undefined,
-    auditFlag: undefined,
-    auditName: undefined,
-    auditDate: undefined,
-    recipeDic: undefined,
-    stayTime: undefined,
-    rearchCode: undefined,
-    blackReuse: undefined,
-    reuseTime: undefined,
-    expireTime: undefined,
-    overTemp: undefined,
-    maxTemp: undefined,
-    minTemp: undefined,
-    ifNot: undefined,
-    zzTemp: undefined,
-    xlmTemp: undefined,
-    pjcontrl: undefined,
+    recipeType: undefined,
+    recipeState: undefined,
     params: {}
   },
   rules: {
-    machineId: [
-      { required: true, message: '机台ID不能为空', trigger: 'blur' }
-    ],
-    rollTempdiff: [
-      { required: true, message: '辊温温差不能为空', trigger: 'blur' }
-    ],
-    operCode: [
-      { required: true, message: '操作者不能为空', trigger: 'blur' }
-    ],
-    memNote: [
-      { required: true, message: '备注不能为空', trigger: 'blur' }
-    ],
-    recipeCode: [
-      { required: true, message: '配方编码不能为空', trigger: 'blur' }
-    ],
-    auditDate: [
-      { required: true, message: '审核日期不能为空', trigger: 'blur' }
-    ],
-    recipeDic: [
-      { required: true, message: '配方字典不能为空', trigger: 'blur' }
-    ]
+    recipeCode: [{ required: true, message: '配方编码不能为空', trigger: 'blur' }],
+    machineId: [{ required: true, message: '请选择机台', trigger: 'change' }]
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询配方-基础信息列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listRecipeInfo(queryParams.value);
-  recipeInfoList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
+/** 加载机台下拉列表 */
+const getMachineOptions = async () => {
+  try {
+    const res = await getProdBaseMachineInfoList({});
+    machineOptions.value = res.data || [];
+  } catch {
+    machineOptions.value = [];
+  }
 };
 
-/** 取消按钮 */
+/** 根据机台ID获取机台名称 */
+function getMachineName(machineId: string | number | undefined): string {
+  if (machineId == null || machineId === '') return '';
+  const item = machineOptions.value.find((m) => m.machineId === machineId || String(m.machineId) === String(machineId));
+  return item ? (item.machineName || item.machineCode || '') : '';
+}
+
+/** 根据物料ID获取物料编码 */
+function getMaterialCode(materialId: string | number | undefined): string {
+  if (materialId == null || materialId === '') return '';
+  return materialMap.value[String(materialId)]?.materialCode ?? '';
+}
+
+/** 根据物料ID获取物料名称 */
+function getMaterialName(materialId: string | number | undefined): string {
+  if (materialId == null || materialId === '') return '';
+  return materialMap.value[String(materialId)]?.materialName ?? '';
+}
+
+/** 加载物料列表并构建 id -> { materialCode, materialName } 映射 */
+async function loadMaterialMap() {
+  try {
+    const res = await getBaseMaterialInfoList({ pageNum: 1, pageSize: 9999 });
+    const list: BaseMaterialInfoVO[] = res.data ?? res.rows ?? [];
+    const map: Record<string, { materialCode: string; materialName: string }> = {};
+    list.forEach((item) => {
+      const id = String(item.materialId);
+      map[id] = { materialCode: item.materialCode ?? '', materialName: item.materialName ?? '' };
+    });
+    materialMap.value = map;
+  } catch {
+    materialMap.value = {};
+  }
+}
+
+function openMaterialSelect() {
+  materialSelectVisible.value = true;
+}
+
+function confirmMaterialSelect() {
+  const row = materialSelectRef.value?.getSelected();
+  if (!row) {
+    proxy?.$modal.msgWarning('请先选择一条物料');
+    return;
+  }
+  form.value.materialId = row.materialId;
+  const id = String(row.materialId);
+  materialMap.value = { ...materialMap.value, [id]: { materialCode: row.materialCode ?? '', materialName: row.materialName ?? '' } };
+  materialSelectVisible.value = false;
+}
+
+// 根据“显示正用版本/显示全部版本”过滤表格数据
+const filteredTableList = computed(() => {
+  if (showAllVersion.value) return recipeInfoList.value;
+  if (showInUseOnly.value) {
+    return recipeInfoList.value.filter((row: RecipeInfoVO) => row.recipeState === '1' || row.recipeState === '正用');
+  }
+  return recipeInfoList.value;
+});
+
+// 树过滤
+function filterTreeNode(value: string, data: any) {
+  if (!value) return true;
+  return data.label && data.label.toLowerCase().includes(value.toLowerCase());
+}
+
+watch(treeFilterText, (val) => {
+  treeRef.value?.filter(val);
+});
+
+// 从列表构建树：根为胶料名称，子节点为配方
+function buildTreeFromList(list: RecipeInfoVO[]) {
+  const codeSet = new Set<string>();
+  const children: any[] = [];
+  list.forEach((row) => {
+    const code = row.recipeCode || String(row.materialId) || '未命名';
+    if (!codeSet.has(code)) {
+      codeSet.add(code);
+      children.push({
+        id: row.recipeId + '_' + code,
+        label: `${code}[${code}]`,
+        recipeCode: code,
+        recipeId: row.recipeId,
+        data: row
+      });
+    }
+  });
+  const rootCode = queryParams.value.recipeCode || '配方列表';
+  return [{
+    id: 'root',
+    label: rootCode,
+    children: children.length ? children : [{ id: 'empty', label: '暂无数据', disabled: true }]
+  }];
+}
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true;
+  try {
+    const res = await listRecipeInfo(queryParams.value);
+    recipeInfoList.value = res.rows || [];
+    total.value = res.total || 0;
+    treeData.value = buildTreeFromList(recipeInfoList.value);
+    if (recipeInfoList.value.length && !currentTableRow.value) {
+      currentTableRow.value = recipeInfoList.value[0];
+      detailForm.value = { ...currentTableRow.value };
+    }
+  } finally {
+    loading.value = false;
+  }
+};
+
+/** 树节点点击 */
+function handleTreeNodeClick(node: any) {
+  if (node.id === 'empty' || node.disabled) return;
+  selectedTreeNode.value = node;
+  selectedTreeLabel.value = node.label?.split('[')[0] || node.recipeCode || '';
+  if (node.data) {
+    currentTableRow.value = node.data;
+    detailForm.value = { ...node.data };
+  }
+}
+
+/** 表格当前行变化，同步底部配方基本信息 */
+function handleTableCurrentChange(row: RecipeInfoVO | null) {
+  currentTableRow.value = row || null;
+  detailForm.value = row ? { ...row } : {};
+}
+
+/** 取消 */
 const cancel = () => {
   reset();
   dialog.visible = false;
@@ -617,76 +586,158 @@ const reset = () => {
   recipeInfoFormRef.value?.resetFields();
 };
 
-/** 搜索按钮操作 */
+/** 搜索 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
 };
 
-/** 重置按钮操作 */
+/** 重置查询 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
+  selectedTreeNode.value = null;
+  selectedTreeLabel.value = '';
+  currentTableRow.value = null;
+  detailForm.value = {};
   handleQuery();
 };
 
-/** 多选框选中数据 */
+/** 多选 */
 const handleSelectionChange = (selection: RecipeInfoVO[]) => {
-  ids.value = selection.map(item => item.recipeId);
-  single.value = selection.length != 1;
+  ids.value = selection.map((item) => item.recipeId);
+  single.value = selection.length !== 1;
   multiple.value = !selection.length;
 };
 
-/** 新增按钮操作 */
+/** 新增 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = '添加配方-基础信息';
+  dialog.title = '新增工艺配方';
 };
 
-/** 修改按钮操作 */
+/** 配方明细 */
+const router = useRouter();
+const handleDetail = (row: RecipeInfoVO) => {
+  router.push({ path: '/mes/recipeInfoDetail/index', query: { recipeId: row.recipeId } });
+};
+
+/** 修改 */
 const handleUpdate = async (row?: RecipeInfoVO) => {
   reset();
-  const _recipeId = row?.recipeId || ids.value[0];
+  const _recipeId = row?.recipeId ?? ids.value[0];
   const res = await getRecipeInfo(_recipeId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = '修改配方-基础信息';
+  dialog.title = '修改工艺配方';
 };
 
-/** 提交按钮 */
+/** 配方另存 */
+const handleSaveAs = async () => {
+  if (single.value) {
+    proxy?.$modal.msgWarning('请选择一条记录再执行配方另存');
+    return;
+  }
+  reset();
+  const res = await getRecipeInfo(ids.value[0]);
+  const copy = { ...res.data };
+  delete (copy as any).recipeId;
+  Object.assign(form.value, copy);
+  dialog.visible = true;
+  dialog.title = '配方另存为';
+};
+
+/** 提交 */
 const submitForm = () => {
   recipeInfoFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
+    if (!valid) return;
+    buttonLoading.value = true;
+    try {
       if (form.value.recipeId) {
-        await updateRecipeInfo(form.value).finally(() => buttonLoading.value = false);
+        await updateRecipeInfo(form.value);
       } else {
-        await addRecipeInfo(form.value).finally(() => buttonLoading.value = false);
+        await addRecipeInfo(form.value);
       }
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
+    } finally {
+      buttonLoading.value = false;
     }
   });
 };
 
-/** 删除按钮操作 */
+/** 删除 */
 const handleDelete = async (row?: RecipeInfoVO) => {
-  const _recipeIds = row?.recipeId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除配方-基础信息编号为"' + _recipeIds + '"的数据项？').finally(() => loading.value = false);
+  const _recipeIds = row?.recipeId ?? ids.value;
+  await proxy?.$modal.confirm('是否确认删除所选配方数据？');
   await delRecipeInfo(_recipeIds);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download('mes/recipeInfo/export', {
-    ...queryParams.value
-  }, `recipeInfo_${new Date().getTime()}.xlsx`);
-};
-
 onMounted(() => {
+  getMachineOptions();
+  loadMaterialMap();
   getList();
 });
 </script>
+
+<style lang="scss" scoped>
+.recipe-info-page {
+  .page-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 12px;
+    .page-title {
+      font-size: 18px;
+      font-weight: 600;
+    }
+    .header-actions {
+      display: flex;
+      gap: 8px;
+    }
+  }
+
+  .main-row {
+    .left-tree-col {
+      .tree-card {
+        min-height: 500px;
+        :deep(.el-card__body) {
+          padding-top: 12px;
+        }
+      }
+      .tree-filter-input {
+        margin-bottom: 12px;
+      }
+      .tree-container {
+        max-height: 460px;
+        overflow-y: auto;
+      }
+    }
+
+    .right-content-col {
+      .table-card {
+        margin-bottom: 12px;
+        .table-card-header {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          flex-wrap: wrap;
+          gap: 8px;
+          .version-switch {
+            display: flex;
+            gap: 16px;
+          }
+        }
+      }
+      .form-card {
+        :deep(.el-descriptions__label) {
+          width: 140px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/mes/recipeWeight/index.vue b/src/views/mes/recipeWeight/index.vue
index 01a87ae..0694314 100644
--- a/src/views/mes/recipeWeight/index.vue
+++ b/src/views/mes/recipeWeight/index.vue
@@ -4,23 +4,10 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" >
-            <el-form-item label="主键标识" prop="weightId">
-              <el-input v-model="queryParams.weightId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="配方ID" prop="recipeId">
-              <el-input v-model="queryParams.recipeId" placeholder="请输入配方ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="称量序号" prop="weightSeq">
-              <el-input v-model="queryParams.weightSeq" placeholder="请输入称量序号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="机台ID" prop="machineId">
-              <el-input v-model="queryParams.machineId" placeholder="请输入机台ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="版本号" prop="edtCode">
-              <el-input v-model="queryParams.edtCode" placeholder="请输入版本号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item label="称量类型" prop="weightType">
-              <el-input v-model="queryParams.weightType" placeholder="请输入称量类型" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.weightType" placeholder="请选择称量类型" clearable  >
+                <el-option v-for="dict in weight_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
             <el-form-item label="秤编码" prop="scaleCode">
               <el-input v-model="queryParams.scaleCode" placeholder="请输入秤编码" clearable @keyup.enter="handleQuery" />
@@ -43,12 +30,6 @@
             <el-form-item label="子级编码" prop="childCode">
               <el-input v-model="queryParams.childCode" placeholder="请输入子级编码" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="是否使用批次" prop="ifUseBat">
-              <el-input v-model="queryParams.ifUseBat" placeholder="请输入是否使用批次" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="最大比例" prop="maxRate">
-              <el-input v-model="queryParams.maxRate" placeholder="请输入最大比例" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -84,7 +65,11 @@
         <el-table-column label="称量序号" align="center" prop="weightSeq" v-if="columns[2].visible"/>
         <el-table-column label="机台ID" align="center" prop="machineId" v-if="columns[3].visible"/>
         <el-table-column label="版本号" align="center" prop="edtCode" v-if="columns[4].visible"/>
-        <el-table-column label="称量类型" align="center" prop="weightType" v-if="columns[5].visible"/>
+        <el-table-column label="称量类型" align="center" prop="weightType" v-if="columns[5].visible">
+          <template #default="scope">
+            <dict-tag :options="weight_type" :value="scope.row.weightType" />
+          </template>
+        </el-table-column>
         <el-table-column label="秤编码" align="center" prop="scaleCode" v-if="columns[6].visible"/>
         <el-table-column label="动作编码" align="center" prop="actCode" v-if="columns[7].visible"/>
         <el-table-column label="设定重量" align="center" prop="setWeight" v-if="columns[8].visible"/>
@@ -127,7 +112,9 @@
           <el-input v-model="form.edtCode" placeholder="请输入版本号" />
         </el-form-item>
         <el-form-item label="称量类型" prop="weightType">
-          <el-input v-model="form.weightType" placeholder="请输入称量类型" />
+          <el-select v-model="form.weightType" placeholder="请选择称量类型" clearable style="width: 100%">
+            <el-option v-for="dict in weight_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
         <el-form-item label="秤编码" prop="scaleCode">
           <el-input v-model="form.scaleCode" placeholder="请输入秤编码" />
@@ -172,6 +159,7 @@ import { listRecipeWeight, getRecipeWeight, delRecipeWeight, addRecipeWeight, up
 import { RecipeWeightVO, RecipeWeightQuery, RecipeWeightForm } from '@/api/mes/recipeWeight/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { weight_type } = toRefs<any>(proxy?.useDict('weight_type'));
 
 const recipeWeightList = ref<RecipeWeightVO[]>([]);
 const buttonLoading = ref(false);
diff --git a/src/views/mes/toolingTypeRelation/index.vue b/src/views/mes/toolingTypeRelation/index.vue
new file mode 100644
index 0000000..316b7c7
--- /dev/null
+++ b/src/views/mes/toolingTypeRelation/index.vue
@@ -0,0 +1,260 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="主键标识" prop="relationId">
+              <el-input v-model="queryParams.relationId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="工装类型ID" prop="toolingTypeId">
+              <el-input v-model="queryParams.toolingTypeId" placeholder="请输入工装类型ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="关联信息类型(1物料 2工序)" prop="relationInfoType">
+              <el-input v-model="queryParams.relationInfoType" placeholder="请输入关联信息类型(1物料 2工序)" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="关联信息ID" prop="relationInfoId">
+              <el-input v-model="queryParams.relationInfoId" placeholder="请输入关联信息ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:toolingTypeRelation:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:toolingTypeRelation:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:toolingTypeRelation:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:toolingTypeRelation:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="toolingTypeRelationList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键标识" align="center" prop="relationId" v-if="columns[0].visible"/>
+        <el-table-column label="工装类型ID" align="center" prop="toolingTypeId" v-if="columns[2].visible"/>
+        <el-table-column label="关联信息类型(1物料 2工序)" align="center" prop="relationInfoType" v-if="columns[3].visible"/>
+        <el-table-column label="关联信息ID" align="center" prop="relationInfoId" v-if="columns[4].visible"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:toolingTypeRelation:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:toolingTypeRelation:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改载具工装类型关联信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="toolingTypeRelationFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="主键标识" prop="relationId">
+          <el-input v-model="form.relationId" placeholder="请输入主键标识" />
+        </el-form-item>
+        <el-form-item label="工装类型ID" prop="toolingTypeId">
+          <el-input v-model="form.toolingTypeId" placeholder="请输入工装类型ID" />
+        </el-form-item>
+        <el-form-item label="关联信息类型(1物料 2工序)" prop="relationInfoType">
+          <el-input v-model="form.relationInfoType" placeholder="请输入关联信息类型(1物料 2工序)" />
+        </el-form-item>
+        <el-form-item label="关联信息ID" prop="relationInfoId">
+          <el-input v-model="form.relationInfoId" placeholder="请输入关联信息ID" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="ToolingTypeRelation" lang="ts">
+import { listToolingTypeRelation, getToolingTypeRelation, delToolingTypeRelation, addToolingTypeRelation, updateToolingTypeRelation } from '@/api/mes/toolingTypeRelation';
+import { ToolingTypeRelationVO, ToolingTypeRelationQuery, ToolingTypeRelationForm } from '@/api/mes/toolingTypeRelation/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const toolingTypeRelationList = ref<ToolingTypeRelationVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const toolingTypeRelationFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `主键标识`, visible: true },
+        { key: 1, label: `租户编号`, visible: true },
+        { key: 2, label: `工装类型ID`, visible: true },
+        { key: 3, label: `关联信息类型(1物料 2工序)`, visible: true },
+        { key: 4, label: `关联信息ID`, visible: true },
+        { key: 5, label: `创建部门`, visible: true },
+        { key: 6, label: `创建人`, visible: true },
+        { key: 7, label: `创建时间`, visible: true },
+        { key: 8, label: `更新人`, visible: true },
+        { key: 9, label: `更新时间`, visible: true },
+        { key: 10, label: `删除标志`, visible: true },
+]);
+
+const initFormData: ToolingTypeRelationForm = {
+  relationId: undefined,
+  toolingTypeId: undefined,
+  relationInfoType: undefined,
+  relationInfoId: undefined,
+}
+const data = reactive<PageData<ToolingTypeRelationForm, ToolingTypeRelationQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    relationId: undefined,
+    toolingTypeId: undefined,
+    relationInfoType: undefined,
+    relationInfoId: undefined,
+    params: {
+    }
+  },
+  rules: {
+    relationId: [
+      { required: true, message: "主键标识不能为空", trigger: "blur" }
+    ],
+    toolingTypeId: [
+      { required: true, message: "工装类型ID不能为空", trigger: "blur" }
+    ],
+    relationInfoType: [
+      { required: true, message: "关联信息类型(1物料 2工序)不能为空", trigger: "blur" }
+    ],
+    relationInfoId: [
+      { required: true, message: "关联信息ID不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询载具工装类型关联信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listToolingTypeRelation(queryParams.value);
+  toolingTypeRelationList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  toolingTypeRelationFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ToolingTypeRelationVO[]) => {
+  ids.value = selection.map(item => item.relationId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加载具工装类型关联信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ToolingTypeRelationVO) => {
+  reset();
+  const _relationId = row?.relationId || ids.value[0]
+  const res = await getToolingTypeRelation(_relationId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改载具工装类型关联信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  toolingTypeRelationFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.relationId) {
+        await updateToolingTypeRelation(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addToolingTypeRelation(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ToolingTypeRelationVO) => {
+  const _relationIds = row?.relationId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除载具工装类型关联信息编号为"' + _relationIds + '"的数据项？').finally(() => loading.value = false);
+  await delToolingTypeRelation(_relationIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/toolingTypeRelation/export', {
+    ...queryParams.value
+  }, `toolingTypeRelation_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>