diff --git a/src/api/mes/baseEqualMaterialInfo/types.ts b/src/api/mes/baseEqualMaterialInfo/types.ts
index e9c04c4..f84a36b 100644
--- a/src/api/mes/baseEqualMaterialInfo/types.ts
+++ b/src/api/mes/baseEqualMaterialInfo/types.ts
@@ -54,6 +54,11 @@ export interface BaseEqualMaterialInfoVO {
*/
updateTime: string;
+ /**
+ * 物料名称
+ */
+ materialName: string;//映射字段
+
}
export interface BaseEqualMaterialInfoForm extends BaseEntity {
@@ -82,6 +87,11 @@ export interface BaseEqualMaterialInfoForm extends BaseEntity {
*/
remark?: string;
+ /**
+ * 物料名称
+ */
+ materialName: string;//映射字段
+
}
export interface BaseEqualMaterialInfoQuery extends PageQuery {
@@ -110,6 +120,12 @@ export interface BaseEqualMaterialInfoQuery extends PageQuery {
* 日期范围参数
*/
params?: any;
+
+
+ /**
+ * 物料名称
+ */
+ materialName: string;//映射字段
}
diff --git a/src/views/mes/baseEqualMaterialInfo/index.vue b/src/views/mes/baseEqualMaterialInfo/index.vue
index 6b7e06a..59b0572 100644
--- a/src/views/mes/baseEqualMaterialInfo/index.vue
+++ b/src/views/mes/baseEqualMaterialInfo/index.vue
@@ -91,15 +91,22 @@
+
-
+
+
+
+
+
+
+
@@ -123,6 +130,18 @@
+
+
+
+
+
+
+
+
+
@@ -130,6 +149,7 @@
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;
const { active_flag } = toRefs(proxy?.useDict('active_flag'));
@@ -173,6 +193,8 @@ const initFormData: BaseEqualMaterialInfoForm = {
equalMaterialId: undefined,
activeFlag: '1',
remark: undefined,
+
+ materialName: undefined,//映射字段
}
const data = reactive>({
form: {...initFormData},
@@ -183,6 +205,9 @@ const data = reactive {
materialList.value = res.data;
}
+/* 以下为添加物料信息对话框相关方法 */
+let materialSelectRef = ref();//物料选择对话框绑定
+const materialOpen = ref(false);//物料选择对话框显示
+/** 提交物料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;
+};
+/** 新增按钮操作 */
+const handleMaterialAdd = () => {
+ materialOpen.value = true;
+}
+
onMounted(() => {
- getListsSelect();
+ // getListsSelect();
getList();
});