diff --git a/src/api/part/bomManagement.js b/src/api/part/bomManagement.js index 90c587d..5deb760 100644 --- a/src/api/part/bomManagement.js +++ b/src/api/part/bomManagement.js @@ -154,6 +154,39 @@ export const copyAlternative = data => createAPI(`/plm/bomManagement/copyAlterna */ export const toBecomeOfficialBom = data => createAPI(`/plm/bomManagement/toBecomeOfficialBom`,'post',data) +/** + * 新编辑副产品成本分配 + * @param data + * @returns {*} + */ +export const updateManufStructCostDistrib = data => createAPI(`/plm/bomManagement/updateManufStructCostDistrib`,'post',data) + +/** + * 刷新子物料 + * @param data + * @returns {*} + */ +export const queryBomComponentTable = data => createAPI(`/plm/bomManagement/queryBomComponentTable`,'post',data) +/** + * 刷新副产品 + * @param data + * @returns {*} + */ +export const queryBomByProductTable = data => createAPI(`/plm/bomManagement/queryBomByProductTable`,'post',data) + +/** + * 刷新项目成本分配 + * @param data + * @returns {*} + */ +export const queryManufStructCostDistribtionTable = data => createAPI(`/plm/bomManagement/queryManufStructCostDistribtionTable`,'post',data) + +/** + * 刷新多级别结构 + * @param data + * @returns {*} + */ +export const queryMultiLevelStructureTable = data => createAPI(`/plm/bomManagement/queryMultiLevelStructureTable`,'post',data) diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index 193c1b8..e6028b6 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -30,6 +30,7 @@ :height="height" :data="dataList" border + :row-style="rowStyle" ref="changeTable" @row-click="changeClickRow" @current-change="currentChange" @@ -191,10 +192,11 @@ prop="" header-align="center" align="center" - min-width="90" + min-width="170" label="新物料编码"> diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue index 92fcf1a..b0baaad 100644 --- a/src/views/modules/changeManagement/changeRequest.vue +++ b/src/views/modules/changeManagement/changeRequest.vue @@ -3,11 +3,23 @@ + + + + + + + + + + + + - + @@ -197,10 +209,11 @@ prop="" header-align="center" align="center" - min-width="90" + min-width="170" label="新物料编码"> diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index cb7e51c..aec3aea 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -238,6 +238,111 @@ + + + + + + 新增 + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存 @@ -412,12 +517,47 @@ - 应用 + 应用 保存 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存 + 关闭 + + +
@@ -654,6 +794,11 @@ import { copyBom, // 复制bom copyAlternative, // 复制alternative, toBecomeOfficialBom, // 转正式Bom + updateManufStructCostDistrib, // 新编辑副产品成本分配 + queryBomComponentTable, // 刷新子物料 + queryBomByProductTable, // 刷新副产品 + queryManufStructCostDistribtionTable, // 刷新项目成本分配 + queryMultiLevelStructureTable, // 刷新多级别结构 } from '@/api/part/bomManagement.js' import ChooseList from '@/views/modules/common/Chooselist' import dayjs from "dayjs"; @@ -805,7 +950,8 @@ export default { createBy: '', updateDate: '', updateBy: '', - lineSequence: '' + lineSequence: '', + productFlag: '' }, partData: { site: this.$store.state.user.site, @@ -871,15 +1017,34 @@ export default { createBy: '', officialFlag: '' }, + manufStructCostDistribData: { + site: '', + partNo: '', + engChgLevel: '', + bomType: '', + alternativeNo: '', + byProdLineItemNo: '', + componentLineItemNo: '', + componentPartNo: '', + componentPartDesc: '', + byProdPartNo: '', + byProdPartDesc: '', + itemCostDistribution: '', + updateBy: '', + }, // ======== 数据列表 ======== dataList: [], partList: [], componentPartList: [], componentPartSelections: [], subDetailList: [], + byProductList: [], + manufStructCostDistribList: [], detailDataList: [], checkedDetail: [], + checkedByProduct: [], operationList: [], + multiLevelStructureList: [], // ======== 列表表头 ======== columnList: [ { @@ -1115,7 +1280,7 @@ export default { { columnProp: 'partDesc', headerAlign: "center", - align: "center", + align: "left", columnLabel: '物料名称', columnHidden: false, columnImage: false, @@ -1167,7 +1332,7 @@ export default { { columnProp: 'partDesc', headerAlign: "center", - align: "center", + align: "left", columnLabel: '物料名称', columnHidden: false, columnImage: false, @@ -1380,59 +1545,326 @@ export default { columnLabel: '发料库位', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, + { + userId: this.$store.state.user.name, + functionId: 104002, + serialNumber: '104002Table2NoteText', + tableId: '104002Table2', + tableName: 'BOM子物料表', + columnProp: 'noteText', + headerAlign: 'center', + align: 'left', + columnLabel: '备注', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 150 + }, + ], + operationDetailList: [ + { + columnProp: 'routingRevision', + headerAlign: "center", + align: "center", + columnLabel: 'Routing版本号', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + }, + { + columnProp: 'routingType', + headerAlign: "center", + align: "center", + columnLabel: '工艺类型', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + }, + { + columnProp: 'alternativeNo', + headerAlign: "center", + align: "center", + columnLabel: '替代编码', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 80 + }, + { + columnProp: 'alternativeDescription', + headerAlign: "center", + align: "left", + columnLabel: '替代名称', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + }, + { + columnProp: 'status', + headerAlign: "center", + align: "center", + columnLabel: '替代状态', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 80 + }, + { + columnProp: 'operationNo', + headerAlign: "center", + align: "center", + columnLabel: '工序编码', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 80 + }, + { + columnProp: 'operationName', + headerAlign: "center", + align: "left", + columnLabel: '工序名称', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + } + ], + columnBomDetailList: [ + { + columnProp: 'alternativeNo', + headerAlign: "center", + align: "center", + columnLabel: '替代编码', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + }, + { + columnProp: 'alternativeDescription', + headerAlign: "center", + align: "left", + columnLabel: '替代名称', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + }, + { + columnProp: 'status', + headerAlign: "center", + align: "center", + columnLabel: '状态', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + }, + ], + columnManufStructCostDistribList: [ + { + columnProp: 'byProdLineItemNo', + headerAlign: "center", + align: "center", + columnLabel: '副产品行项目号', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 60 + }, + { + columnProp: 'byProdPartNo', + headerAlign: "center", + align: "center", + columnLabel: '副产品物料编码', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 120 + }, + { + columnProp: 'byProdPartDesc', + headerAlign: "center", + align: "left", + columnLabel: '副产品物料名称', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 150 + }, + { + columnProp: 'componentLineItemNo', + headerAlign: "center", + align: "center", + columnLabel: '子物料项目号', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 60 + }, + { + columnProp: 'componentPartNo', + headerAlign: "center", + align: "center", + columnLabel: '子物料编码', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 120 + }, + { + columnProp: 'componentPartDesc', + headerAlign: "center", + align: "left", + columnLabel: '子物料名称', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 150 + }, + { + columnProp: 'itemCostDistribution', + headerAlign: "center", + align: "center", + columnLabel: '项目成本分配因素', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 60 + }, + ], + columnMultiLevelStructureList: [ + { + columnProp: 'partNo', + headerAlign: "center", + align: "center", + columnLabel: '物料编码', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + }, + { + columnProp: 'partDesc', + headerAlign: "center", + align: "left", + columnLabel: '物料名称', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 150 + }, + { + columnProp: 'engChgLevel', + headerAlign: "center", + align: "center", + columnLabel: 'BOM版本号', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 80 + }, + { + columnProp: 'bomType', + headerAlign: "center", + align: "center", + columnLabel: '制造类型', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + }, + { + columnProp: 'alternativeNo', + headerAlign: "center", + align: "center", + columnLabel: '替代编码', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + }, + { + columnProp: 'alternativeDescription', + headerAlign: "center", + align: "left", + columnLabel: '替代名称', + columnHidden: false, + columnImage: false, status: true, fixed: '', - columnWidth: 80 + columnWidth: 150 }, { - userId: this.$store.state.user.name, - functionId: 104002, - serialNumber: '104002Table2NoteText', - tableId: '104002Table2', - tableName: 'BOM子物料表', - columnProp: 'noteText', - headerAlign: 'center', - align: 'left', - columnLabel: '备注', + columnProp: 'componentPart', + headerAlign: "center", + align: "center", + columnLabel: '子物料编码', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 150 + columnWidth: 100 }, - ], - operationDetailList: [ { - columnProp: 'routingRevision', + columnProp: 'componentPartDesc', headerAlign: "center", - align: "center", - columnLabel: 'Routing版本号', + align: "left", + columnLabel: '子物料名称', columnHidden: false, columnImage: false, status: true, fixed: '', - columnWidth: 100 + columnWidth: 150 }, { - columnProp: 'routingType', + columnProp: 'qtyPerAssembly', headerAlign: "center", - align: "center", - columnLabel: '工艺类型', + align: "right", + columnLabel: '单位用量', columnHidden: false, columnImage: false, status: true, fixed: '', - columnWidth: 100 + columnWidth: 60 }, { - columnProp: 'alternativeNo', + columnProp: 'printUnitName', headerAlign: "center", - align: "center", - columnLabel: '替代编码', + align: "left", + columnLabel: '计量单位', columnHidden: false, columnImage: false, status: true, @@ -1440,10 +1872,10 @@ export default { columnWidth: 80 }, { - columnProp: 'alternativeDescription', + columnProp: 'productGroupName4', headerAlign: "center", - align: "center", - columnLabel: '替代名称', + align: "left", + columnLabel: '计划人', columnHidden: false, columnImage: false, status: true, @@ -1451,75 +1883,81 @@ export default { columnWidth: 100 }, { - columnProp: 'status', + columnProp: 'minOrderQty', headerAlign: "center", - align: "center", - columnLabel: '替代状态', + align: "right", + columnLabel: '最小批量', columnHidden: false, columnImage: false, status: true, fixed: '', - columnWidth: 80 + columnWidth: 60 }, { - columnProp: 'operationNo', + columnProp: 'mulOrderQty', headerAlign: "center", - align: "center", - columnLabel: '工序编码', + align: "right", + columnLabel: '多种批量大小', columnHidden: false, columnImage: false, status: true, fixed: '', - columnWidth: 80 + columnWidth: 60 }, { - columnProp: 'operationName', + columnProp: 'planningMethod', headerAlign: "center", - align: "center", - columnLabel: '工序名称', + align: "left", + columnLabel: '计划方法', columnHidden: false, columnImage: false, status: true, fixed: '', columnWidth: 100 - } - ], - columnBomDetailList: [ + }, { - columnProp: 'alternativeNo', + columnProp: 'cumLeadTime', headerAlign: "center", - align: "center", - columnLabel: '替代编码', + align: "right", + columnLabel: '父级累计提前期', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', + columnWidth: 100 }, { - columnProp: 'alternativeDescription', + columnProp: 'unprotectedLeadTime', headerAlign: "center", - align: "center", - columnLabel: '替代名称', + align: "right", + columnLabel: '父级未受保护提前期', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', + columnWidth: 100 }, { - columnProp: 'status', + columnProp: 'componentCumLeadTime', headerAlign: "center", - align: "center", - columnLabel: '状态', + align: "right", + columnLabel: '子物料累计提前期', + columnHidden: false, + columnImage: false, + status: true, + fixed: '', + columnWidth: 100 + }, + { + columnProp: 'componentUnprotectedLeadTime', + headerAlign: "center", + align: "right", + columnLabel: '子物料未受保护提前期', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', + columnWidth: 100 }, ], // ======== 必填规则 ======== @@ -1648,7 +2086,8 @@ export default { operationModelFlag: false, copyBomModelFlag: false, copyAlternativeModelFlag: false, - headerSaveFlag: false + headerSaveFlag: false, + manufStructCostDistribModal: false } }, @@ -1721,9 +2160,48 @@ export default { */ refreshSubDetailTable () { if (this.subDetailTable === 'bom_sub_detail') { - + this.queryBomComponentTable() + } else if (this.subDetailTable === 'by_products') { + this.queryBomByProductTable() + } else if (this.subDetailTable === 'manuf_struct_cost_distribtion') { + this.queryManufStructCostDistribtionTable() + } else if (this.subDetailTable === 'multi_level_structure') { + this.queryMultiLevelStructureTable() } }, + // 刷新方法 + queryBomComponentTable () { + queryBomComponentTable(this.detailData).then(({data}) => { + if (data.code === 0) { + this.subDetailList = data.rows + } + }) + }, + // 刷新方法 + queryBomByProductTable () { + queryBomByProductTable(this.detailData).then(({data}) => { + if (data.code === 0) { + this.byProductList = data.rows + + } + }) + }, + // 刷新方法 + queryManufStructCostDistribtionTable () { + queryManufStructCostDistribtionTable(this.detailData).then(({data}) => { + if (data.code === 0) { + this.manufStructCostDistribList = data.rows + } + }) + }, + // 刷新方法 + queryMultiLevelStructureTable () { + queryMultiLevelStructureTable(this.detailData).then(({data}) => { + if (data.code === 0) { + this.multiLevelStructureList = data.rows + } + }) + }, // ======== 列表数据操作方法 ======== /** @@ -1803,6 +2281,8 @@ export default { } this.detailDataList = [] this.subDetailList = [] + this.byProductList = [] + this.manufStructCostDistribList = [] this.headerSaveFlag = true this.modalDisableFlag = false this.modalFlag = true @@ -1829,11 +2309,15 @@ export default { printUnitName: row.printUnitName, officialFlag: row.officialFlag } + this.subDetailTable = 'bom_sub_detail' // 查bom明细 queryBomDetail(this.modalData).then(({data}) => { if (data && data.code === 0) { this.detailDataList = data.rows.detailList this.subDetailList = data.rows.componentList + this.byProductList = data.rows.byProductList + this.manufStructCostDistribList = data.rows.manufStructCostDistribList + this.multiLevelStructureList = data.rows.multiLevelStructureList this.detailData = data.rows.detailData this.modalDisableFlag = true this.modalFlag = true @@ -1972,7 +2456,57 @@ export default { issueToLocName: '', noteText: '', createBy: this.$store.state.user.name, - lineSequence: '' + lineSequence: '', + productFlag: 'component' + } + // 获取子料的序号 + getComponentLineSequence(this.componentData).then(({data}) => { + if (data && data.code === 0) { + this.componentData.lineSequence = data.lineSequence + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + this.componentDisableFlag = false + this.componentSaveModal = true + }, + /** + * 副产品新增模态框 + */ + saveByProductModal () { + if (this.detailData.alternativeNo === '' || this.detailData.alternativeNo == null) { + this.$message.warning('请先选择替代!') + return + } + if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { + this.$message.warning('不可编辑的替代状态!') + return + } + this.componentData = { + flag: '1', + site: this.$store.state.user.site, + partNo: this.modalData.partNo, + engChgLevel: this.modalData.engChgLevel, + bomType: this.modalData.bomType, + alternativeNo: this.detailData.alternativeNo, + componentPart: '', + componentPartDesc: '', + printUnit: '', + printUnitName: '', + qtyPerAssembly: 0, + componentScrap: 0, + issueType: 'Reserve and Backflush', + shrinkageFactor: 0, + lineItemNo: '', + operationId: '', + issueToLoc: '', + issueToLocName: '', + noteText: '', + createBy: this.$store.state.user.name, + lineSequence: '', + productFlag: 'byProduct' } // 获取子料的序号 getComponentLineSequence(this.componentData).then(({data}) => { @@ -2016,11 +2550,72 @@ export default { issueToLocName: row.issueToLocName, noteText: row.noteText, updateBy: this.$store.state.user.name, - lineSequence: row.lineSequence + lineSequence: row.lineSequence, + productFlag: 'component' + } + this.componentDisableFlag = true + this.componentSaveModal = true + }, + /** + * 副产品编辑模态框 + */ + updateByProductModal (row) { + if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { + this.$message.warning('不可编辑的替代状态!') + return + } + this.componentData = { + flag: '2', + site: row.site, + partNo: row.partNo, + engChgLevel: row.engChgLevel, + bomType: row.bomType, + alternativeNo: row.alternativeNo, + componentPart: row.componentPart, + componentPartDesc: row.componentPartDesc, + printUnit: row.printUnit, + printUnitName: row.printUnitName, + qtyPerAssembly: row.qtyPerAssembly, + componentScrap: row.componentScrap, + issueType: row.issueType, + shrinkageFactor: row.shrinkageFactor, + lineItemNo: row.lineItemNo, + operationId: row.operationId, + issueToLoc: row.issueToLoc, + issueToLocName: row.issueToLocName, + noteText: row.noteText, + updateBy: this.$store.state.user.name, + lineSequence: row.lineSequence, + productFlag: 'byProduct' } this.componentDisableFlag = true this.componentSaveModal = true }, + /** + * 副产品成本分配编辑模态框 + */ + updateManufStructCostDistribModal (row) { + if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { + this.$message.warning('不可编辑的替代状态!') + return + } + this.manufStructCostDistribData = { + site: row.site, + partNo: row.partNo, + engChgLevel: row.engChgLevel, + bomType: row.bomType, + alternativeNo: row.alternativeNo, + byProdLineItemNo: row.byProdLineItemNo, + componentLineItemNo: row.componentLineItemNo, + componentPartNo: row.componentPartNo, + componentPartDesc: row.componentPartDesc, + byProdPartNo: row.byProdPartNo, + byProdPartDesc: row.byProdPartDesc, + itemCostDistribution: row.itemCostDistribution, + updateBy: this.$store.state.user.name, + } + this.manufStructCostDistribModal = true + }, // ======== 新增/编辑/删除方法 ======== @@ -2362,15 +2957,19 @@ export default { * @param rowIndex */ rowClassName({ row, rowIndex }) { - row.xh = rowIndex + 1; + row.xh = rowIndex + 1 }, /** - * 单选框选中数据 + * 选中数据 * @param selection */ componentSelectionChange(selection) { this.checkedDetail = selection }, + + byProductSelection (selection) { + this.checkedByProduct = selection + }, /** * 删除子物料 */ @@ -2389,11 +2988,57 @@ export default { type: "warning" }).then(() => { let tempData = { - informationList: this.checkedDetail + informationList: this.checkedDetail, + productFlag: 'component' + } + deleteBomComponent(tempData).then(({data}) => { + if (data && data.code === 0) { + this.subDetailList = data.rows.subDetailList + this.byProductList = data.rows.byProductList + this.manufStructCostDistribList = data.rows.manufStructCostDistribList + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }).catch(() => { + }) + } + }, + + /** + * 删除子物料 + */ + deleteByProduct () { + if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { + this.$message.warning('不可编辑的替代状态!') + return + } + if (this.checkedByProduct.length === 0) { + this.$message.warning('请选择要删除副产品!') + return + } else { + this.$confirm("请是否确认删除该副产品记录?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + let tempData = { + informationList: this.checkedByProduct, + productFlag: 'byProduct' } deleteBomComponent(tempData).then(({data}) => { if (data && data.code === 0) { - this.subDetailList = data.rows + this.subDetailList = data.rows.subDetailList + this.byProductList = data.rows.byProductList + this.manufStructCostDistribList = data.rows.manufStructCostDistribList this.$message({ message: '操作成功', type: 'success', @@ -2420,6 +3065,9 @@ export default { componentClickRow (row) { this.$refs.componentTable.toggleRowSelection(row) }, + byProductClickRow (row) { + this.$refs.byProductTable.toggleRowSelection(row) + }, // /** // * 多选子物料 // * @param val @@ -2486,7 +3134,9 @@ export default { if (this.componentData.flag === '1') { saveBomComponent(this.componentData).then(({data}) => { if (data && data.code === 0) { - this.subDetailList = data.rows + this.subDetailList = data.rows.subDetailList + this.byProductList = data.rows.byProductList + this.manufStructCostDistribList = data.rows.manufStructCostDistribList if (isClose) { this.saveComponentModal() } else { @@ -2507,7 +3157,8 @@ export default { } else if (this.componentData.flag === '2') { updateBomComponent(this.componentData).then(({data}) => { if (data && data.code === 0) { - this.subDetailList = data.rows + this.subDetailList = data.rows.subDetailList + this.byProductList = data.rows.byProductList this.componentSaveModal = false this.$message({ message: '操作成功', @@ -2523,6 +3174,32 @@ export default { }) } }, + + /** + * 编辑副产品成本分配方法 + */ + manufStructCostDistribUpdate () { + if (this.manufStructCostDistribData.shrinkageFactor < 0 || this.manufStructCostDistribData.shrinkageFactor > 1) { + this.$message.warning('项目成本分配系数必须介于0和1之间!') + return + } + updateManufStructCostDistrib(this.manufStructCostDistribData).then(({data}) => { + if (data && data.code === 0) { + this.manufStructCostDistribList = data.rows.manufStructCostDistribList + this.manufStructCostDistribModal = false + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, /** * 回车事件 */ @@ -2933,12 +3610,10 @@ export default { this.detailData.minLotQty = val } else if (type === 3) { this.saveDetailData.minLotQty = val - } - // else if (type === 4) { - // this.componentData.qtyPerAssembly = val - // } - else if (type === 5) { + } else if (type === 5) { this.componentData.componentScrap = val + } else if (type === 6) { + this.manufStructCostDistribData.itemCostDistribution = val } }, diff --git a/src/views/modules/part/partCatalogInformation.vue b/src/views/modules/part/partCatalogInformation.vue index f50dc21..fc86a5d 100644 --- a/src/views/modules/part/partCatalogInformation.vue +++ b/src/views/modules/part/partCatalogInformation.vue @@ -35,6 +35,7 @@ :data="dataList" border ref="partTable" + :row-style="rowStyle" @row-click="partClickRow" @selection-change="selectionPart" @current-change="changeCurrentRow" @@ -174,7 +175,7 @@ - 新增/删除 + 新增 编辑 diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index 379f1cb..383e279 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -59,18 +59,19 @@ :data="dataList" border ref="partTable" + :row-style="rowStyle" @row-click="partClickRow" @selection-change="selectionPart" @current-change="changeCurrentRow" v-loading="dataListLoading" style="width: 100%;"> - - + + + + + + + - 新增/删除 + 新增 编辑 diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue index 984fc4a..a38c39b 100644 --- a/src/views/modules/part/routingManagement.vue +++ b/src/views/modules/part/routingManagement.vue @@ -459,7 +459,7 @@ - 应用 + 应用 保存 关闭