diff --git a/src/views/mes/baseStructureBom/index.vue b/src/views/mes/baseStructureBom/index.vue
index cfaf9b6..58fba87 100644
--- a/src/views/mes/baseStructureBom/index.vue
+++ b/src/views/mes/baseStructureBom/index.vue
@@ -271,7 +271,7 @@ const getTreeSelect = async () => {
loading.value = true;
const res = await structureBomTreeSelect();
// structureBomOptions.value = res.data;
-
+ structureBomOptions.value = [];
const initialTree: BaseStructureBomTreeVO = {
id: 1,
parentId: -1,
diff --git a/src/views/mes/materialBom/index.vue b/src/views/mes/materialBom/index.vue
index df76284..64478f1 100644
--- a/src/views/mes/materialBom/index.vue
+++ b/src/views/mes/materialBom/index.vue
@@ -92,21 +92,21 @@
-
+
+ prop="materialTypeCode" :show-overflow-tooltip="true" width="130px"/>
+ prop="materialTypeName" :show-overflow-tooltip="true" width="130px"/>
+ prop="materialBomVersion" :show-overflow-tooltip="true" width="90px">
+ prop="materialId" :show-overflow-tooltip="true" />
@@ -115,14 +115,14 @@
+ prop="standardAmount" :show-overflow-tooltip="true" width="100px">
+ prop="unitName" :show-overflow-tooltip="true" width="100px"/>
@@ -231,7 +231,7 @@ const childTableTitle = ref('');
const materialName = ref('');
const materialBomOptions = ref([]);
const materialTypeOptions = ref([]);
-const parentMaterialId = ref(-1);
+const parentMaterialId = ref(1);
const parentParentMaterialId = ref();
const parentMaterialTypeName = ref('');
const parentMaterialName = ref('');
@@ -239,11 +239,11 @@ const parentMaterialBomVersion = ref('');
// 列显隐信息
const columns = ref([
- {key: 0, label: `生产BOM编号`, visible: true, children: []},
+ {key: 0, label: `生产BOM_ID`, visible: false, children: []},
{key: 1, label: `子物料类型编号`, visible: true, children: []},
{key: 2, label: `子物料类型名称`, visible: true, children: []},
{key: 3, label: `BOM版本`, visible: false, children: []},
- {key: 4, label: `子物料ID`, visible: true, children: []},
+ {key: 4, label: `子物料ID`, visible: false, children: []},
{key: 5, label: `子物料名称`, visible: true, children: []},
{key: 6, label: `子物料数量`, visible: true, children: []},
{key: 7, label: `子物料单位`, visible: true, children: []}
@@ -314,7 +314,7 @@ const {queryParams, form, rules} = toRefs(data);
/** 通过条件过滤节点 */
const filterNode = (value: string, data: any) => {
if (!value) return true;
- return data.label.indexOf(value) !== -1;
+ return data.label?.toLowerCase().includes(value.toLowerCase());
};
/** 根据名称筛选部门树 */
watchEffect(
@@ -338,7 +338,7 @@ const getTreeSelect = async () => {
columns.value[3].visible = false;
if (queryParams.value.parentId === null || queryParams.value.parentId === undefined) {
const topMaterialBom = materialBomOptions.value.find(item => item.id === 0);
- queryParams.value.bomStructureParentId = -1;//赋值结构bom的parentId
+ queryParams.value.bomStructureParentId = 1;//赋值结构bom的parentId
queryParams.value.parentId = 0;
parentMaterialId.value = 0;
parentParentMaterialId.value = undefined;