diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index ce8ded2..94a4386 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -118,3 +118,5 @@ export const submitChange= data => createAPI(`/technicalSpecification/submitChan export const getBMStatusDesc= data => createAPI(`/technicalSpecification/getBMStatusDesc`,'post',data) + +export const getFinalPartData= data => createAPI(`/technicalSpecification/getFinalPartData`,'post',data) diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue index 09a3444..88f19f1 100644 --- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue +++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue @@ -13,14 +13,15 @@ 保存后跳转至详情 - - 项目料号 - - + + + + - - + + 正式料号 + @@ -38,6 +39,8 @@ + + CQC人员 @@ -50,22 +53,29 @@ - - - - Select PE Engineer - - + + - Select Artwork - + Select PE Engineer + - - - PE人员 - + Select Artwork + + + + + + + + + + + + + + CS人员 @@ -231,7 +241,75 @@ + + + + + + + + + + + + + + + + {{'查询'}} + + + + + + + + + + + + + + + @@ -247,6 +325,7 @@ searchTechnicalSpecificationTeamStr, getTestPartChangeData, getProofingDataByUserRole, + getFinalPartData, } from "@/api/sampleManagement/technicalSpecificationList.js" import Chooselist from '@/views/modules/common/Chooselist' import ChooseUser from '@/views/modules/common/ChooseUser' @@ -284,6 +363,8 @@ quotationOfficerList:[], engineerList:[], technicianList:[], + engineerNo:'', + technicianNo:'', oriCodeNo:'', cqcOperator:'', faiOperator:'', @@ -306,6 +387,14 @@ site:this.$store.state.user.site, username:this.$store.state.user.name, }, + partSearch:{ + projectId:'', + finalPartNo:'', + testPartNo:'', + partDesc:'', + site:this.$store.state.user.site, + username:this.$store.state.user.name, + }, quotationOfficerList:[], engineerList:[], technicianList:[], @@ -349,6 +438,8 @@ }, proofingList:[], proofingModelFlag:false, + partList:[], + partModelFlag:false, } }, created () { @@ -378,7 +469,12 @@ if(type==6) { strVal = this.dataForm.mpOperator } - + if(type==7) { + strVal = this.dataForm.engineerNo + } + if(type==8) { + strVal = this.dataForm.technicianNo + } this.$refs.userList.init(this.$store.state.user.site,'%%', strVal) }) }, @@ -427,6 +523,20 @@ // this.$triggerInputEvent(this.$refs.mpOperatorName); // }); } + 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); + // }); + } }, // 获取基础数据列表S getBaseList (val, type) { @@ -598,6 +708,8 @@ mpOperatorName:'', mpOperator:'', oriCodeNo:'', + engineerNo:'', + technicianNo:'', } this.visible = true } @@ -620,6 +732,27 @@ this.proofingModelFlag=true }, + + choosePartModel(){ + this.partSearch={ + projectId:'', + finalPartNo:'', + partDesc:'', + testPartNo:'', + site:this.$store.state.user.site, + username:this.$store.state.user.name, + } + getFinalPartData(this.partSearch).then(({data}) => { + this.partList=data.rows + }) + + this.partModelFlag=true + }, + refreshPartList(){ + getFinalPartData(this.partSearch).then(({data}) => { + this.partList=data.rows + }) + }, refreshProofingList(){ getProofingDataByUserRole(this.proofingSearch).then(({data}) => { this.proofingList=data.rows @@ -643,6 +776,13 @@ this.changeProofingNo(row) }) }, + choosePartNo(row){ + this.dataForm.projectId=row.projectId + this.dataForm.testPartNo=row.testPartNo + this.dataForm.partDesc=row.partDesc + this.dataForm.finalPartNo=row.finalPartNo + this.partModelFlag=false + }, chooseProofingNo(row){ this.dataForm.proofingNo=row.proofingNo this.dataForm.projectId=row.projectId @@ -655,11 +795,9 @@ getTestPartChangeData(inData).then(({data}) => { if (data && data.code === 0) { if(data.row!=null){ - this.dataForm.projectId=data.row.projectId this.dataForm.partDesc=data.row.partDesc this.dataForm.finalPartNo=data.row.finalPartNo }else { - this.dataForm.projectId='' this.dataForm.partDesc='' } @@ -757,6 +895,10 @@ }) return false } + this.dataForm.engineerList = []; + this.dataForm.engineerList.push(this.dataForm.engineerNo); + this.dataForm.technicianList = []; + this.dataForm.technicianList.push(this.dataForm.technicianNo); saveTechnicalSpecificationSheet(this.dataForm).then(({data}) => { if (data && data.code === 0) { this.$message.success( '操作成功') diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue index 8642e5d..1613137 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue @@ -2,7 +2,7 @@
刷新数据 - 保存 + 保存 同意 驳回 @@ -40,22 +40,22 @@
+ + +
- +
- - -
- +
- +
@@ -80,7 +80,7 @@ maxlength="120" show-word-limit :disabled="ifDisableFlag" - style="height: 60px" disabled> + style="height: 60px" >
@@ -96,7 +96,7 @@ maxlength="120" show-word-limit :disabled="ifDisableFlag" - style="height: 60px" disabled> + style="height: 60px" > diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue index 9fc61b1..1793f27 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue @@ -8,9 +8,9 @@ - 更新模板 + 更新模板 刷新数据 - 保存数据 + 保存数据 同意 驳回 diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index aa0ee19..6d5c1a8 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -13,7 +13,7 @@ - 保存 + 保存 同意 驳回 @@ -194,7 +194,7 @@ width="60" label="操作"> 刷新数据 - 保存 + 保存 同意 驳回 @@ -99,6 +99,9 @@ + + +
CQC人员 @@ -111,24 +114,34 @@
- - - -
+
- Select PE Engineer - + Select PE Engineer +
-
+
- Select Artwork - + Select Artwork +
- + + + + + + + + + + + + + + + -
PE人员 @@ -323,6 +336,8 @@ csOperaterName:'', dccOperater:'', dccOperaterName:'', + engineerNo:'', + technicianNo:'', }, dataRole: { partTypeDesc: [ @@ -372,7 +387,12 @@ if(type==6) { strVal = this.dataForm.mpOperator } - + if(type==7) { + strVal = this.dataForm.engineerNo + } + if(type==8) { + strVal = this.dataForm.technicianNo + } this.$refs.baseList.init(this.searchData.site,this.searchData.buNo, strVal) }) }, @@ -421,6 +441,20 @@ this.$triggerInputEvent(this.$refs.mpOperatorName); }); } + 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); + // }); + } }, //初始化组件的参数 init(inData) { @@ -617,6 +651,10 @@ this.technicianFlag=false }, saveData(){ + this.dataForm.engineerList = []; + this.dataForm.engineerList.push(this.dataForm.engineerNo); + this.dataForm.technicianList = []; + this.dataForm.technicianList.push(this.dataForm.technicianNo); this.$confirm("是否保存基本信息？", '保存提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 26cd272..3d320e5 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -8,7 +8,7 @@ - 测试料号 + 正式料号 @@ -65,8 +65,9 @@ label="操作">