diff --git a/src/views/business/comps/template/comps/gy/MJYLQSQD.vue b/src/views/business/comps/template/comps/gy/MJYLQSQD.vue index 71ce077..02508bb 100644 --- a/src/views/business/comps/template/comps/gy/MJYLQSQD.vue +++ b/src/views/business/comps/template/comps/gy/MJYLQSQD.vue @@ -104,7 +104,6 @@ export default { label: "SD/部长", type: "input", fillType: "actFill", - disabled: true, }, sywzmc: { label: "试验物质名称", @@ -177,7 +176,7 @@ export default { data() { return { syId:null, - depId:null, + bmId:null, sdId:null, public_studyList:public_studyList, searchForm: { @@ -219,13 +218,27 @@ export default { }, methods: { onDialogSubmit(selectedId,currentRow){ - this.$refs.baseInfoRef.batchUpdateFormData({ - syNo: currentRow.sn, - SD: currentRow.leaderName, - }); - // this.syId='' todo - // this.depId='' - // this.sdId='' + console.log(JSON.stringify(currentRow)) + //试验 + if(currentRow.type==1){ + this.$refs.baseInfoRef.batchUpdateFormData({ + syNo: currentRow.sn, + SD: currentRow.leaderName, + }); + this.syId=currentRow.id + this.bmId=currentRow.deptId + this.sdId=currentRow.leader + } + //部门 + if(currentRow.type==2){ + this.$refs.baseInfoRef.batchUpdateFormData({ + syNo: currentRow.deptName, + SD: currentRow.nickName, + }); + this.syId='' + this.bmId=currentRow.deptId + this.sdId=currentRow.userId + } console.log(currentRow,"currentRow") this.$refs.selectReagentDialogRef.onCancel() }, @@ -241,7 +254,7 @@ export default { async getFormData() { let content = await this.validFormFields(["baseInfoRef","remarkRef"]); content.syId=this.syId - content.depId=this.depId + content.bmId=this.bmId content.sdId=this.sdId return content; }, diff --git a/src/views/business/comps/template/dialog/SelectReagentDialog.vue b/src/views/business/comps/template/dialog/SelectReagentDialog.vue index f4e77ac..ba36ea6 100644 --- a/src/views/business/comps/template/dialog/SelectReagentDialog.vue +++ b/src/views/business/comps/template/dialog/SelectReagentDialog.vue @@ -157,10 +157,12 @@ export default { if(this.type === 'MJYLQSQD') { if(this.radio === 1) { row = row; + row.type=this.radio }else{ const o = this.bzList.find(item => item.deptId == this.depart); if(o){ row = o; + row.type=this.radio }else{ this.$message.error(`该部门没有设置部长!`) return diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue index 48cdaab..54c0653 100644 --- a/src/views/business/study/comp/sqbd/Bj.vue +++ b/src/views/business/study/comp/sqbd/Bj.vue @@ -127,7 +127,7 @@