diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue index a6cb6dd..26b7828 100644 --- a/src/views/business/comps/template/TemplateTable.vue +++ b/src/views/business/comps/template/TemplateTable.vue @@ -7,7 +7,7 @@ - + @@ -244,8 +244,6 @@ export default { currentEditSignUuid: null, // 当前请求EditSign的HandleFormItem的uuid latestParams: {},//用于存储最新的params hasCustomTable: false,//是否有自定义表格 - - selectedCode:'bh' }; }, created() { @@ -271,10 +269,6 @@ export default { }) //选择试剂/供试品/给药制剂弹窗 EventBus.$on("showSelectMixReagentDialog", (data) => { - debugger - if(data.type==15){ - this.selectedCode = 'id' - } this.$refs.selectMixReagentDialogRef.show(data.studyFormId, data,this.templateData.studyId) }) EventBus.$on("hideSelectMixReagentDialog", (data) => { diff --git a/src/views/business/comps/template/comps/yp/YP002.vue b/src/views/business/comps/template/comps/yp/YP002.vue index ca5b926..167ce50 100644 --- a/src/views/business/comps/template/comps/yp/YP002.vue +++ b/src/views/business/comps/template/comps/yp/YP002.vue @@ -10,8 +10,7 @@ + /> @@ -192,14 +191,7 @@ export default { this.yqResourceTmp = [] return this.resourceTmp; }, - onRegentSubmit(val,val1,val2){ - debugger - this.$refs.swypyjInfoRef.updateFormData("qxbd", val.selectInfo.row.bdmc); - }, - beforeReagentSubmit(val,val1,val2){ - debugger - this.$refs.swypyjInfoRef.updateFormData("qxbd", val.selectData.row.bdmc); - }, + //保存 async onSave() { const formData = this.getStepResource(); diff --git a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue index bad6815..f45e838 100644 --- a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue +++ b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue @@ -76,17 +76,13 @@ export default { type: String, default: "", }, - - selectedCode: { - type: String, - default: "bh", - }, }, data() { return { visible: false, otherChecked: false, selectedId: "", + selectedCode: "bh", currentRow: {}, radio: 1, bzList: [], @@ -101,7 +97,8 @@ export default { sourceFrom: "step",//来源 otherReagent: "",//其他试剂 mixType: false,//是否是混合试剂 - title:"选择试剂" + title:"选择试剂", + currentType: '1',//当前选择的类型 } }, computed: { @@ -119,6 +116,10 @@ export default { } //type:sj(试剂列表)gsp(供试品列表)gyzj(给药制剂列表) const { type, sourceFrom = "step", mixType = false } = data; + this.currentType = type; + if(type==15){ + this.selectedCode = 'id' + } this.mixType = mixType; this.sourceFrom = sourceFrom; this.studyFormId = studyFormId; @@ -175,6 +176,9 @@ export default { // 选择试剂时处理 handleSelect(code, row) { this.selectedId = code; + if(this.currentType==15){//如果是前序表单,那么选中的id是bdmc + this.selectedId = row.bdmc + } this.currentRow = row; }, }