diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index 886e536..1a2cd09 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -1201,14 +1201,14 @@ - -
+ +
Part No To Copy From Part - - + + @@ -1216,8 +1216,8 @@ - - + + @@ -1229,15 +1229,22 @@ To Part Next Part No - - + + + + + + + + +
-
+
Select Part Information to Copy @@ -1305,7 +1312,7 @@
- + 保存 关闭 @@ -1740,7 +1747,10 @@ fromPartSite: '', fromPartNo: '', fromPartDesc: '', - copyFlag: '' + copyFlag: '', + buNo: '', + buDesc: '', + customerPartNo: '', }, fromPartData: { site: this.$store.state.user.site, @@ -4980,7 +4990,19 @@ fromPartSite: this.modalData.site, fromPartNo: '', fromPartDesc: '', - copyFlag: '' + 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 = '' + } + }) } if (this.modalData.flag !== '3') { this.copyPartData.fromPartNo = this.modalData.partNo @@ -5014,6 +5036,16 @@ if (this.modalData.flag === '3') { // 转正里的copyPart this.copyPartData.copyFlag = 'Y' } + // if (this.modalData.flag === '2') { + // if (this.copyPartData.buNo === '' || this.copyPartData.buNo == null) { + // this.$message.warning('请选择BU!') + // return + // } + // if (this.copyPartData.customerPartNo === '' || this.copyPartData.customerPartNo == null) { + // this.$message.warning('请填写客户料号!') + // return + // } + // } this.copyLoading = true copyPart(this.copyPartData).then(({data}) => { if (data && data.code === 0) { @@ -5651,6 +5683,8 @@ strVal = this.modalData.partCostGroupId } else if (val === 132) { strVal = this.modalData.planningMethod + } else if (val === 106) { + strVal = this.copyPartData.buNo } this.$refs.baseList.init(val, strVal) }) @@ -5713,6 +5747,9 @@ } else if (this.tagNo === 132) { this.modalData.planningMethod = val.planning_method this.modalData.planningMethodDesc = val.planning_method_desc + } else if (this.tagNo === 106) { + this.copyPartData.buNo = val.Bu_no + this.copyPartData.buDesc = val.Bu_desc } }, 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 e9ed8ac..1a9a766 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -1861,7 +1861,7 @@ import { if (val === 1007) { strVal = this.modalData.umId } else if (val === 106) { - strVal = this.modalData.buNo; + strVal = this.modalData.buNo } else if (val === 108) { strVal = this.modalData.familyId } else if (val === 109) {