diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue index fc94084..2a57e7f 100644 --- a/src/components/Template/CustomTable.vue +++ b/src/components/Template/CustomTable.vue @@ -766,6 +766,9 @@ export default { if (col.qxbdType) { item.qxbdType = col.qxbdType; } + if (col.regentFillType) { + item.regentFillType = col.regentFillType; + } if (col.checkType) { item.checkType = col.checkType; } diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue index 38e8739..af4fb14 100644 --- a/src/components/Template/HandleFormItem.vue +++ b/src/components/Template/HandleFormItem.vue @@ -597,9 +597,11 @@ export default { }, //统一处理试剂/供试品等弹窗 onCommonHandleRegent(item, type) { - if (this.templateFillType !== 'actFill') { + const {regentFillType = "actFill"} = item; + if (this.templateFillType !== regentFillType) { return } + this.handleRegentDialog(item, type); let params = { studyFormId: this.templateData.id, uuid: this.uuid, diff --git a/src/components/Template/mixins/formPackageMixins.js b/src/components/Template/mixins/formPackageMixins.js index 9298984..7e67838 100644 --- a/src/components/Template/mixins/formPackageMixins.js +++ b/src/components/Template/mixins/formPackageMixins.js @@ -76,6 +76,7 @@ export default { filledCodes: item.filledCodes, qxbdType: item.qxbdType, checkType: item.checkType, + regentFillType: item.regentFillType, } },