diff --git a/src/api/mes/baseMaterialInfo/types.ts b/src/api/mes/baseMaterialInfo/types.ts
index b4bd84d..c866317 100644
--- a/src/api/mes/baseMaterialInfo/types.ts
+++ b/src/api/mes/baseMaterialInfo/types.ts
@@ -35,9 +35,9 @@ export interface BaseMaterialInfoVO {
materialTypeId: string | number;
/**
- * 物料大类(1原材料 2半成品 3成品)
+ * 物料大类(字典改为从数据库中获得)
*/
- materialCategories: string;
+ materialCategoryId: string;
/**
* 物料小类
@@ -287,6 +287,11 @@ export interface BaseMaterialInfoVO {
*/
materialTypeName: string;//连表查询映射字段
+ /**
+ * 物料大类名称
+ */
+ materialCategoryName: string;
+
}
export interface BaseMaterialInfoForm extends BaseEntity {
@@ -321,10 +326,9 @@ export interface BaseMaterialInfoForm extends BaseEntity {
materialTypeId?: string | number;
/**
- * 物料大类(1原材料 2半成品 3成品)
+ * 物料大类(字典改为从数据库中获得)
*/
- materialCategories?: string;
-
+ materialCategoryId: string;
/**
* 物料小类
*/
@@ -538,6 +542,11 @@ export interface BaseMaterialInfoForm extends BaseEntity {
maxParkingHours?: number;
maxParkingMinutes?: number;
+ /**
+ * 物料大类名称
+ */
+ materialCategoryName: string;
+
}
export interface BaseMaterialInfoQuery extends PageQuery {
@@ -573,9 +582,9 @@ export interface BaseMaterialInfoQuery extends PageQuery {
materialTypeId?: string | number;
/**
- * 物料大类(1原材料 2半成品 3成品)
+ * 物料大类(字典改为从数据库中获得)
*/
- materialCategories?: string;
+ materialCategoryId: string;
/**
* 物料小类
@@ -781,6 +790,11 @@ export interface BaseMaterialInfoQuery extends PageQuery {
* 日期范围参数
*/
params?: any;
+
+ /**
+ * 物料大类名称
+ */
+ materialCategoryName: string;
}
diff --git a/src/views/mes/baseMaterialInfo/index.vue b/src/views/mes/baseMaterialInfo/index.vue
index d7821eb..5eaa8b7 100644
--- a/src/views/mes/baseMaterialInfo/index.vue
+++ b/src/views/mes/baseMaterialInfo/index.vue
@@ -52,9 +52,12 @@
-->
-
-
-
+
+
+
-
-
-
-
-
+
@@ -264,7 +263,7 @@
-
+
@@ -428,13 +427,13 @@
>
-
-
+
+
@@ -748,6 +747,7 @@ import {getBaseMeasurementUnitInfoList} from "@/api/mes/baseMeasurementUnitInfo"
import {BaseMeasurementUnitInfoVO} from "@/api/mes/baseMeasurementUnitInfo/types";
import { getBaseMaterialTypeList } from "@/api/mes/baseMaterialType";
import {getSysMasterDataDetailList} from "@/api/system/masterDataDetail";
+import {getBaseMaterialCategoryList} from "@/api/mes/baseMaterialCategory";
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { apply_flag, inner_tube_flag,
@@ -845,7 +845,10 @@ const initFormData: BaseMaterialInfoForm = {
oldMaterialCode: undefined,
materialName: undefined,
materialTypeId: undefined,
- materialCategories: undefined,
+
+ materialCategoryId: undefined,// 物料大类id
+ materialCategoryName: undefined,// 物料大类名称
+
materialSubclass: undefined,
batchFlag: undefined,
batchAmount: undefined,
@@ -906,7 +909,10 @@ const data = reactive>({
oldMaterialCode: undefined,
materialName: undefined,
materialTypeId: undefined,
- materialCategories: undefined,
+
+ materialCategoryId: undefined,
+ materialCategoryName: undefined,
+
materialSubclass: undefined,
batchFlag: undefined,
batchAmount: undefined,
@@ -1030,6 +1036,7 @@ const handleAdd = () => {
getspeedLevelList();
getloadList();
+
getMeasureUnit();
getMaterialType();
dialog.visible = true;
@@ -1047,6 +1054,7 @@ const handleUpdate = async (row?: BaseMaterialInfoVO) => {
getspeedLevelList();
getloadList();
+
getMeasureUnit();
getMaterialType();
const _materialId = row?.materialId || ids.value[0]
@@ -1226,19 +1234,21 @@ const getplyratingList = async () => {
const res = await getSysMasterDataDetailList({masterDataId: 4});
plyratingList.value = res.data;
};
+
//获取花纹列表
let patternList = ref([]);
const getpatternList = async () => {
const res = await getSysMasterDataDetailList({masterDataId: 5});
patternList.value = res.data;
};
-//获取速度等级列表
+//获取速度等级列表
let speedLevelList = ref([]);
const getspeedLevelList = async () => {
const res = await getSysMasterDataDetailList({masterDataId: 7});
speedLevelList.value = res.data;
};
+
//获取负荷载重列表
let loadList = ref([]);
const getloadList = async () => {
@@ -1246,9 +1256,15 @@ const getloadList = async () => {
loadList.value = res.data;
};
-
+//获取物料大类
+let materialCategoryOptions = ref([]);
+const getBaseMaterialCategorySelect = async () => {
+ const res = await getBaseMaterialCategoryList(null);
+ materialCategoryOptions.value = res.data;
+}
onMounted(() => {
+ getBaseMaterialCategorySelect();
getInfoOptions();
getList();
});