diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index 99d8ab1..ae6b03b 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -1274,9 +1274,9 @@ - + @@ -1834,6 +1834,8 @@ fromPartSite: '', fromPartNo: '', fromPartDesc: '', + fromPartStatus: '', + partNoAutoGenerated: '', copyFlag: '', buNo: '', buDesc: '', @@ -5304,6 +5306,19 @@ this.copyFlag2 = true }, + // 获取复制物料时系统自动生成编码 + setCopyPartAutoPartNo () { + getProjectPartNo(this.searchData).then(({data}) => { + if (data && data.code === 0) { + this.copyPartData.partNo = data.partNo + this.copyPartData.partNoAutoGenerated = data.partNo + } else { + this.copyPartData.partNo = '' + this.copyPartData.partNoAutoGenerated = '' + } + }) + }, + // 复制物料的模态框 toCopyPartModal () { this.copyPartData = { @@ -5329,23 +5344,22 @@ fromPartSite: this.modalData.site, fromPartNo: '', fromPartDesc: '', + fromPartStatus: this.modalData.flag === '3' ? '' : this.modalData.status, + partNoAutoGenerated: '', copyFlag: '', buNo: '', buDesc: '', customerPartNo: '', } if (this.modalData.flag === '2') { - getProjectPartNo(this.searchData).then(({data}) => { - if (data && data.code === 0) { - this.copyPartData.partNo = data.partNo - } else { - this.copyPartData.partNo = '' - } - }) + this.setCopyPartAutoPartNo() } if (this.modalData.flag !== '3') { this.copyPartData.fromPartNo = this.modalData.partNo this.copyPartData.fromPartDesc = this.modalData.partDesc + if (this.copyPartData.fromPartStatus !== 'Y') { + this.copyPartData.partNo = '' + } } this.copyPartModelFlag = true }, @@ -5365,6 +5379,13 @@ // 1 去除隐藏空格 partNo = partNo.replace(/[\s\u00A0\u3000\u200B]/g, '') + if (this.copyPartData.fromPartStatus && this.copyPartData.fromPartStatus !== 'Y') { + if (!this.copyPartData.partNoAutoGenerated || partNo !== this.copyPartData.partNoAutoGenerated) { + this.$message.warning('From Part 为临时物料时,To Part 编码只能使用系统自动生成值!') + return + } + } + // 2 判断是否为空 if (!partNo) { this.$message.warning('请填写物料编码!') @@ -5842,10 +5863,15 @@ // 下一个物料编码 nextPartNo2 () { + if (this.copyPartData.fromPartStatus && this.copyPartData.fromPartStatus !== 'Y') { + this.$message.warning('From Part 为临时物料时,To Part 编码由系统自动生成,不能使用 Next Part No!') + return + } this.copyPartData.ifsPartNo = this.copyPartData.partNo getNextPartNo(this.copyPartData).then(({data}) => { if (data && data.code === 0) { this.copyPartData.partNo = data.rows + this.copyPartData.partNoAutoGenerated = data.rows } }) }, @@ -5896,6 +5922,12 @@ getFromRowData (row) { this.copyPartData.fromPartNo = row.partNo this.copyPartData.fromPartDesc = row.partDesc + this.copyPartData.fromPartStatus = row.status || 'Y' + this.copyPartData.partNoAutoGenerated = '' + if (this.copyPartData.fromPartStatus !== 'Y') { + this.copyPartData.partNo = '' + this.setCopyPartAutoPartNo() + } this.fromPartModelFlag = false },