From 32a12c3e73c7a4b52ba54c1915fc307f06728b13 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Wed, 5 Mar 2025 13:44:56 +0800
Subject: [PATCH] =?UTF-8?q?add(mes):=20=E6=B7=BB=E5=8A=A0=E7=AD=89?=
 =?UTF-8?q?=E5=90=8C=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E7=89=A9=E6=96=99=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在等同物料信息表中添加等同物料名称字段
- 优化物料选择功能，支持物料和等同物料的选择
- 修改表单提交逻辑，根据物料或等同物料更新对应字段
- 更新接口定义，添加等同物料名称相关字段
---
 src/api/mes/baseEqualMaterialInfo/types.ts    | 16 +++++++
 src/views/mes/baseEqualMaterialInfo/index.vue | 46 +++++++++++--------
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/api/mes/baseEqualMaterialInfo/types.ts b/src/api/mes/baseEqualMaterialInfo/types.ts
index f84a36b..b519dab 100644
--- a/src/api/mes/baseEqualMaterialInfo/types.ts
+++ b/src/api/mes/baseEqualMaterialInfo/types.ts
@@ -59,6 +59,11 @@ export interface BaseEqualMaterialInfoVO {
    */
   materialName: string;//映射字段
 
+  /**
+   * 等同物料名称
+   */
+  equalMaterialName: string;//映射字段
+
 }
 
 export interface BaseEqualMaterialInfoForm extends BaseEntity {
@@ -92,6 +97,11 @@ export interface BaseEqualMaterialInfoForm extends BaseEntity {
    */
   materialName: string;//映射字段
 
+  /**
+   * 等同物料名称
+   */
+  equalMaterialName: string;//映射字段
+
 }
 
 export interface BaseEqualMaterialInfoQuery extends PageQuery {
@@ -126,6 +136,12 @@ export interface BaseEqualMaterialInfoQuery extends PageQuery {
    * 物料名称
    */
   materialName: string;//映射字段
+
+  /**
+   * 等同物料名称
+   */
+  equalMaterialName: string;//映射字段
+
 }
 
 
diff --git a/src/views/mes/baseEqualMaterialInfo/index.vue b/src/views/mes/baseEqualMaterialInfo/index.vue
index 59b0572..312fff2 100644
--- a/src/views/mes/baseEqualMaterialInfo/index.vue
+++ b/src/views/mes/baseEqualMaterialInfo/index.vue
@@ -51,7 +51,7 @@
 <!--        <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="等同物料ID" align="center" prop="equalMaterialId" v-if="columns[1].visible"/>
+        <el-table-column label="等同物料ID" 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"/>
@@ -85,6 +85,8 @@
 
       <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">
@@ -93,22 +95,19 @@
         </el-form-item>-->
 
         <el-form-item label="物料" prop="materialId">
-<!--          <el-input v-model="form.materialId" placeholder="请输入物料ID" />-->
-<!--          <el-select v-model="form.materialId" placeholder="请选择物料" clearable >
-            <el-option v-for="item in materialList"
-                       :key="item.materialId"
-                       :label="item.materialName"
-                       :value="item.materialId"/>
-          </el-select>-->
-          <el-input v-model="form.materialName" placeholder="请点击检索物料" @click="handleMaterialAdd" readonly>
+          <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="等同物料ID" prop="equalMaterialId">
-          <el-input v-model="form.equalMaterialId" placeholder="请输入等同物料ID" />
+          <el-input v-model="form.equalMaterialName" placeholder="请点击检索物料" @click="handleMaterialAdd('equalMaterial')" readonly>
+            <template #append>
+              <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">
@@ -193,8 +192,8 @@ const initFormData: BaseEqualMaterialInfoForm = {
   equalMaterialId: undefined,
   activeFlag: '1',
   remark: undefined,
-
   materialName: undefined,//映射字段
+  equalMaterialName: undefined,//新增：等同物料名称
 }
 const data = reactive<PageData<BaseEqualMaterialInfoForm, BaseEqualMaterialInfoQuery>>({
   form: {...initFormData},
@@ -207,9 +206,8 @@ const data = reactive<PageData<BaseEqualMaterialInfoForm, BaseEqualMaterialInfoQ
     activeFlag: undefined,
 
     materialName: undefined,//映射字段
-
-    params: {
-    }
+    equalMaterialName: undefined,//新增：等同物料名称
+    params: {},
   },
   rules: {
   }
@@ -317,16 +315,24 @@ const getListsSelect = async() => {
 /*     以下为添加物料信息对话框相关方法   */
 let materialSelectRef = ref();//物料选择对话框绑定
 const materialOpen = ref(false);//物料选择对话框显示
+const selectType = ref(''); // 新增：用于标识当前选择的是哪个字段
+
 /** 提交物料BOM信息按钮 */
 const submitMaterialForm = () => {
   let selectedRow = materialSelectRef.value.tableRef.store.states.currentRow.value;
-
-    form.value.materialId = selectedRow.materialId
-    form.value.materialName = selectedRow.materialName
-    materialOpen.value = false;
+  if (selectType.value === 'material') {
+    form.value.materialId = selectedRow.materialId;
+    form.value.materialName = selectedRow.materialName;
+  } else if (selectType.value === 'equalMaterial') {
+    form.value.equalMaterialId = selectedRow.materialId;
+    form.value.equalMaterialName = selectedRow.materialName;
+  }
+  materialOpen.value = false;
 };
+
 /** 新增按钮操作 */
-const handleMaterialAdd = () => {
+const handleMaterialAdd = (type: string) => {
+  selectType.value = type;
   materialOpen.value = true;
 }