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 @@
-
+
@@ -85,6 +85,8 @@
+
+
@@ -93,22 +95,19 @@
-->
-
-
-
+
-
+
-
+
+
+
+
+
@@ -193,8 +192,8 @@ const initFormData: BaseEqualMaterialInfoForm = {
equalMaterialId: undefined,
activeFlag: '1',
remark: undefined,
-
materialName: undefined,//映射字段
+ equalMaterialName: undefined,//新增:等同物料名称
}
const data = reactive>({
form: {...initFormData},
@@ -207,9 +206,8 @@ const data = reactive {
/* 以下为添加物料信息对话框相关方法 */
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;
}