diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue index e2b4e77..faae5ea 100644 --- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue @@ -541,6 +541,7 @@ export default { const { actVol, actNd } = this.updateSjmbrynd(item, row.nd); item.actSolutionVolume = actVol; item.actSolutionConcentration = actNd; + item.actSolutionExpire = row.sxr; } // 更新stepTableRef组件的数据 @@ -550,7 +551,9 @@ export default { let content = await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"]); //生成resource let tmpResource = [] + debugger if (this.fillType === "actFill") { + //生成 let tableList = content.stepTableFormData if (tableList && tableList.length > 0) { for (let i = 0; i < tableList.length; i++) { @@ -595,6 +598,8 @@ export default { } } } + //使用 + } this.resourceTmp = tmpResource diff --git a/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue index ee387e2..b3443af 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue @@ -240,20 +240,6 @@ export default { return { resource: [], resourceData1: [], - sysjColumns: [ - { label: 'template.common.reagentName', prop: "mc" },//名称 - { label: 'template.common.reagentCode', prop: "bh" },//编号 - { label: 'template.common.reagentNo', prop: "ph" },//批号 试剂,供试品才有 - { label: 'template.common.concentration', prop: "nd" },//浓度 - { label: 'template.common.source', prop: "source" },//来源 - { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 - ], - yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, - ], formData: {} }; }, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue index 4071503..8d2924a 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue @@ -236,24 +236,8 @@ export default { data() { return { reagentType: "",//本表单特殊字段:选择试剂的类型1选择基质,2表格里面选择试剂 - currentSubKey: "",//当前点击的子项key rowIndex:0,//当前表格点击的行数 - - sysjColumns: [ - { label: 'template.common.reagentName', prop: "mc" },//名称 - { label: 'template.common.reagentCode', prop: "bh" },//编号 - { label: 'template.common.reagentNo', prop: "ph" },//批号 试剂,供试品才有 - { label: 'template.common.concentration', prop: "nd" },//浓度 - { label: 'template.common.source', prop: "source" },//来源 - { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 - ], - yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, - ], formData: {} }; }, diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index 54d3ebc..e829441 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -128,10 +128,10 @@ export default { { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 ], yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, + { label: 'template.common.instrumentName', prop: "mc" },//仪器名称 + { label: 'template.common.instrumentModel', prop: "xh" },//仪器型号 + { label: 'template.common.instrumentCode', prop: "bh" },//仪器编号 + { label: 'template.common.nextTestDate', prop: "jzrq" },//下次测试/校准/检定日期 ], } },