diff --git a/src/views/design/billofQuantities/indexEdit3.vue b/src/views/design/billofQuantities/indexEdit3.vue index 2e5eacd..094df79 100644 --- a/src/views/design/billofQuantities/indexEdit3.vue +++ b/src/views/design/billofQuantities/indexEdit3.vue @@ -113,7 +113,7 @@ const approvalRecordRef = ref>(); //按钮组件 const flowCodeOptions = [ { - value: currentProject.value?.id + '_materialsPlans', + value: currentProject.value?.id + '_equipmentList', label: '物资设备清单审核' } ]; diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue index 5cf03d9..8d4c067 100644 --- a/src/views/materials/overallPlanMaterialSupply/index.vue +++ b/src/views/materials/overallPlanMaterialSupply/index.vue @@ -423,7 +423,7 @@ async function getMasterDataList() { } state.masterData = masterData[0]; // 获取完整供应计划数据 - const supplyPlanRes = await totalsupplyplan({ id: masterData[0].id }); + const supplyPlanRes = await totalsupplyplan({ id: masterData[0].id, projectId: currentProject.value?.id }); const allData = supplyPlanRes.rows || []; // 存储完整数据到本地 fullTreeData.value = [...allData]; diff --git a/src/views/system/appMenu/index.vue b/src/views/system/appMenu/index.vue new file mode 100644 index 0000000..47cecbe --- /dev/null +++ b/src/views/system/appMenu/index.vue @@ -0,0 +1,413 @@ + + + diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 6c2f1ae..050c761 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -34,6 +34,7 @@ + @@ -77,7 +81,7 @@ - + @@ -103,7 +107,6 @@ - @@ -122,10 +125,9 @@ @@ -139,9 +141,7 @@