From e731ecf731df888a992ae55a831880a4a727837f Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 30 Oct 2024 17:02:18 +0800 Subject: [PATCH] =?UTF-8?q?2024-10-30=20=E7=89=A9=E6=96=99=E4=BB=B6?= =?UTF-8?q?=E5=92=8C=E5=BA=93=E5=AD=98=E4=BB=B6=E7=9A=84IFS=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/part/bomManagement.vue | 62 +++++++++---------- .../modules/part/partCatalogInformation.vue | 21 ++++--- src/views/modules/part/partInformation.vue | 12 ++-- src/views/modules/part/routingManagement.vue | 24 +++---- 4 files changed, 65 insertions(+), 54 deletions(-) diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index 153dd96..8ad7fbd 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -2672,7 +2672,7 @@ export default { sizeChangeHandle3 (val) { this.pageSize3 = val this.pageIndex3 = 1 - this.queryComponentPartModal() + this.queryComponentPartList() }, /** @@ -2681,7 +2681,7 @@ export default { */ currentChangeHandle3 (val) { this.pageIndex3 = val - this.queryComponentPartModal() + this.queryComponentPartList() }, /** @@ -3020,10 +3020,10 @@ export default { this.$message.warning('请先选择替代！') return } - if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { - 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, @@ -3071,10 +3071,10 @@ export default { this.$message.warning('请先选择替代！') return } - if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { - 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, @@ -3118,10 +3118,10 @@ export default { * 子明细编辑模态框 */ updateComponentModal (row) { - if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { - this.$message.warning('不可编辑的替代状态!') - return - } + // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { + // this.$message.warning('不可编辑的替代状态!') + // return + // } this.componentData = { flag: '2', site: row.site, @@ -3155,10 +3155,10 @@ export default { * 副产品编辑模态框 */ updateByProductModal (row) { - if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { - this.$message.warning('不可编辑的替代状态!') - return - } + // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { + // this.$message.warning('不可编辑的替代状态!') + // return + // } this.componentData = { flag: '2', site: row.site, @@ -3191,10 +3191,10 @@ export default { * 副产品成本分配编辑模态框 */ updateManufStructCostDistribModal (row) { - if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { - this.$message.warning('不可编辑的替代状态!') - return - } + // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { + // this.$message.warning('不可编辑的替代状态!') + // return + // } this.manufStructCostDistribData = { site: row.site, partNo: row.partNo, @@ -3585,7 +3585,7 @@ export default { this.componentPartData.limit = this.pageSize3 this.componentPartData.page = this.pageIndex3 // 查询所有物料 - queryPartList(this.componentPartData).then(({data}) => { + queryPartListAll(this.componentPartData).then(({data}) => { if (data && data.code === 0) { this.componentPartList = data.page.list this.pageIndex3 = data.page.currPage @@ -3708,10 +3708,10 @@ export default { * 删除子物料 */ deleteComponentPart () { - if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { - this.$message.warning('不可编辑的替代状态!') - return - } + // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { + // this.$message.warning('不可编辑的替代状态!') + // return + // } if (this.checkedDetail.length === 0) { this.$message.warning('请选择要删除子物料！') return @@ -3751,10 +3751,10 @@ export default { * 删除子物料 */ deleteByProduct () { - if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { - this.$message.warning('不可编辑的替代状态!') - return - } + // 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 diff --git a/src/views/modules/part/partCatalogInformation.vue b/src/views/modules/part/partCatalogInformation.vue index ab1b833..18580bb 100644 --- a/src/views/modules/part/partCatalogInformation.vue +++ b/src/views/modules/part/partCatalogInformation.vue @@ -524,7 +524,7 @@ itemDesc: '', textValue: '', numValue: '', - recordType: 'IP' + recordType: 'MP' }, // ======== 数据列表 ======== dataList: [], @@ -1185,9 +1185,16 @@ if (data && data.code === 0) { this.getMasterPartItem() this.attributeDialog = true - this.$message.success(data.msg) + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) } else { - this.$message.warning(data.msg) + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) } this.loading = false }).catch((error) => { @@ -1212,7 +1219,7 @@ site: this.$store.state.user.site, partNo: this.partCurrentRow.partNo, codeNo: this.partCurrentRow.codeNo, - recordType: 'IP' + recordType: 'MP' } getItemLists(tempData).then(({data}) => { this.itemList1 = data.rows.row1 @@ -1245,7 +1252,7 @@ partNo: this.partCurrentRow.partNo, codeNo: this.partCurrentRow.codeNo, codeDesc: this.partCurrentRow.codeDesc, - recordType: 'IP', + recordType: 'MP', itemList: this.itemSelections1 } addMasterPartItem(inData).then(({data}) => { @@ -1276,7 +1283,7 @@ partNo: this.partCurrentRow.partNo, codeNo: this.partCurrentRow.codeNo, codeDesc: this.partCurrentRow.codeDesc, - recordType: 'IP', + recordType: 'MP', itemList: this.itemSelections2 } deleteMasterPartItem(inData).then(({data}) => { @@ -1398,7 +1405,7 @@ site: this.$store.state.user.site, partNo: this.partCurrentRow.partNo, codeNo: this.partCurrentRow.codeNo, - recordType: 'IP' + recordType: 'MP' } getMasterPartItem(tempData).then(({data}) => { if (data && data.code === 0) { diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index c63986a..ba7199b 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -4607,10 +4607,6 @@ // this.$message.warning('请选择属性模板！') // return // } - if (this.modalData.flag === '3' && (this.modalData.planningMethod == null || this.modalData.planningMethod === '')) { - this.$message.warning('请选择计划方法！') - return - } if (this.modalData.flag === '1') { this.saveLoading = true partInformationSave(this.modalData).then(({data}) => { @@ -4641,6 +4637,14 @@ this.$message.warning('IFS物料编码不能等于PLM物料编码！') return } + if (this.modalData.planningMethod == null || this.modalData.planningMethod === '') { + this.$message.warning('请选择计划方法！') + return + } + if (this.modalData.productGroupId3 == null || this.modalData.productGroupId3 === '') { + this.$message.warning('请选择会计组！') + return + } this.saveLoading = true this.modalData.bomAlternativeList = this.bomAlternativeSelections this.modalData.routingAlternativeList = this.routingAlternativeSelections diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue index 71c8da5..09db23c 100644 --- a/src/views/modules/part/routingManagement.vue +++ b/src/views/modules/part/routingManagement.vue @@ -3035,10 +3035,10 @@ export default { this.$message.warning('请先选择替代！') return } - if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { - 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, @@ -3090,10 +3090,10 @@ export default { * 编辑模态框 */ updateComponentModal (row) { - if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { - this.$message.warning('不可编辑的替代状态!') - return - } + // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { + // this.$message.warning('不可编辑的替代状态!') + // return + // } this.componentData = { flag: '2', site: row.site, @@ -3486,10 +3486,10 @@ export default { * 删除子物料 */ deleteComponentPart () { - if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { - this.$message.warning('不可编辑的替代状态!') - return - } + // if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { + // this.$message.warning('不可编辑的替代状态!') + // return + // } if (this.checkedDetail.length === 0) { this.$message.warning('请选择要删除子物料！') return