diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue index 2be1e95..f958301 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue @@ -64,16 +64,6 @@ - - - - - - - - - - @@ -182,14 +172,6 @@ - - - - - - - -
@@ -202,30 +184,6 @@
- - - - - - - - - - - - - - - - - - - - - - - -
@@ -416,7 +374,7 @@
- +
设计制图人员/Artwork @@ -425,6 +383,15 @@
+ +
+ + 质量工程师/CQE + 质量工程师/CQE + + +
+
@@ -1136,6 +1103,7 @@ quotationOfficerList: [], engineerList: [], technicianList: [], + qualityEngineerList: [], spForm: { sp:'', nodeName:'', @@ -1190,6 +1158,7 @@ cqcOperatorList: [], faiOperatorList: [], planOperatorList: [], + qualityEngineerList: [], dccList: '', ecnNeedChangeDrawing: '', documentSource: '', @@ -1197,6 +1166,8 @@ shopOrder: '', planOperator: '', planOperatorName: '', + qualityEngineerNo: '', + qualityEngineer: '' }, dataForm2: { stage: '', @@ -1213,7 +1184,8 @@ planOperatorList: [], cqcOperatorList: [], faiOperatorList: [], - dccList: [] + dccList: [], + qualityEngineerList: [] }, dataEntryForm: { remarkPage: '', @@ -1259,42 +1231,43 @@ // 获取基础数据列表S getBaseList (type) { - // if (this.ifDisableFlag) { - // return false - // } this.tagNo1 = type this.$nextTick(() => { let strVal = '' let roleId = '' - if(type === 1) { - strVal = this.dataForm.cqcOperator - roleId = 'R008' - } - if(type === 2) { - strVal = this.dataForm.faiOperator - roleId = 'R009' - } - if(type === 4) { - strVal = this.dataForm.csOperater - roleId = 'R010' - } - if(type === 6) { - strVal = this.dataForm.mpOperator - roleId = 'R021' - } - if(type === 7) { - strVal = this.dataForm.engineerNo - roleId = 'R004' - } - if(type === 8) { - strVal = this.dataForm.technicianNo - roleId = 'R014' - } - if(type === 9) { - strVal = this.dataForm.planOperator - roleId = 'R023' - } - this.$refs.baseList.init(this.searchData.site,this.searchData.buNo, strVal,roleId) + if(type === 1) { + strVal = this.dataForm.cqcOperator + roleId = 'R008' + } + if(type === 2) { + strVal = this.dataForm.faiOperator + roleId = 'R009' + } + if(type === 4) { + strVal = this.dataForm.csOperater + roleId = 'R010' + } + if(type === 6) { + strVal = this.dataForm.mpOperator + roleId = 'R021' + } + if(type === 7) { + strVal = this.dataForm.engineerNo + roleId = 'R004' + } + if(type === 8) { + strVal = this.dataForm.technicianNo + roleId = 'R014' + } + if(type === 9) { + strVal = this.dataForm.planOperator + roleId = 'R023' + } + if(type === 10) { + strVal = this.dataForm.qualityEngineerNo + roleId = 'R024' + } + this.$refs.baseList.init(this.searchData.site, this.searchData.buNo, strVal, roleId) }) }, @@ -1345,16 +1318,10 @@ if (this.tagNo1 === 7) { this.dataForm.engineerNo = val.username this.dataForm.engineer = val.userDisplay - // this.$nextTick(() => { - // this.$triggerInputEvent(this.$refs.mpOperatorName); - // }); } if (this.tagNo1 === 8) { this.dataForm.technicianNo = val.username this.dataForm.technician = val.userDisplay - // this.$nextTick(() => { - // this.$triggerInputEvent(this.$refs.mpOperatorName); - // }); } if (this.tagNo1 === 9) { this.dataForm.planOperator = val.username @@ -1363,6 +1330,11 @@ this.$triggerInputEvent(this.$refs.planOperatorName); }) } + if (this.tagNo1 === 10) { + this.dataForm.qualityEngineerNo = val.username + this.dataForm.qualityEngineer = val.userDisplay + this.$forceUpdate(); // 强制组件重新渲染 + } }, // 初始化组件的参数 @@ -1433,6 +1405,16 @@ searchTechnicalSpecificationTeamStr(inData3).then(({data}) => { this.dataForm.technicianList = data.rows }) + if (this.searchData.buNo === 'RDC') { + let inData7 = { + site: this.dataForm.site, + codeNo: this.dataForm.codeNo, + type: 'qualityEngineer', + } + searchTechnicalSpecificationTeamStr(inData7).then(({data}) => { + this.dataForm.qualityEngineerList = data.rows + }) + } let inData4 = { site: data.row.site, productNo: data.row.finalPartNo, @@ -1540,6 +1522,16 @@ searchTechnicalSpecificationTeamStr(inData3).then(({data}) => { this.dataForm.technicianList = data.rows }) + if (this.searchData.buNo === 'RDC') { + let inData7 = { + site: this.dataForm.site, + codeNo: this.dataForm.codeNo, + type: 'qualityEngineer', + } + searchTechnicalSpecificationTeamStr(inData7).then(({data}) => { + this.dataForm.qualityEngineerList = data.rows + }) + } let inData4 = { site: data.row.site, productNo: data.row.finalPartNo, @@ -1699,6 +1691,10 @@ if (this.dataForm.planOperator !== '') { this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner } + this.dataForm.qualityEngineerList = [] + if (this.dataForm.qualityEngineerNo !== '') { + this.dataForm.qualityEngineerList.push(this.dataForm.qualityEngineerNo) // CQE + } this.$confirm("是否保存基本信息?", '保存提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -1733,6 +1729,10 @@ if (this.dataForm.planOperator !== '') { this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner } + this.dataForm.qualityEngineerList = [] + if (this.dataForm.qualityEngineerNo !== '') { + this.dataForm.qualityEngineerList.push(this.dataForm.qualityEngineerNo) // CQE + } updateBMBasicInformation(this.dataForm).then(({data}) => { if (data && data.code === 0) { this.$message.success( '操作成功') @@ -1826,6 +1826,10 @@ if (this.dataForm.planOperator !== '') { this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner } + this.dataForm.qualityEngineerList = [] + if (this.dataForm.qualityEngineerNo !== '') { + this.dataForm.qualityEngineerList.push(this.dataForm.qualityEngineerNo) // CQE + } let tempData = { ...this.dataForm, site: this.searchData.site, @@ -1861,6 +1865,10 @@ if (this.dataForm.planOperator !== '') { this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner } + this.dataForm.qualityEngineerList = [] + if (this.dataForm.qualityEngineerNo !== '') { + this.dataForm.qualityEngineerList.push(this.dataForm.qualityEngineerNo) // CQE + } let tempData = { ...this.dataForm, site: this.searchData.site, @@ -1917,6 +1925,10 @@ if (this.dataForm.planOperator !== '') { this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner } + this.dataForm.qualityEngineerList = [] + if (this.dataForm.qualityEngineerNo !== '') { + this.dataForm.qualityEngineerList.push(this.dataForm.qualityEngineerNo) // CQE + } let tempData = { ...this.dataForm, site: this.searchData.site, diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index e46f461..aabec97 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -215,28 +215,35 @@
- +
- +
- +
- + + +
+
+ +
+ +
- +
@@ -245,28 +252,28 @@
- +
- +
- +
- +