diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index 9adc92d..07b8147 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -502,7 +502,7 @@ - + @@ -527,10 +527,10 @@ - + - + @@ -844,7 +844,7 @@ - + @@ -2605,6 +2605,16 @@ export default { }, // js methods: { + validateInput (value) { + // 使用正则表达式检查是否为科学计数法 + if (/e/i.test(value.toString())) { + // 如果是科学计数法,则恢复到之前的值 + this.$nextTick(() => { + this.componentData.componentScrap = '' + }) + } + }, + // === 报价查询 === handleQueryBomByQuote(){ let params = { @@ -4007,6 +4017,7 @@ export default { this.saveHeaderLoading = false }) }, + /** * 复制bom的模态框 */ @@ -4015,7 +4026,7 @@ export default { site: this.modalData.site, partNo: this.modalData.partNo, partDesc: this.modalData.partDesc, - engChgLevel: this.modalData.engChgLevel + 1, + engChgLevel: '', bomType: this.modalData.bomType, effPhaseInDate: this.dayjs(new Date()).format('YYYY-MM-DD'), effPhaseOutDate: '', @@ -4023,6 +4034,12 @@ export default { createBy: this.$store.state.user.name, officialFlag: 'N' } + // 获取物料的bom版本号 + getBomEngChgLevel(this.copyBomData).then(({data}) => { + if (data && data.code === 0) { + this.copyBomData.engChgLevel = data.engChgLevel + } + }) this.copyPartData = { type: '1', site: this.$store.state.user.site, diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue index 09db23c..9519999 100644 --- a/src/views/modules/part/routingManagement.vue +++ b/src/views/modules/part/routingManagement.vue @@ -678,7 +678,7 @@ - + @@ -2727,7 +2727,6 @@ export default { }) }, - // ======== 页签切换相关方法 ======== /** * 明细页签选择替换 @@ -3721,7 +3720,7 @@ export default { site: this.modalData.site, partNo: this.modalData.partNo, partDesc: this.modalData.partDesc, - routingRevision: this.modalData.routingRevision + 1, + routingRevision: '', routingType: this.modalData.routingType, phaseInDate: this.dayjs(new Date()).format('YYYY-MM-DD'), phaseOutDate: '', @@ -3729,6 +3728,12 @@ export default { createBy: this.$store.state.user.name, officialFlag: 'N' } + // 获取物料的routing版本号 + getRottingRevision(this.copyRoutingData).then(({data}) => { + if (data && data.code === 0) { + this.copyRoutingData.routingRevision = data.routingRevision + } + }) this.copyPartData = { type: '1', site: this.$store.state.user.site, 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 bd04c83..b272ef6 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -191,7 +191,7 @@ - + 属性模板 @@ -1947,10 +1947,10 @@ this.$message.warning('请选择计量单位!') return } - if (this.modalData.codeNo === '' || this.modalData.codeNo == null) { - this.$message.warning('请选择属性模板!') - return - } + // if (this.modalData.codeNo === '' || this.modalData.codeNo == null) { + // this.$message.warning('请选择属性模板!') + // return + // } if (this.modalData.buNo === '' || this.modalData.buNo == null) { this.$message.warning('请选择BU!') return