diff --git a/index.html b/index.html index c0e5869..8bf555d 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - CCL-PLM + CCL Design <% if (process.env.NODE_ENV === 'production') { %> diff --git a/src/api/part/partInformation.js b/src/api/part/partInformation.js index 1d78bf8..a6a4221 100644 --- a/src/api/part/partInformation.js +++ b/src/api/part/partInformation.js @@ -307,3 +307,5 @@ export const downLoadFile = data => createAPI(`/plm/partInformation/downLoadFile export const getPartRevisionEngChgLevel = data => createAPI(`/plm/partInformation/getPartRevisionEngChgLevel`,'post',data) +export const queryPartUnitCostList = data => createAPI(`/plm/partInformation/queryPartUnitCostList`,'post',data) + diff --git a/src/api/tool/tool_info.js b/src/api/tool/tool_info.js index 8730429..dc1f38e 100644 --- a/src/api/tool/tool_info.js +++ b/src/api/tool/tool_info.js @@ -12,3 +12,6 @@ export const removeToolInfo = data => createAPI('plm/tool/removeToolInfo', 'POST // 删除 export const removeToolInstance = data => createAPI('plm/tool/removeToolInstance', 'POST', data) +export const updateToolStandardCost = data => createAPI('/plm/projectToolingApplication/updateToolStandardCost', 'POST', data) + + diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 73c278e..e8664c2 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -10,7 +10,7 @@ - {{'CCL PLM'}} + {{'CCL Design'}} {{ pageLanguage.abbreviation }} diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index 9b94241..969eadb 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -332,6 +332,28 @@ + + + + + @@ -1433,6 +1455,7 @@ getProjectPartNo, // 获取物料编码 getNextPartNo, // 获取下一个物料编码 getPartRevisionEngChgLevel, // 获取下一个物料revision + queryPartUnitCostList, // 查询物料的 unitCost 列表 } from '@/api/part/partInformation.js' import { getFileContentList, // 获取物料单附件列表 @@ -1744,6 +1767,7 @@ itemList1:[], itemList2:[], revisionList: [], + unitCostList: [], bomAlternativeList: [], routingAlternativeList: [], copyAttributeList: [], @@ -2914,6 +2938,38 @@ fixed: '', }, ], + columnUnitCostList: [ + { + columnProp: 'lotBatchNo', + headerAlign: "center", + align: "center", + columnLabel: 'Lot/Batch No', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + }, + { + columnProp: 'serialNo', + headerAlign: "center", + align: "center", + columnLabel: 'Serial No', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + }, + { + columnProp: 'inventoryValue', + headerAlign: "center", + align: "center", + columnLabel: 'Unit Cost', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + }, + ], columnBomAlternativeList: [ { columnProp: 'engChgLevel', @@ -3157,6 +3213,9 @@ // 刷新页签的table数据 refreshInventoryPartTable () { + if (this.inventoryPartTable === 'Costs') { + this.queryPartUnitCostList() + } if (this.inventoryPartTable === 'Revisions') { this.queryPartRevisionList() } @@ -3177,6 +3236,22 @@ }) }, + // 查询物料的 unitCost 列表 + queryPartUnitCostList () { + let tempData = { + site: this.modalData.site, + partNo: this.modalData.partNo, + configurationId: this.modalData.configurationId + } + queryPartUnitCostList(tempData).then(({data}) => { + if (data && data.code === 0) { + this.unitCostList = data.rows + } else { + this.unitCostList = [] + } + }) + }, + // 新增revision模态框 savePartRevisionModal () { this.revisionData = { diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue index 2e5116c..adaca0c 100644 --- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue +++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue @@ -88,7 +88,7 @@ - + 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 b272ef6..2c14cc7 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -591,6 +591,12 @@ + + + + + + 查询 @@ -688,6 +694,16 @@ align="left" min-width="120" label="BU"> + + +