diff --git a/src/api/part/quicklyCreateBom.js b/src/api/part/quicklyCreateBom.js new file mode 100644 index 0000000..1cd58c2 --- /dev/null +++ b/src/api/part/quicklyCreateBom.js @@ -0,0 +1,13 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +export const getNodeTree = data => createAPI(`/part/quicklyBom/getNodeTree`,'post',data) +export const nodeSave = data => createAPI(`/part/quicklyBom/nodeSave`,'post',data) +export const nodeDelete = data => createAPI(`/part/quicklyBom/nodeDelete`,'post',data) +export const nodeEdit = data => createAPI(`/part/quicklyBom/nodeEdit`,'post',data) +export const getBomInformationByPartNo = data => createAPI(`/part/quicklyBom/getBomInformationByPartNo`,'post',data) +export const savePartInfo = data => createAPI(`/part/quicklyBom/savePartInfo`,'post',data) +export const saveBomHeader = data => createAPI(`/part/quicklyBom/saveBomHeader`,'post',data) +export const getRoutingInformationByPartNo = data => createAPI(`/part/quicklyBom/getRoutingInformationByPartNo`,'post',data) +export const saveRoutingHeader = data => createAPI(`/part/quicklyBom/saveRoutingHeader`,'post',data) +export const batchBuildInfo = data => createAPI(`/part/quicklyBom/batchBuildInfo`,'post',data) +export const resetNodePartInfo = data => createAPI(`/part/quicklyBom/resetNodePartInfo`,'post',data) diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index e1a749c..6d66ab1 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -201,7 +201,7 @@ 编辑 Copy Build - Retire + Retire diff --git a/src/views/modules/part/bom_create.vue b/src/views/modules/part/bom_create.vue new file mode 100644 index 0000000..f0affa1 --- /dev/null +++ b/src/views/modules/part/bom_create.vue @@ -0,0 +1,2308 @@ + + + + + diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index 1429800..870fbf8 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -171,8 +171,6 @@ - - 计量单位 @@ -2346,7 +2344,7 @@ */ addOrDelItem () { if (!this.attributeDialog) { - this.$message.warning('请保存更改!') + this.$message.warning('请保存属性更改!') return } this.itemSelections1 = null diff --git a/src/views/modules/part/part_create.vue b/src/views/modules/part/part_create.vue new file mode 100644 index 0000000..946b9a1 --- /dev/null +++ b/src/views/modules/part/part_create.vue @@ -0,0 +1,2016 @@ + + + diff --git a/src/views/modules/part/quicklyCreateBom.vue b/src/views/modules/part/quicklyCreateBom.vue new file mode 100644 index 0000000..9600a5f --- /dev/null +++ b/src/views/modules/part/quicklyCreateBom.vue @@ -0,0 +1,837 @@ + + + + + + + diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue index 717210d..b6ec43f 100644 --- a/src/views/modules/part/routingManagement.vue +++ b/src/views/modules/part/routingManagement.vue @@ -258,7 +258,8 @@ - 保存 + 应用 + 保存 关闭 @@ -2692,7 +2693,7 @@ export default { /** * routing新增/编辑 */ - saveData () { + saveData (isClose) { if (this.modalData.partNo === '' || this.modalData.partNo == null) { this.$message.warning('请选择物料编码!') return @@ -2738,45 +2739,29 @@ export default { updateBy: this.$store.state.user.name, informationList: this.subDetailList } - if (this.modalData.flag === '1') { - this.saveAllLoading = true - routingManagementSave(tempData).then(({data}) => { - if (data && data.code === 0) { - this.getDataList() - this.modalFlag = false - this.$message({ - message: '操作成功', - type: 'success', - duration: 1500, - onClose: () => {} - }) + this.saveAllLoading = true + routingManagementSave(tempData).then(({data}) => { + if (data && data.code === 0) { + if (isClose) { + this.updateModal(data.rows) } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) - } - this.saveAllLoading = false - }) - } else { - this.saveAllLoading = true - routingManagementEdit(tempData).then(({data}) => { - if (data && data.code === 0) { this.getDataList() this.modalFlag = false - this.$message({ - message: '操作成功', - type: 'success', - duration: 1500, - onClose: () => {} - }) - } else { - this.$alert(data.msg, '错误', { - confirmButtonText: '确定' - }) } - this.saveAllLoading = false - }) - } + this.modalFlag = false + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + this.saveAllLoading = false + }) }, /** @@ -3063,7 +3048,6 @@ export default { } else { this.componentDataSave2(isClose) } - }, componentDataSave2 (isClose) { diff --git a/src/views/modules/part/routing_create.vue b/src/views/modules/part/routing_create.vue new file mode 100644 index 0000000..75fbe30 --- /dev/null +++ b/src/views/modules/part/routing_create.vue @@ -0,0 +1,2528 @@ + + + + +