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}`],