diff --git a/src/api/part/partInformation.js b/src/api/part/partInformation.js index 3732f1e..1df7c34 100644 --- a/src/api/part/partInformation.js +++ b/src/api/part/partInformation.js @@ -233,6 +233,8 @@ export const queryPartUnitCostList = data => createAPI(`/plm/partInformation/que export const onlyQueryPartUnitCostList = data => createAPI(`/plm/partInformation/onlyQueryPartUnitCostList`,'post',data) +export const getInventoryPartCost = data => createAPI(`/plm/partInformation/getInventoryPartCost`,'post',data) + export const getItemListByCodeNo = data => createAPI(`/plm/partInformation/getItemListByCodeNo`,'post',data) export const getItemExclusionAlreadyExists = data => createAPI(`/plm/partInformation/getItemExclusionAlreadyExists`,'post',data) diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index 1dad589..db6e44d 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -1499,6 +1499,7 @@ getNextPartNo, // 获取下一个物料编码 getPartRevisionEngChgLevel, // 获取下一个物料revision queryPartUnitCostList, // 查询物料的 unitCost 列表 + getInventoryPartCost, // 查询物料的 estimatedMaterialCost getItemListByCodeNo, // 查询模板中的属性 getItemExclusionAlreadyExists, // 查属性模板,不包括已存在的 getPartCharacteristicList, // 获取维护的物料属性 @@ -3625,7 +3626,10 @@ // 刷新页签的table数据 refreshInventoryPartTable () { if (this.inventoryPartTable === 'Costs') { - this.queryPartUnitCostList() + if (this.modalData.flag === '2') { + this.queryPartUnitCostList() + this.queryInventoryPartCost() + } } if (this.inventoryPartTable === 'Revisions') { this.queryPartRevisionList() @@ -3690,6 +3694,20 @@ }) }, + // 查询物料的 estimatedMaterialCost(仅编辑模式) + queryInventoryPartCost () { + let tempData = { + site: this.modalData.site, + partNo: this.modalData.partNo, + userName: this.$store.state.user.name, + } + getInventoryPartCost(tempData).then(({data}) => { + if (data && data.code === 0 && data.rows && data.rows.estimatedMaterialCost != null) { + this.modalData.estimatedMaterialCost = data.rows.estimatedMaterialCost + } + }) + }, + // 新增revision模态框 savePartRevisionModal () { this.revisionData = { diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue index 81baca3..6b09477 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -1028,6 +1028,7 @@ import { deleteProjectPart, // 删除项目物料 addProjectPart2, // 新增项目物料 queryPartUnitCostList, // 查询物料的 unitCost 列表 + getInventoryPartCost, // 查询物料的 estimatedMaterialCost getItemListByCodeNo, // 查询模板中的属性 getItemExclusionAlreadyExists, // 查属性模板,不包括已存在的 getPartCharacteristicList, // 获取维护的物料属性 @@ -3112,7 +3113,10 @@ import CodeGeneration from "../../code/generation.vue"; // 刷新页签的table数据 refreshInventoryPartTable () { if (this.inventoryPartTable === 'Costs') { - this.queryPartUnitCostList() + if (this.modalData.flag === '2') { + this.queryPartUnitCostList() + this.queryInventoryPartCost() + } } if (this.inventoryPartTable === 'Revisions') { this.queryPartRevisionList() @@ -3151,6 +3155,20 @@ import CodeGeneration from "../../code/generation.vue"; }) }, + // 查询物料的 estimatedMaterialCost(仅编辑模式) + queryInventoryPartCost () { + let tempData = { + site: this.modalData.site, + partNo: this.modalData.partNo, + userName: this.$store.state.user.name, + } + getInventoryPartCost(tempData).then(({data}) => { + if (data && data.code === 0 && data.rows && data.rows.estimatedMaterialCost != null) { + this.modalData.estimatedMaterialCost = data.rows.estimatedMaterialCost + } + }) + }, + // 新增revision模态框 savePartRevisionModal () { this.revisionData = { diff --git a/src/views/modules/quote/index.vue b/src/views/modules/quote/index.vue index fe4bfb9..db315c6 100644 --- a/src/views/modules/quote/index.vue +++ b/src/views/modules/quote/index.vue @@ -1793,8 +1793,8 @@ export default { - - 项目年销售额≥10M + +