diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index 9c192eb..50e9835 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -129,9 +129,11 @@ export default { resource: [], //试验试剂信息 resourceWz: [], //物资信息 yqResource: [], //仪器信息 + jcbList: [], //检测板信息 resourceTmp:[],//试验试剂信息提交用 yqResourceTmp: [], //仪器信息提交用 + jcbListTmp: [], //检测板信息提交用 sysjColumns: [ { label: 'template.common.reagentName', prop: "mc" },//名称 { label: 'template.common.reagentCode', prop: "bh" },//编号 @@ -235,6 +237,9 @@ export default { getYqResource() { return this.yqResourceTmp }, + getJcbList() { + return this.jcbListTmp + }, //根据ref数组获取直接formData getFilledFormDataByRefs(refArr = []) { let result = {} diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue index 067cccd..05b85fc 100644 --- a/src/views/business/study/comp/tbbd/Bj.vue +++ b/src/views/business/study/comp/tbbd/Bj.vue @@ -417,6 +417,7 @@ export default { bdnr: '', resource: '', yqResource: '', + jcbList:'', qmrmm: '', sfcz: false, czfs: '', @@ -445,6 +446,7 @@ export default { resourceYj: [], resource: [], yqResource: [], + jcbList:[], bdmbTitle: this.$t('page.business.form.bdmb'), rulesApprove: { qmrmm: [{ @@ -644,6 +646,7 @@ export default { that.formApprove.bdnr = JSON.stringify(content) that.resource = that.$refs.templateTable.getResource() that.yqResource = that.$refs.templateTable.getYqResource() + that.jcbList = that.$refs.templateTable.getJcbList() that.openApprove = true } }, @@ -827,7 +830,6 @@ export default { } } that.$modal.loading() - debugger that.formYjcc.resource = JSON.stringify(that.resourceYj) that.formYjcc.cclist = JSON.stringify(that.cclistYj) studyFormFill_yjcc(that.formYjcc).then(response => { @@ -848,6 +850,7 @@ export default { that.$modal.loading() that.formApprove.resource = JSON.stringify(that.resource) that.formApprove.yqResource = JSON.stringify(that.yqResource) + that.formApprove.jcbList = JSON.stringify(that.jcbList) if (that.czlist.length > 0) { that.formApprove.czlist = JSON.stringify(that.czlist) }