diff --git a/src/api/baseManagement/basemateriallist.js b/src/api/baseManagement/basemateriallist.js index 93afb42..fa2f690 100644 --- a/src/api/baseManagement/basemateriallist.js +++ b/src/api/baseManagement/basemateriallist.js @@ -6,7 +6,7 @@ import request from '@/utils/request' */ export function listBaseMaterialList(query) { return request({ - url: 'mes/baseManagement/BaseMaterialList/list', + url: 'MasterDataManagement/Material/MaterialList/list', method: 'get', params: query, }) diff --git a/src/api/baseManagement/basematerialtype.js b/src/api/baseManagement/basematerialtype.js index 5ea1f28..4eb4534 100644 --- a/src/api/baseManagement/basematerialtype.js +++ b/src/api/baseManagement/basematerialtype.js @@ -6,7 +6,7 @@ import request from '@/utils/request' */ export function getList(query) { return request({ - url: 'mes/baseManagement/BaseMaterialType/list', + url: 'MasterDataManagement/Material/MaterialType/list', method: 'get', params: query }) diff --git a/src/api/masterDataManagement/plant/plantfactorysite.js b/src/api/masterDataManagement/plant/plantfactorysite.js index 50bcf61..c9c894c 100644 --- a/src/api/masterDataManagement/plant/plantfactorysite.js +++ b/src/api/masterDataManagement/plant/plantfactorysite.js @@ -6,7 +6,7 @@ import request from '@/utils/request' */ export function listPlantFactorySite(query) { return request({ - url: 'MasterDataManagement/Plant/PlantFactorySite/list', + url: 'MasterDataManagement/Plant/PlantWorkshop/list', method: 'get', params: query }) @@ -18,7 +18,7 @@ export function listPlantFactorySite(query) { */ export function addPlantFactorySite(data) { return request({ - url: 'MasterDataManagement/Plant/PlantFactorySite', + url: 'MasterDataManagement/Plant/PlantWorkshop', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addPlantFactorySite(data) { */ export function updatePlantFactorySite(data) { return request({ - url: 'MasterDataManagement/Plant/PlantFactorySite', + url: 'MasterDataManagement/Plant/PlantWorkshop', method: 'PUT', data: data }) @@ -40,7 +40,7 @@ export function updatePlantFactorySite(data) { */ export function getPlantFactorySite(id) { return request({ - url: 'MasterDataManagement/Plant/PlantFactorySite/' + id, + url: 'MasterDataManagement/Plant/PlantWorkshop/' + id, method: 'get' }) } @@ -51,7 +51,7 @@ export function getPlantFactorySite(id) { */ export function delPlantFactorySite(pid) { return request({ - url: 'MasterDataManagement/Plant/PlantFactorySite/' + pid, + url: 'MasterDataManagement/Plant/PlantWorkshop/' + pid, method: 'delete' }) } diff --git a/src/views/baseManagement/components/BaseMaterialTypeTree.vue b/src/views/baseManagement/components/BaseMaterialTypeTree.vue index ca57741..a0e41f5 100644 --- a/src/views/baseManagement/components/BaseMaterialTypeTree.vue +++ b/src/views/baseManagement/components/BaseMaterialTypeTree.vue @@ -22,7 +22,7 @@ function getlist() { baseMaterialTypeApi.getList(queryParams).then((res) => { if (res.code == 200) { - deptOptions.value = proxy.handleTree(res.data, 'code', 'parentCode', 'children') + deptOptions.value = proxy.handleTree(res.data.result, 'code', 'parentCode', 'children') } }) } diff --git a/src/views/masterDataManagement/Plant/PlantFactorySite.vue b/src/views/masterDataManagement/Plant/PlantFactorySite.vue index de66b2b..403054e 100644 --- a/src/views/masterDataManagement/Plant/PlantFactorySite.vue +++ b/src/views/masterDataManagement/Plant/PlantFactorySite.vue @@ -261,7 +261,8 @@ function handleAdd() { reset(); open.value = true title.value = '添加工厂/站点' - opertype.value = 1 + opertype.value = 1, + form.value.status = 1 } // 修改按钮操作 function handleUpdate(row) { diff --git a/src/views/masterDataManagement/Process/ProcessRouting.vue b/src/views/masterDataManagement/Process/ProcessRouting.vue index 0de702e..83d2c4e 100644 --- a/src/views/masterDataManagement/Process/ProcessRouting.vue +++ b/src/views/masterDataManagement/Process/ProcessRouting.vue @@ -436,7 +436,7 @@ function handleDelete(row) { /* ✅ 核心修改:表格容器开启相对定位,作为弹框的定位父级 */ .table-container { position: relative; - min-height: calc(100vh - 220px); + /* min-height: calc(100vh - 220px); */ } .route-name-click {