From a9db0914aa163241dac43759fdaf8d24a82ba38d Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 12 Mar 2026 10:25:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?[LBA008]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/template/lba.js | 12 + src/lang/en/template/pcr.js | 5 + src/lang/zh/template/lba.js | 12 + src/lang/zh/template/pcr.js | 5 + .../business/comps/template/TemplateTable.vue | 7 +- .../business/comps/template/comps/lba/LBA008.vue | 364 +++++++++++++++++++++ .../business/comps/template/comps/pcr/PCR003.vue | 2 +- .../business/comps/template/comps/pcr/PCR004.vue | 2 +- .../business/comps/template/comps/pcr/PCR012.vue | 313 ++++++++++++++++++ .../comps/template/formConfig/lba/lba008.js | 77 +++++ 10 files changed, 796 insertions(+), 3 deletions(-) create mode 100644 src/views/business/comps/template/comps/lba/LBA008.vue create mode 100644 src/views/business/comps/template/comps/pcr/PCR012.vue create mode 100644 src/views/business/comps/template/formConfig/lba/lba008.js diff --git a/src/lang/en/template/lba.js b/src/lang/en/template/lba.js index 03dc355..b0d7d5a 100644 --- a/src/lang/en/template/lba.js +++ b/src/lang/en/template/lba.js @@ -37,5 +37,17 @@ export default { jcb: 'Analysis Plate', jg: 'Result', sjwjm: 'Data file name' + }, + lba008: { + yjtj: '匀浆条件', + yjsj: '匀浆时间', + yjry: '匀浆溶液', + bs: '倍数', + dztpbh: '电子天平编号', + dwbh: '动物编号', + zzlx: '组织类型', + cqzl: '称取重量', + ysyjrybjrl: '预设匀浆溶液补加入量', + sjyjrybjrl: '实际匀浆溶液补加入量', } } diff --git a/src/lang/en/template/pcr.js b/src/lang/en/template/pcr.js index 6be5868..08dfea0 100644 --- a/src/lang/en/template/pcr.js +++ b/src/lang/en/template/pcr.js @@ -100,6 +100,11 @@ export default { ysyjrybjrl: '预设匀浆溶液补加入量', sjyjrybjrl: '实际匀浆溶液补加入量', }, + pcr012: { + sjwj: '数据文件', + hsndcdwjm: '核酸浓度测定文件名', + hsndcdwjlj: '核酸浓度测定文件路径', + }, // 生物样品分析方法学样品制备表-准确度与精密度 sp008: { title: diff --git a/src/lang/zh/template/lba.js b/src/lang/zh/template/lba.js index 8297e15..f3c7bfd 100644 --- a/src/lang/zh/template/lba.js +++ b/src/lang/zh/template/lba.js @@ -37,5 +37,17 @@ export default { jcb: '检测板', jg: '结果', sjwjm: '数据文件名' + }, + lba008: { + yjtj: '匀浆条件', + yjsj: '匀浆时间', + yjry: '匀浆溶液', + bs: '倍数', + dztpbh: '电子天平编号', + dwbh: '动物编号', + zzlx: '组织类型', + cqzl: '称取重量', + ysyjrybjrl: '预设匀浆溶液补加入量', + sjyjrybjrl: '实际匀浆溶液补加入量', } } diff --git a/src/lang/zh/template/pcr.js b/src/lang/zh/template/pcr.js index af4ca3c..62e26b5 100644 --- a/src/lang/zh/template/pcr.js +++ b/src/lang/zh/template/pcr.js @@ -99,6 +99,11 @@ export default { ysyjrybjrl: '预设匀浆溶液补加入量', sjyjrybjrl: '实际匀浆溶液补加入量', }, + pcr012: { + sjwj: '数据文件', + hsndcdwjm: '核酸浓度测定文件名', + hsndcdwjlj: '核酸浓度测定文件路径', + }, // 生物样品分析方法学样品制备表-Recovery sp009: { title: '生物样品分析方法学样品制备表(Recovery)', diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue index e69687f..75cc865 100644 --- a/src/views/business/comps/template/TemplateTable.vue +++ b/src/views/business/comps/template/TemplateTable.vue @@ -60,6 +60,7 @@ import PCR008 from "./comps/pcr/PCR008.vue"; import PCR009 from "./comps/pcr/PCR009.vue"; import PCR010 from "./comps/pcr/PCR010.vue"; import PCR011 from "./comps/pcr/PCR011.vue"; +import PCR012 from "./comps/pcr/PCR012.vue"; //LBA // LBA001-使用SP001 @@ -69,6 +70,7 @@ import LBA004 from "./comps/lba/LBA004.vue"; import LBA005 from "./comps/lba/LBA005.vue"; import LBA006 from "./comps/lba/LBA006.vue"; import LBA007 from "./comps/lba/LBA007.vue"; +import LBA008 from "./comps/lba/LBA008.vue"; //ADA // ADA001-使用SP001 @@ -135,7 +137,7 @@ export default { //色谱 SP001, SP003, SP00456,SP007, SP008, SP009,SP0019,SP0020,SP0021, // PCR - PCR002, PCR003, PCR004, PCR005,PCR007, PCR008, PCR009,PCR010, PCR011, + PCR002, PCR003, PCR004, PCR005,PCR007, PCR008, PCR009,PCR010, PCR011, PCR012, //LBA LBA002, LBA003, @@ -143,6 +145,7 @@ export default { LBA005, LBA006, LBA007, + LBA008, //样品 YP002, YP003, @@ -272,6 +275,7 @@ export default { 'PCR009': 'PCR009', 'PCR010': 'PCR010', 'PCR011': 'PCR011', + 'PCR012': 'PCR012', //LBA 'LBA001': 'SP001', 'LBA002': 'LBA002', @@ -280,6 +284,7 @@ export default { 'LBA005': 'SP00456', 'LBA006': 'LBA006', 'LBA007': 'LBA007', + 'LBA008': 'LBA008', //ADA 'ADA001': 'SP001', 'ADA002': 'LBA002', diff --git a/src/views/business/comps/template/comps/lba/LBA008.vue b/src/views/business/comps/template/comps/lba/LBA008.vue new file mode 100644 index 0000000..66720da --- /dev/null +++ b/src/views/business/comps/template/comps/lba/LBA008.vue @@ -0,0 +1,364 @@ + + + + + {{ formData.bdmc }} + + + + + + + + + + + + {{ + $t('template.common.downloadTemplate') }} + {{ + $t('template.common.importTemplate') + }} + + + + + deleteRow(rowIndex)"> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/business/comps/template/comps/pcr/PCR003.vue b/src/views/business/comps/template/comps/pcr/PCR003.vue index a5a0014..9956ed5 100644 --- a/src/views/business/comps/template/comps/pcr/PCR003.vue +++ b/src/views/business/comps/template/comps/pcr/PCR003.vue @@ -68,7 +68,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools"; export default { - name: "PCR002", + name: "PCR003", components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog }, mixins: [templateMixin], props: { diff --git a/src/views/business/comps/template/comps/pcr/PCR004.vue b/src/views/business/comps/template/comps/pcr/PCR004.vue index 5059449..7303186 100644 --- a/src/views/business/comps/template/comps/pcr/PCR004.vue +++ b/src/views/business/comps/template/comps/pcr/PCR004.vue @@ -68,7 +68,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools"; export default { - name: "PCR002", + name: "PCR004", components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog }, mixins: [templateMixin], props: { diff --git a/src/views/business/comps/template/comps/pcr/PCR012.vue b/src/views/business/comps/template/comps/pcr/PCR012.vue new file mode 100644 index 0000000..9efecae --- /dev/null +++ b/src/views/business/comps/template/comps/pcr/PCR012.vue @@ -0,0 +1,313 @@ + + + + + {{ formData.bdmc }} + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/business/comps/template/formConfig/lba/lba008.js b/src/views/business/comps/template/formConfig/lba/lba008.js new file mode 100644 index 0000000..dd8c9fc --- /dev/null +++ b/src/views/business/comps/template/formConfig/lba/lba008.js @@ -0,0 +1,77 @@ +// LBA008 +export const getLBA008Config = ($this) => { + return [ + { + label: 'template.lba.lba008.dwbh', + prop: 'dwbh', + width: 280, + bodyType: 'input', + fillType: 'preFill', + otherCode: 'bhOther', + bodyFillType: 'preFill', + }, + { + label: 'template.lba.lba008.zzlx', + prop: 'zzlx', + width: 280, + showWidth: 180, + fillType: 'preFill', + bodyType: 'input', + bodyFillType: 'preFill', + bodyMaxlength: 10, + }, + { + label: 'template.lba.lba008.cqzl', + prop: 'cqzl', + width: 280, + showWidth: 180, + fillType: 'preFill', + headerSelectKey: 'cqzlUnit', + headerOptions: $this.getDictOptions('business_zldw'), + bodyType: 'inputNumber', + bodyFillType: 'actFill', + bodySubType: 'button', + bodySubButtonName: 'form.hqz', + bodyMaxlength: 10, + bodySubFillType: 'actFill', + subPrecision: 0, + showBodySub: $this.fillType === 'actFill', + bodyMaxlength: 10, + bodySubPlaceholder: 'template.common.xswsPlaceholder', + }, + { + label: 'template.lba.lba008.ysyjrybjrl', + prop: 'ysyjrybjrl', + width: 280, + showWidth: 180, + fillType: 'preFill', + headerSelectKey: 'ysyjrybjrlUnit', + headerOptions: $this.getDictOptions('business_tjdw'), + bodyType: 'inputNumber', + bodyFillType: 'actFill', + bodyMaxlength: 10, + bodySubType: 'inputNumber', + bodySubKey: 'targetStartSolutionVolumePrecision', + bodySubFillType: 'preFill', + showBodySub: $this.fillType === 'preFill', + bodyPrecisionKey: 'targetStartSolutionVolumePrecision', + bodyMaxlength: 10, + bodyDisabled: $this.fillType === 'preFill', + bodySubPlaceholder: 'template.common.xswsPlaceholder', + headerSelectTo:"actStartSolutionVolumeUnit", + }, + { + label: 'template.lba.lba008.sjyjrybjrl', + prop: 'sjyjrybjrl', + width: 280, + showWidth: 180, + fillType: 'preFill', + headerSelectKey: 'sjyjrybjrlUnit', + headerOptions: $this.getDictOptions('business_tjdw'), + bodyType: 'inputNumber', + bodyFillType: 'actFill', + copyFrom: 'ysyjrybjrl', //复制哪个字段 + bodyMaxlength: 10, + } + ] +} From 616b1253767f8cb6625cb1d5395e9ace9c6c55d0 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 12 Mar 2026 10:26:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?[LBA008]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/template/comps/lba/LBA008.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/business/comps/template/comps/lba/LBA008.vue b/src/views/business/comps/template/comps/lba/LBA008.vue index 66720da..e6f3c83 100644 --- a/src/views/business/comps/template/comps/lba/LBA008.vue +++ b/src/views/business/comps/template/comps/lba/LBA008.vue @@ -299,15 +299,14 @@ export default { let tableList = content.stepTableFormData if (tableList && tableList.length > 0) { for (let i = 0; i < tableList.length; i++) { - //配置的试剂 + let item = tableList[i] console.log('表格item:' + JSON.stringify(item)) //使用的 - tmpResource.push({ mc: null, - bh: content.subSolution, + bh: content.yjrybh, ph: null, ndz: null, nd: null, @@ -316,10 +315,10 @@ export default { sxrq: null, kc: null, kcdw: null, - syl: item.ysxsyxytj, + syl: item.sjyjrybjrl, type: 1, elnType: this.product, - syldw: content.headerSelectFields.sjxsyxytjUnit, + syldw: content.headerSelectFields.sjyjrybjrlUnit, yxzq: null, yxzqdw: null, }) From 76a74668798df3a90c67bc78c55a90af8e5cd13c Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Thu, 12 Mar 2026 11:02:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20[=E6=AD=A5=E9=AA=A4=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E6=A3=80=E6=B5=8B=E6=9D=BF=E6=AD=A5=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/Step.vue | 90 ++++++++++++++++ .../Template/StepComponents/jcb/czqx.vue | 118 +++++++++++++++++++++ .../Template/StepComponents/jcb/czzx.vue | 77 ++++++++++++++ .../Template/StepComponents/jcb/czzy.vue | 79 ++++++++++++++ .../Template/StepComponents/jcb/dbmby.vue | 2 +- .../Template/StepComponents/jcb/js_jcb.vue | 37 +++++++ src/components/Template/StepComponents/jcb/qb.vue | 37 +++++++ .../Template/StepComponents/jcb/sjbj.vue | 109 +++++++++++++++++++ .../Template/StepComponents/jcb/ychy.vue | 111 +++++++++++++++++++ 9 files changed, 659 insertions(+), 1 deletion(-) create mode 100644 src/components/Template/StepComponents/jcb/czqx.vue create mode 100644 src/components/Template/StepComponents/jcb/czzx.vue create mode 100644 src/components/Template/StepComponents/jcb/czzy.vue create mode 100644 src/components/Template/StepComponents/jcb/js_jcb.vue create mode 100644 src/components/Template/StepComponents/jcb/qb.vue create mode 100644 src/components/Template/StepComponents/jcb/sjbj.vue create mode 100644 src/components/Template/StepComponents/jcb/ychy.vue diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue index 27c0f96..ee8c7a7 100644 --- a/src/components/Template/Step.vue +++ b/src/components/Template/Step.vue @@ -225,6 +225,41 @@ import cbygxz from './StepComponents/pcrfxyp/cbygxz.vue';//PCR分析样品处理 import yxpcry from './StepComponents/pcrfxyp/yxpcry.vue';//PCR分析样品处理表-运行PCR仪 import cdnsypfz from './StepComponents/pcrfxyp/cdnsypfz.vue';//PCR分析样品处理表-cDNA样品分装 + +//检测板配置 +import bb from './StepComponents/jcb/bb.vue';//检测板配置-包被 +//检测板配置-洗板:使用检测板配置-包被 +//检测板配置-封闭:使用检测板配置-包被 +import jy from './StepComponents/jcb/jy.vue';//检测板配置-加样 +//检测板配置-中和:使用检测板配置-包被 +//检测板配置-加检测试剂:使用检测板配置-包被 +//检测板配置-酸解:使用检测板配置-包被 +import sjjy_jcb from './StepComponents/jcb/sjjy_jcb.vue';//检测板配置-酸解加样 +import zhfy from './StepComponents/jcb/zhfy.vue';//检测板配置-中和孵育 +//检测板配置-二次酸解:使用检测板配置-包被 +import xs_jcb from './StepComponents/jcb/xs_jcb.vue';//检测板配置-显色 +//检测板配置-终止:使用检测板配置-包被 +//检测板配置-检测:使用检测板配置-包被 +import dbmby from './StepComponents/jcb/dbmby.vue';//检测板配置-读板(酶标仪) +//检测板配置-读板(化学发光系统):使用检测板配置-读板(酶标仪) +import dbdhxfgxt from './StepComponents/jcb/dbdhxfgxt.vue';//检测板配置-读板(电化学发光系统) +import dbygxt from './StepComponents/jcb/dbygxt.vue';//检测板配置-读板(荧光系统) +import dzacl from './StepComponents/jcb/dzacl.vue';//检测板配置-读值(ACL) +import qb from './StepComponents/jcb/qb.vue';//检测板配置-取板 +import jzks from './StepComponents/jcb/jzks.vue';//检测板配置-静置开始 +import fyxks from './StepComponents/jcb/fyxks.vue';//检测板配置-孵育箱开始 +import ycfyks from './StepComponents/jcb/ycfyks.vue';//检测板配置-摇床孵育开始 +import ycks from './StepComponents/jcb/ycks.vue';//检测板配置-摇床开始 +import js_jcb from './StepComponents/jcb/js_jcb.vue';//检测板配置-结束 +//检测板配置-覆膜:使用检测板配置-读值(ACL) +//检测板配置-拍干:使用检测板配置-读值(ACL) +import czqx from './StepComponents/jcb/czqx.vue';//检测板配置-磁珠清洗 +import czzx from './StepComponents/jcb/czzx.vue';//检测板配置-磁珠重悬 +import ychy from './StepComponents/jcb/ychy.vue';//检测板配置-摇床混匀 +import czzy from './StepComponents/jcb/czzy.vue';//检测板配置-磁珠转移 +import sjbj from './StepComponents/jcb/sjbj.vue';//检测板配置-试剂标记 + + import { public_templateStepList } from '@/api/business/public/public'; @@ -428,6 +463,28 @@ export default { yxpcry, cdnsypfz, + //检测板配置 + bb, + jy, + sjjy_jcb, + zhfy, + xs_jcb, + dbmby, + dbdhxfgxt, + dbygxt, + dzacl, + qb, + jzks, + fyxks, + ycfyks, + ycks, + js_jcb, + czqx, + czzx, + ychy, + czzy, + sjbj, + }, computed: { stepComponentMap() { @@ -604,6 +661,39 @@ export default { 'cbygxz':'cbygxz', 'yxpcry':'yxpcry', 'cdnsypfz':'cdnsypfz', + + //检测板配置 + 'bb':'bb', + 'xb':'bb', + 'fb_jcb':'bb', + 'jy':'jy', + 'zh':'bb', + 'jjcsj':'bb', + 'sj':'bb', + 'sjjy_jcb':'sjjy_jcb', + 'zhfy':'zhfy', + 'ecsj_jcb':'bb', + 'xs_jcb':'xs_jcb', + 'zz':'bb', + 'jc':'bb', + 'dbmby':'dbmby', + 'dbhxfgxt':'dbmby', + 'dbdhxfgxt':'dbdhxfgxt', + 'dbygxt':'dbygxt', + 'dzacl':'dzacl', + 'qb':'qb', + 'jzks':'jzks', + 'fyxks':'fyxks', + 'ycfyks':'ycfyks', + 'ycks':'ycks', + 'js_jcb':'js_jcb', + 'fm':'dzacl', + 'pg':'dzacl', + 'czqx':'czqx', + 'czzx':'czzx', + 'ychy':'ychy', + 'czzy':'czzy', + 'sjbj':'sjbj', } } diff --git a/src/components/Template/StepComponents/jcb/czqx.vue b/src/components/Template/StepComponents/jcb/czqx.vue new file mode 100644 index 0000000..86e49f4 --- /dev/null +++ b/src/components/Template/StepComponents/jcb/czqx.vue @@ -0,0 +1,118 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/jcb/czzx.vue b/src/components/Template/StepComponents/jcb/czzx.vue new file mode 100644 index 0000000..bbd7002 --- /dev/null +++ b/src/components/Template/StepComponents/jcb/czzx.vue @@ -0,0 +1,77 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/jcb/czzy.vue b/src/components/Template/StepComponents/jcb/czzy.vue new file mode 100644 index 0000000..3d4e2ec --- /dev/null +++ b/src/components/Template/StepComponents/jcb/czzy.vue @@ -0,0 +1,79 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/jcb/dbmby.vue b/src/components/Template/StepComponents/jcb/dbmby.vue index 9cb3d29..37b095c 100644 --- a/src/components/Template/StepComponents/jcb/dbmby.vue +++ b/src/components/Template/StepComponents/jcb/dbmby.vue @@ -1,5 +1,5 @@ - + diff --git a/src/components/Template/StepComponents/jcb/js_jcb.vue b/src/components/Template/StepComponents/jcb/js_jcb.vue new file mode 100644 index 0000000..a9b57a5 --- /dev/null +++ b/src/components/Template/StepComponents/jcb/js_jcb.vue @@ -0,0 +1,37 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/jcb/qb.vue b/src/components/Template/StepComponents/jcb/qb.vue new file mode 100644 index 0000000..26fc060 --- /dev/null +++ b/src/components/Template/StepComponents/jcb/qb.vue @@ -0,0 +1,37 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/jcb/sjbj.vue b/src/components/Template/StepComponents/jcb/sjbj.vue new file mode 100644 index 0000000..239007c --- /dev/null +++ b/src/components/Template/StepComponents/jcb/sjbj.vue @@ -0,0 +1,109 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/jcb/ychy.vue b/src/components/Template/StepComponents/jcb/ychy.vue new file mode 100644 index 0000000..ba5d99b --- /dev/null +++ b/src/components/Template/StepComponents/jcb/ychy.vue @@ -0,0 +1,111 @@ + + + + + + + + \ No newline at end of file From 0094e6202e47dc8bba1b50e73562155215c7bf47 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Thu, 12 Mar 2026 15:20:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20[=E6=AD=A5=E9=AA=A4=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E7=BB=86=E8=83=9E/=E8=8F=8C=E6=A0=AA=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=AD=A5=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/Step.vue | 59 ++++++++++- .../Template/StepComponents/qxwdx/qxfz.vue | 2 +- src/components/Template/StepComponents/ry/fz.vue | 37 +++++++ .../Template/StepComponents/xbjzpz/cd.vue | 55 ++++++++++ .../Template/StepComponents/xbjzpz/cdmd.vue | 90 ++++++++++++++++ .../Template/StepComponents/xbjzpz/cdxs.vue | 107 +++++++++++++++++++ .../Template/StepComponents/xbjzpz/copy.vue | 71 +++++++++++++ .../Template/StepComponents/xbjzpz/dypyy.vue | 43 ++++++++ .../Template/StepComponents/xbjzpz/fr_xbjzpz.vue | 65 ++++++++++++ .../Template/StepComponents/xbjzpz/gc.vue | 51 +++++++++ .../Template/StepComponents/xbjzpz/jzzy.vue | 86 +++++++++++++++ .../Template/StepComponents/xbjzpz/lxqy.vue | 118 +++++++++++++++++++++ .../Template/StepComponents/xbjzpz/qjz.vue | 53 +++++++++ .../Template/StepComponents/xbjzpz/qxb.vue | 53 +++++++++ .../Template/StepComponents/xbjzpz/xbzy.vue | 59 +++++++++++ .../Template/StepComponents/xbjzpz/xd.vue | 96 +++++++++++++++++ src/components/Template/StepFormPackage.vue | 2 +- 17 files changed, 1043 insertions(+), 4 deletions(-) create mode 100644 src/components/Template/StepComponents/ry/fz.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/cd.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/cdmd.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/cdxs.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/copy.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/dypyy.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/fr_xbjzpz.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/gc.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/jzzy.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/lxqy.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/qjz.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/qxb.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/xbzy.vue create mode 100644 src/components/Template/StepComponents/xbjzpz/xd.vue diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue index ee8c7a7..1dac666 100644 --- a/src/components/Template/Step.vue +++ b/src/components/Template/Step.vue @@ -79,6 +79,7 @@ import kbyq from "./StepComponents/ry/kbyq.vue";//溶液-空白仪器 import kbsjgsp from "./StepComponents/ry/kbsjgsp.vue";//溶液-空白(试剂/供试品) import kb from "./StepComponents/ry/kb.vue";//溶液-空白 import jr from "./StepComponents/ry/jr.vue";//溶液-加热 +import fz from "./StepComponents/ry/fz.vue";//溶液-分装 //罗开凡新增 //表配置 @@ -260,6 +261,26 @@ import czzy from './StepComponents/jcb/czzy.vue';//检测板配置-磁珠转移 import sjbj from './StepComponents/jcb/sjbj.vue';//检测板配置-试剂标记 +//细胞/菌株配置 +import qxb from './StepComponents/xbjzpz/qxb.vue';//细胞/菌株配置-取细胞 +import qjz from './StepComponents/xbjzpz/qjz.vue';//细胞/菌株配置-取菌株 +import fr_xbjzpz from './StepComponents/xbjzpz/fr_xbjzpz.vue';//细胞/菌株配置-复溶 +import lxqy from './StepComponents/xbjzpz/lxqy.vue';//细胞/菌株配置-离心(弃液) +import cd from './StepComponents/xbjzpz/cd.vue';//细胞/菌株配置-吹打 +import xbzy from './StepComponents/xbjzpz/xbzy.vue';//细胞/菌株配置-细胞转移 +import jzzy from './StepComponents/xbjzpz/jzzy.vue';//细胞/菌株配置-菌株转移 +import dypyy from './StepComponents/xbjzpz/dypyy.vue';//细胞/菌株配置-倒原培养液 +import xd from './StepComponents/xbjzpz/xd.vue';//细胞/菌株配置-洗涤 +//细胞/菌株配置-消化:使用细胞/菌株配置-洗涤 +//细胞/菌株配置-终止消化:使用细胞/菌株配置-洗涤 +import copy from './StepComponents/xbjzpz/copy.vue';//细胞/菌株配置-CO2培养 +import gc from './StepComponents/xbjzpz/gc.vue';//细胞/菌株配置-观察 +import cdmd from './StepComponents/xbjzpz/cdmd.vue';//细胞/菌株配置-测定密度 +//细胞/菌株配置-低渗:使用细胞/菌株配置-洗涤 +//细胞/菌株配置-固定:使用细胞/菌株配置-洗涤 +import cdxs from './StepComponents/xbjzpz/cdxs.vue';//细胞/菌株配置-传代/稀释 + + import { public_templateStepList } from '@/api/business/public/public'; @@ -376,6 +397,7 @@ export default { kbsjgsp, kb, jr, + fz, //罗开凡新增 //表配置 @@ -485,6 +507,21 @@ export default { czzy, sjbj, + //细胞/菌株配置 + qxb, + qjz, + fr_xbjzpz, + lxqy, + cd, + xbzy, + jzzy, + dypyy, + xd, + copy, + gc, + cdmd, + cdxs, + }, computed: { stepComponentMap() { @@ -536,7 +573,7 @@ export default { 'kbsjgsp': 'kbsjgsp', 'kb': 'kb', 'jr': 'jr', - // 'fz': 'fz', + 'fz': 'fz', //罗开凡新增 //标配配置 @@ -694,7 +731,25 @@ export default { 'ychy':'ychy', 'czzy':'czzy', 'sjbj':'sjbj', - + + //细胞/菌株配置 + 'qxb':'qxb', + 'qjz':'qjz', + 'fr_xbjzpz':'fr_xbjzpz', + 'lxqy':'lxqy', + 'cd':'cd', + 'xbzy':'xbzy', + 'jzzy':'jzzy', + 'dypyy':'dypyy', + 'xd':'xd', + 'xh':'xd', + 'zzxh':'xd', + 'copy':'copy', + 'gc':'gc', + 'cdmd':'cdmd', + 'ds':'xd', + 'gd':'xd', + 'cdxs':'cdxs', } } return this.componentMap diff --git a/src/components/Template/StepComponents/qxwdx/qxfz.vue b/src/components/Template/StepComponents/qxwdx/qxfz.vue index fd5a4b4..9673cad 100644 --- a/src/components/Template/StepComponents/qxwdx/qxfz.vue +++ b/src/components/Template/StepComponents/qxwdx/qxfz.vue @@ -1,4 +1,4 @@ - + diff --git a/src/components/Template/StepComponents/ry/fz.vue b/src/components/Template/StepComponents/ry/fz.vue new file mode 100644 index 0000000..aadbfd4 --- /dev/null +++ b/src/components/Template/StepComponents/ry/fz.vue @@ -0,0 +1,37 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/cd.vue b/src/components/Template/StepComponents/xbjzpz/cd.vue new file mode 100644 index 0000000..5a97bdf --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/cd.vue @@ -0,0 +1,55 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/cdmd.vue b/src/components/Template/StepComponents/xbjzpz/cdmd.vue new file mode 100644 index 0000000..54031ad --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/cdmd.vue @@ -0,0 +1,90 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/cdxs.vue b/src/components/Template/StepComponents/xbjzpz/cdxs.vue new file mode 100644 index 0000000..d3c980d --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/cdxs.vue @@ -0,0 +1,107 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/copy.vue b/src/components/Template/StepComponents/xbjzpz/copy.vue new file mode 100644 index 0000000..d52d4d9 --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/copy.vue @@ -0,0 +1,71 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/dypyy.vue b/src/components/Template/StepComponents/xbjzpz/dypyy.vue new file mode 100644 index 0000000..db63860 --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/dypyy.vue @@ -0,0 +1,43 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/fr_xbjzpz.vue b/src/components/Template/StepComponents/xbjzpz/fr_xbjzpz.vue new file mode 100644 index 0000000..33f08b0 --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/fr_xbjzpz.vue @@ -0,0 +1,65 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/gc.vue b/src/components/Template/StepComponents/xbjzpz/gc.vue new file mode 100644 index 0000000..0e7cd46 --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/gc.vue @@ -0,0 +1,51 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/jzzy.vue b/src/components/Template/StepComponents/xbjzpz/jzzy.vue new file mode 100644 index 0000000..1164550 --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/jzzy.vue @@ -0,0 +1,86 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/lxqy.vue b/src/components/Template/StepComponents/xbjzpz/lxqy.vue new file mode 100644 index 0000000..6b2dc79 --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/lxqy.vue @@ -0,0 +1,118 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/qjz.vue b/src/components/Template/StepComponents/xbjzpz/qjz.vue new file mode 100644 index 0000000..c605f0b --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/qjz.vue @@ -0,0 +1,53 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/qxb.vue b/src/components/Template/StepComponents/xbjzpz/qxb.vue new file mode 100644 index 0000000..fe30bff --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/qxb.vue @@ -0,0 +1,53 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/xbzy.vue b/src/components/Template/StepComponents/xbjzpz/xbzy.vue new file mode 100644 index 0000000..0d8319b --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/xbzy.vue @@ -0,0 +1,59 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/xbjzpz/xd.vue b/src/components/Template/StepComponents/xbjzpz/xd.vue new file mode 100644 index 0000000..e97531d --- /dev/null +++ b/src/components/Template/StepComponents/xbjzpz/xd.vue @@ -0,0 +1,96 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue index b778e89..adbc07f 100644 --- a/src/components/Template/StepFormPackage.vue +++ b/src/components/Template/StepFormPackage.vue @@ -177,7 +177,7 @@ export default { const sjResource = [],yqResource = []; for(const key in allFieldsConfig){ const item = allFieldsConfig[key]; - if(item.type === "xb" || item.type === "sj" || item.type === "gsp" || item.type === "mix"){ + if(item.type === "xj" || item.type === "xb" || item.type === "sj" || item.type === "gsp" || item.type === "mix"){ if(formFields[key]){ let o = { ...formFields[`selectInfo_${key}`],