diff --git a/src/lang/en/template/sp.js b/src/lang/en/template/sp.js index 1f826d4..36113d4 100644 --- a/src/lang/en/template/sp.js +++ b/src/lang/en/template/sp.js @@ -17,6 +17,23 @@ export default { sjjzxql: 'Actual Blank Substrate Extraction Volume', hhwznd: 'Target Solution Concentration' }, + // 生物样品分析方法学样品制备表-Recovery + sp009: { + title: + 'Bioanalytical Methods Sample Preparation Record (Recovery)', + clpbh: 'Analysis Batch Number', + rqcz: 'Container Material', + clsj: 'Work Time', + xzjz: 'Select substrate', + bh: 'Serial Number', + ysry: 'Preset solution', + sjry: 'Actual solution', + yjryxql: 'Expected Solution Extraction Volume', + sjryxql: 'Actual Solution Extraction Volume', + yjjzxql: 'Expected Blank Substrate Extraction Volume', + sjjzxql: 'Actual Blank Substrate Extraction Volume', + hhwznd: 'Target Solution Concentration' + }, //生物样品分析方法学样品制备表(全血稳定) sp010: { title: @@ -29,5 +46,6 @@ export default { xzxsy: 'Select Diluent', yjxsyxql: 'Expected Blank Diluent Extraction Volume', sjxsyxql: 'Actual Blank Diluent Extraction Volume' - } + }, + } diff --git a/src/lang/zh/template/sp.js b/src/lang/zh/template/sp.js index ddb6358..10ecede 100644 --- a/src/lang/zh/template/sp.js +++ b/src/lang/zh/template/sp.js @@ -16,6 +16,22 @@ export default { sjjzxql: '实际基质吸取量', hhwznd: '化合物终浓度' }, + // 生物样品分析方法学样品制备表-Recovery + sp009: { + title: '生物样品分析方法学样品制备表(Recovery)', + clpbh: '处理批编号', + rqcz: '容器材质', + clsj: '处理时间', + xzjz: '选择基质', + bh: '编号', + ysry: '预设溶液', + sjry: '实际溶液', + yjryxql: '预计溶液吸取量', + sjryxql: '实际溶液吸取量', + yjjzxql: '预计基质吸取量', + sjjzxql: '实际基质吸取量', + hhwznd: '化合物终浓度' + }, //生物样品分析方法学样品制备表(全血稳定) sp010: { title: '生物样品分析方法学样品制备表(全血稳定)' @@ -26,5 +42,6 @@ export default { xzxsy: '选择稀释液', yjxsyxql: '预计稀释液吸取量', sjxsyxql: '实际稀释液吸取量' - } + }, + } diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue index fc34971..ca7de07 100644 --- a/src/views/business/comps/template/TemplateTable.vue +++ b/src/views/business/comps/template/TemplateTable.vue @@ -17,12 +17,9 @@ import SWYPBQGZYZBB from "./comps/sp/SWYPBQGZYZBB.vue"; import SWYPNBGZYZBB from "./comps/sp/SWYPNBGZYZBB.vue"; //色谱生物样品分析方法学样品制备表-10个类似 import ZQDYJMD from "./comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue"; -<<<<<<< HEAD import QXWDX from "./comps/sp/SWYPFXFFXYPZBB/QXWDX.vue"; import CBYHGZYWDX from "./comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue"; -======= import Recovery from "./comps/sp/SWYPFXFFXYPZBB/Recovery.vue"; ->>>>>>> a9295db (feat:[模板管理][生物样品分析方法学样品制备表(Recovery)]) import Demo from "./comps/sp/Demo.vue"; //公用 import SYWZPZJHB from "./comps/gy/SYWZPZJHB.vue"; @@ -32,11 +29,7 @@ export default { name: "TemplateTable", components: { MJYLQSQD, SYWZPZJHB, -<<<<<<< HEAD - SP001, SWYPFXRYPZB, Demo, SWYPFXCBYPZB, SWYPBQGZYZBB, SWYPNBGZYZBB,ZQDYJMD,QXWDX,CBYHGZYWDX -======= - SP001, SWYPFXRYPZB, Demo, SWYPFXCBYPZB, SWYPBQGZYZBB, SWYPNBGZYZBB,ZQDYJMD,Recovery ->>>>>>> a9295db (feat:[模板管理][生物样品分析方法学样品制备表(Recovery)]) + SP001, SWYPFXRYPZB, Demo, SWYPFXCBYPZB, SWYPBQGZYZBB, SWYPNBGZYZBB,ZQDYJMD,QXWDX,CBYHGZYWDX,Recovery }, props: { sn: { @@ -66,12 +59,9 @@ export default { 'SP003': 'SWYPBQGZYZBB', 'SP004': 'SWYPNBGZYZBB', 'SP008': 'ZQDYJMD', -<<<<<<< HEAD + 'SP009': 'Recovery', 'SP010': 'QXWDX', 'SP011': 'CBYHGZYWDX', -======= - 'SP009': 'Recovery', ->>>>>>> a9295db (feat:[模板管理][生物样品分析方法学样品制备表(Recovery)]) 'SYWZPZJHB': 'SYWZPZJHB', 'MJYLQSQD': 'MJYLQSQD', } diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue index 35c1a76..8203afe 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue @@ -1,9 +1,9 @@ - +