From 0cdaae6ffb09a28141fa3a180a80edbfe2562f47 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 19 Mar 2025 14:19:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20mes=E7=AD=89=E5=90=8C=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=8A=A0=E7=88=B6=E7=BA=A7=E7=89=A9=E6=96=99=E3=80=81?=
 =?UTF-8?q?BOM=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/baseEqualMaterialInfo/index.vue | 311 ++++++++++--------
 src/views/mes/baseMaterialType/index.vue      |  12 +-
 2 files changed, 185 insertions(+), 138 deletions(-)

diff --git a/src/views/mes/baseEqualMaterialInfo/index.vue b/src/views/mes/baseEqualMaterialInfo/index.vue
index 15fc7af..88fcabb 100644
--- a/src/views/mes/baseEqualMaterialInfo/index.vue
+++ b/src/views/mes/baseEqualMaterialInfo/index.vue
@@ -1,142 +1,175 @@
 <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="equalMaterialInfoId">
-              <el-input v-model="queryParams.equalMaterialInfoId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
-            </el-form-item>-->
-<!--            <el-form-item label="物料ID" prop="materialId">
-              <el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="等同物料ID" prop="equalMaterialId">
-              <el-input v-model="queryParams.equalMaterialId" placeholder="请输入等同物料ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>-->
-            <el-form-item label="激活标识" prop="activeFlag">
-              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
-                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+  <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="equalMaterialInfoId">
+                          <el-input v-model="queryParams.equalMaterialInfoId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
+            <!--            <el-form-item label="物料ID" prop="materialId">
+                          <el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="等同物料ID" prop="equalMaterialId">
+                          <el-input v-model="queryParams.equalMaterialId" placeholder="请输入等同物料ID" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
+            <el-form-item label='激活标识' prop='activeFlag'>
+              <el-select v-model='queryParams.activeFlag' placeholder='请选择激活标识' clearable>
+                <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
               </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">
+    <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:baseEqualMaterialInfo:add']">新增</el-button>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='1.5'>
+            <el-button type='primary' plain icon='Plus' @click='handleAdd'
+                       v-hasPermi="['mes:baseEqualMaterialInfo:add']">新增
+            </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:baseEqualMaterialInfo:edit']">修改</el-button>
+          <el-col :span='1.5'>
+            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
+                       v-hasPermi="['mes:baseEqualMaterialInfo:edit']">修改
+            </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:baseEqualMaterialInfo:remove']">删除</el-button>
+          <el-col :span='1.5'>
+            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
+                       v-hasPermi="['mes:baseEqualMaterialInfo:remove']">删除
+            </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:baseEqualMaterialInfo:export']">导出</el-button>
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['mes:baseEqualMaterialInfo:export']">导出
+            </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
+                         @queryTable='getList'></right-toolbar>
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="baseEqualMaterialInfoList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-<!--        <el-table-column label="主键标识" align="center" prop="equalMaterialInfoId" v-if="columns[0].visible"/>
-        <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>-->
-        <el-table-column label="物料" align="center" prop="materialName" v-if="columns[0].visible"/>
-        <el-table-column label="等同物料" align="center" prop="equalMaterialName" v-if="columns[1].visible"/>
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[2].visible">
-          <template #default="scope">
-            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+      <el-table v-loading='loading' :data='baseEqualMaterialInfoList' @selection-change='handleSelectionChange'>
+        <el-table-column type='selection' width='55' align='center' />
+        <!--        <el-table-column label="主键标识" align="center" prop="equalMaterialInfoId" v-if="columns[0].visible"/>
+                <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>-->
+        <el-table-column label='物料' align='center' prop='materialName' v-if='columns[0].visible' width='260' />
+        <el-table-column label='等同物料' align='center' prop='equalMaterialName' v-if='columns[1].visible' width='220' />
+        <el-table-column label='父物料名称' align='center' prop='parentName' v-if='columns[4].visible' width='220' />
+        <el-table-column label='BOM版本' align='center' prop='materialBomVersion' v-if='columns[5].visible' />
+        <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[2].visible'>
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[3].visible"/>
-<!--        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[6].visible"/>
-        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[7].visible"/>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[8].visible">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[9].visible"/>
-        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[10].visible">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>-->
-        <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:baseEqualMaterialInfo:edit']"></el-button>
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[3].visible' />
+        <!--        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[6].visible"/>
+                <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[7].visible"/>
+                <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[8].visible">
+                  <template #default="scope">
+                    <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[9].visible"/>
+                <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[10].visible">
+                  <template #default="scope">
+                    <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                  </template>
+                </el-table-column>-->
+        <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:baseEqualMaterialInfo:edit']"></el-button>
             </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseEqualMaterialInfo:remove']"></el-button>
+            <el-tooltip content='删除' placement='top'>
+              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
+                         v-hasPermi="['mes:baseEqualMaterialInfo: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" />
+      <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="baseEqualMaterialInfoFormRef" :model="form" :rules="rules" label-width="120px">
-<!--        <el-form-item label="主键标识" prop="equalMaterialInfoId">
-          <el-input v-model="form.equalMaterialInfoId" placeholder="请输入主键标识" />
-        </el-form-item>-->
+    <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
+      <el-form ref='baseEqualMaterialInfoFormRef' :model='form' :rules='rules' label-width='120px'>
+        <!--        <el-form-item label="主键标识" prop="equalMaterialInfoId">
+                  <el-input v-model="form.equalMaterialInfoId" placeholder="请输入主键标识" />
+                </el-form-item>-->
 
-        <el-form-item label="物料" prop="materialId">
-          <el-input v-model="form.materialName" placeholder="请点击检索物料" @click="handleMaterialAdd('material')" readonly>
+        <el-form-item label='物料' prop='materialId'>
+          <el-input v-model='form.materialName' placeholder='请点击检索物料' @click="handleMaterialAdd('material')" readonly>
             <template #append>
-              <el-icon class="el-input__icon"><search/></el-icon>
+              <el-icon class='el-input__icon'>
+                <search />
+              </el-icon>
             </template>
           </el-input>
         </el-form-item>
-
-        <el-form-item label="等同物料" prop="equalMaterialId">
-          <el-input v-model="form.equalMaterialName" placeholder="请点击检索物料" @click="handleMaterialAdd('equalMaterial')" readonly>
+        <el-form-item label='等同物料' prop='equalMaterialId'>
+          <el-input v-model='form.equalMaterialName' placeholder='请点击检索物料' @click="handleMaterialAdd('equalMaterial')"
+                    readonly>
             <template #append>
-              <el-icon class="el-input__icon"><search/></el-icon>
+              <el-icon class='el-input__icon'>
+                <search />
+              </el-icon>
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item label="激活标识" prop="activeFlag">
-          <el-radio-group v-model="form.activeFlag">
+        <el-form-item label='激活标识' prop='activeFlag'>
+          <el-radio-group v-model='form.activeFlag'>
             <el-radio
-              v-for="dict in active_flag"
-              :key="dict.value"
-              :value="dict.value"
-            >{{dict.label}}</el-radio>
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+        <el-form-item label='父物料名称' prop='parentId'>
+          <el-input v-model='form.equalMaterialName' placeholder='请点击检索父物料名称'
+                    @click="handleMaterialAdd('parentMaterial')" readonly>
+            <template #append>
+              <el-icon class='el-input__icon'>
+                <search />
+              </el-icon>
+            </template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label='BOM版本' prop='materialBomVersion'>
+          <el-input v-model='form.materialBomVersion' placeholder='请输入BOM版本' />
+        </el-form-item>
+        <el-form-item label='备注' prop='remark'>
+          <el-input v-model='form.remark' 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="materialOpen" width='1200px' append-to-body>
-      <MaterialSelect @selection="handleSelection" ref="materialSelectRef" v-if="materialOpen"></MaterialSelect>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitMaterialForm">确 定</el-button>
-        <el-button @click="materialOpen = false">取 消</el-button>
+    <el-dialog title='选择物料信息' v-model='materialOpen' width='1200px' append-to-body>
+      <MaterialSelect @selection='handleSelection' ref='materialSelectRef' v-if='materialOpen'></MaterialSelect>
+      <div slot='footer' class='dialog-footer'>
+        <el-button type='primary' @click='submitMaterialForm'>确 定</el-button>
+        <el-button @click='materialOpen = false'>取 消</el-button>
       </div>
     </el-dialog>
 
@@ -144,10 +177,20 @@
   </div>
 </template>
 
-<script setup name="BaseEqualMaterialInfo" lang="ts">
-import { listBaseEqualMaterialInfo, getBaseEqualMaterialInfo, delBaseEqualMaterialInfo, addBaseEqualMaterialInfo, updateBaseEqualMaterialInfo } from '@/api/mes/baseEqualMaterialInfo';
-import { BaseEqualMaterialInfoVO, BaseEqualMaterialInfoQuery, BaseEqualMaterialInfoForm } from '@/api/mes/baseEqualMaterialInfo/types';
-import {getBaseMaterialInfoList} from "@/api/mes/baseMaterialInfo";
+<script setup name='BaseEqualMaterialInfo' lang='ts'>
+import {
+  listBaseEqualMaterialInfo,
+  getBaseEqualMaterialInfo,
+  delBaseEqualMaterialInfo,
+  addBaseEqualMaterialInfo,
+  updateBaseEqualMaterialInfo
+} from '@/api/mes/baseEqualMaterialInfo';
+import {
+  BaseEqualMaterialInfoVO,
+  BaseEqualMaterialInfoQuery,
+  BaseEqualMaterialInfoForm
+} from '@/api/mes/baseEqualMaterialInfo/types';
+import { getBaseMaterialInfoList } from '@/api/mes/baseMaterialInfo';
 import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -173,17 +216,19 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-/*        { key: 0, label: `主键标识`, visible: true },
-        { key: 1, label: `租户编号`, visible: true },*/
-        { key: 0, label: `物料`, visible: true },
-        { key: 1, label: `等同物料ID`, visible: true },
-        { key: 2, label: `激活标识`, visible: true },
-        { key: 3, 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: 0, label: `主键标识`, visible: true },
+          { key: 1, label: `租户编号`, visible: true },*/
+  { key: 0, label: `物料`, visible: true },
+  { key: 1, label: `等同物料ID`, visible: true },
+  { key: 2, label: `激活标识`, visible: true },
+  { key: 3, label: `备注`, visible: true },
+  { key: 4, label: `父物料名称`, visible: true },
+  { key: 5, label: `BOM版本`, 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: BaseEqualMaterialInfoForm = {
@@ -193,10 +238,10 @@ const initFormData: BaseEqualMaterialInfoForm = {
   activeFlag: '1',
   remark: undefined,
   materialName: undefined,//映射字段
-  equalMaterialName: undefined,//新增：等同物料名称
-}
+  equalMaterialName: undefined//新增：等同物料名称
+};
 const data = reactive<PageData<BaseEqualMaterialInfoForm, BaseEqualMaterialInfoQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -207,10 +252,9 @@ const data = reactive<PageData<BaseEqualMaterialInfoForm, BaseEqualMaterialInfoQ
 
     materialName: undefined,//映射字段
     equalMaterialName: undefined,//新增：等同物料名称
-    params: {},
+    params: {}
   },
-  rules: {
-  }
+  rules: {}
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -222,55 +266,55 @@ const getList = async () => {
   baseEqualMaterialInfoList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   baseEqualMaterialInfoFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: BaseEqualMaterialInfoVO[]) => {
   ids.value = selection.map(item => item.equalMaterialInfoId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加等同物料信息";
-}
+  dialog.title = '添加等同物料信息';
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: BaseEqualMaterialInfoVO) => {
   reset();
-  const _equalMaterialInfoId = row?.equalMaterialInfoId || ids.value[0]
+  const _equalMaterialInfoId = row?.equalMaterialInfoId || ids.value[0];
   const res = await getBaseEqualMaterialInfo(_equalMaterialInfoId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改等同物料信息";
-}
+  dialog.title = '修改等同物料信息';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -278,39 +322,39 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.equalMaterialInfoId) {
-        await updateBaseEqualMaterialInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await updateBaseEqualMaterialInfo(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addBaseEqualMaterialInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await addBaseEqualMaterialInfo(form.value).finally(() => buttonLoading.value = false);
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: BaseEqualMaterialInfoVO) => {
   const _equalMaterialInfoIds = row?.equalMaterialInfoId || ids.value;
   await proxy?.$modal.confirm('是否确认删除等同物料信息编号为"' + _equalMaterialInfoIds + '"的数据项？').finally(() => loading.value = false);
   await delBaseEqualMaterialInfo(_equalMaterialInfoIds);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
   proxy?.download('mes/baseEqualMaterialInfo/export', {
     ...queryParams.value
-  }, `baseEqualMaterialInfo_${new Date().getTime()}.xlsx`)
-}
+  }, `baseEqualMaterialInfo_${new Date().getTime()}.xlsx`);
+};
 
 /*w物料下拉框*/
 let materialList = ref([]);
-const getListsSelect = async() => {
+const getListsSelect = async () => {
   let res = await getBaseMaterialInfoList(null);
   materialList.value = res.data;
-}
+};
 
 /*     以下为添加物料信息对话框相关方法   */
 let materialSelectRef = ref();//物料选择对话框绑定
@@ -326,6 +370,9 @@ const submitMaterialForm = () => {
   } else if (selectType.value === 'equalMaterial') {
     form.value.equalMaterialId = selectedRow.materialId;
     form.value.equalMaterialName = selectedRow.materialName;
+  } else if (selectType.value === 'parentMaterial') {
+    form.value.parentId = selectedRow.materialId;
+    form.value.parentName = selectedRow.materialName;
   }
   materialOpen.value = false;
 };
@@ -334,7 +381,7 @@ const submitMaterialForm = () => {
 const handleMaterialAdd = (type: string) => {
   selectType.value = type;
   materialOpen.value = true;
-}
+};
 
 onMounted(() => {
   // getListsSelect();
diff --git a/src/views/mes/baseMaterialType/index.vue b/src/views/mes/baseMaterialType/index.vue
index e49a6ef..e6c1a89 100644
--- a/src/views/mes/baseMaterialType/index.vue
+++ b/src/views/mes/baseMaterialType/index.vue
@@ -60,9 +60,9 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['mes:baseMaterialType:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>-->
+<!--          </el-col>-->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -108,9 +108,9 @@
             <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:baseMaterialType:edit']" />
             </el-tooltip>
-            <el-tooltip content="新增" placement="top">
-              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['mes:baseMaterialType:add']" />
-            </el-tooltip>
+<!--            <el-tooltip content="新增" placement="top">-->
+<!--              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['mes:baseMaterialType:add']" />-->
+<!--            </el-tooltip>-->
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseMaterialType:remove']" />
             </el-tooltip>