diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index dcabb2a..8f274e4 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -83,7 +83,25 @@ import jr from "./StepComponents/ry/jr.vue";//溶液-加热
//表配置
import jrry_b from './StepComponents/b/jrry_b.vue';//表配置-加入溶液
-//表配置-离心:使用溶液离心
+//表配置-离心:使用溶液-离心
+import cl from './StepComponents/b/cl.vue';//表配置-称量
+//表配置-超声:使用溶液-超声
+//表配置-恒温混匀:使用溶液-恒温混匀
+//表配置-振摇混匀:使用溶液-振摇混匀
+//表配置-涡旋混匀:使用溶液-涡旋混匀
+//表配置-颠倒混匀:使用溶液-颠倒混匀
+
+//表配置-搅拌:使用溶液-搅拌
+//表配置-加热搅拌:使用溶液-加热搅拌
+//表配置-水浴:使用溶液-水浴
+//表配置-正压:使用溶液-正压
+//表配置-氮吹:使用溶液-氮吹
+//表配置-过滤(自动):使用溶液-过滤(自动)
+//表配置-过滤(手动):使用溶液-过滤(手动)
+//表配置-静置:使用溶液-静置
+//表配置-解冻:使用溶液-解冻
+//表配置-孵育:使用溶液-孵育
+//表配置-复溶:使用溶液-复溶
import { public_templateStepList } from '@/api/business/public/public';
@@ -204,6 +222,7 @@ export default {
//表配置
jrry_b,
+ cl,
},
computed: {
stepComponentMap() {
@@ -260,7 +279,25 @@ export default {
//标配配置
'jrry_b': 'jrry_b',
+ 'cl': 'cl',
'lx_b': 'lx',
+ 'cs_b': 'cs',
+ 'hwhy_b': 'Hwhy',
+ 'zyhy_b': 'Zyhy',
+ 'wxhy_b': 'Wxhy',
+ 'ddhy_b': 'Ddhy',
+
+ 'jb_b': 'Jb',
+ 'jrjb_b': 'Jrjb',
+ 'sy_b': 'Sy',
+ 'zy_b': 'Zy',
+ 'dc_b': 'Dc',
+ 'glzd_b': 'Glzd',
+ 'glsd_b': 'Glsd',
+ 'jz_b': 'Jz',
+ 'jd_b': 'Jd',
+ 'fy_b': 'Fy',
+ 'fr_b': 'Fr',
}
}
return this.componentMap
diff --git a/src/components/Template/StepComponents/b/cl.vue b/src/components/Template/StepComponents/b/cl.vue
new file mode 100644
index 0000000..3be8500
--- /dev/null
+++ b/src/components/Template/StepComponents/b/cl.vue
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/cs.vue b/src/components/Template/StepComponents/ry/cs.vue
index 26a6d5a..c5636e4 100644
--- a/src/components/Template/StepComponents/ry/cs.vue
+++ b/src/components/Template/StepComponents/ry/cs.vue
@@ -10,12 +10,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'cs',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config: {
text1: {
label: "使用超声波清洗机",
@@ -100,6 +106,13 @@ export default {
}
}]
+ if(this.sn==='cs_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/dc.vue b/src/components/Template/StepComponents/ry/dc.vue
index aeba99f..c6cf5f1 100644
--- a/src/components/Template/StepComponents/ry/dc.vue
+++ b/src/components/Template/StepComponents/ry/dc.vue
@@ -9,12 +9,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'dc',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config:{
text1:{
label:"使用氮吹仪",
@@ -48,6 +54,13 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
}
}
}]
+ if(this.sn==='dc_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/ddhy.vue b/src/components/Template/StepComponents/ry/ddhy.vue
index c6ae837..ab51d09 100644
--- a/src/components/Template/StepComponents/ry/ddhy.vue
+++ b/src/components/Template/StepComponents/ry/ddhy.vue
@@ -9,12 +9,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'ddhy',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config:{
text1:{
label:"将溶液进行上下颠倒,预计颠倒",
@@ -40,6 +46,13 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
}
}
}]
+ if(this.sn==='ddhy_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/fr.vue b/src/components/Template/StepComponents/ry/fr.vue
index b264241..40df523 100644
--- a/src/components/Template/StepComponents/ry/fr.vue
+++ b/src/components/Template/StepComponents/ry/fr.vue
@@ -9,12 +9,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'fr',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config:{
text1:{
label:"使用",
@@ -77,6 +83,13 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
}
}
}]
+ if(this.sn==='fr_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/fy.vue b/src/components/Template/StepComponents/ry/fy.vue
index ded50e6..da8de0a 100644
--- a/src/components/Template/StepComponents/ry/fy.vue
+++ b/src/components/Template/StepComponents/ry/fy.vue
@@ -10,12 +10,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'fy',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config: {
text1: {
label: "使用",
@@ -84,6 +90,13 @@ export default {
}
}]
+ if(this.sn==='fy_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/glsd.vue b/src/components/Template/StepComponents/ry/glsd.vue
index 0041022..a6ee738 100644
--- a/src/components/Template/StepComponents/ry/glsd.vue
+++ b/src/components/Template/StepComponents/ry/glsd.vue
@@ -9,12 +9,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'glsd',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config:{
text2:{
label:"选择",
@@ -34,6 +40,13 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
},
}
}]
+ if(this.sn==='glsd_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/glzd.vue b/src/components/Template/StepComponents/ry/glzd.vue
index 2c17e55..bf68713 100644
--- a/src/components/Template/StepComponents/ry/glzd.vue
+++ b/src/components/Template/StepComponents/ry/glzd.vue
@@ -9,12 +9,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'glzd',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config:{
text1:{
label:"使用隔膜真空泵",
@@ -42,6 +48,13 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
},
}
}]
+ if(this.sn==='glzd_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/hwhy.vue b/src/components/Template/StepComponents/ry/hwhy.vue
index d3353aa..0c9343f 100644
--- a/src/components/Template/StepComponents/ry/hwhy.vue
+++ b/src/components/Template/StepComponents/ry/hwhy.vue
@@ -10,12 +10,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'hwhy',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config: {
text1: {
label: "使用恒温混匀仪",
@@ -125,6 +131,13 @@ export default {
},
}
}]
+ if(this.sn==='hwhy_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/jb.vue b/src/components/Template/StepComponents/ry/jb.vue
index 101cbeb..8833c47 100644
--- a/src/components/Template/StepComponents/ry/jb.vue
+++ b/src/components/Template/StepComponents/ry/jb.vue
@@ -10,12 +10,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'jb',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config: {
text1: {
label: "使用搅拌仪",
@@ -87,6 +93,13 @@ export default {
}
}]
+ if(this.sn==='jb_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue
index 24fcb13..40b1ca1 100644
--- a/src/components/Template/StepComponents/ry/jd.vue
+++ b/src/components/Template/StepComponents/ry/jd.vue
@@ -10,12 +10,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'jd',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config: {
text1: {
label: "将",
@@ -126,6 +132,13 @@ export default {
}
}]
+ if(this.sn==='jd_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/jrjb.vue b/src/components/Template/StepComponents/ry/jrjb.vue
index 711beac..7cec3da 100644
--- a/src/components/Template/StepComponents/ry/jrjb.vue
+++ b/src/components/Template/StepComponents/ry/jrjb.vue
@@ -9,12 +9,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'jrjb',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config:{
text1:{
label:"使用搅拌仪",
@@ -104,6 +110,13 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
}
}]
+ if(this.sn==='jrjb_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/jz.vue b/src/components/Template/StepComponents/ry/jz.vue
index c2c288a..320be40 100644
--- a/src/components/Template/StepComponents/ry/jz.vue
+++ b/src/components/Template/StepComponents/ry/jz.vue
@@ -9,12 +9,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'jz',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config:{
text1:{
label:"将",
@@ -78,6 +84,13 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
},
}
}]
+ if(this.sn==='jz_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/sy.vue b/src/components/Template/StepComponents/ry/sy.vue
index 5fcfbf3..b15453f 100644
--- a/src/components/Template/StepComponents/ry/sy.vue
+++ b/src/components/Template/StepComponents/ry/sy.vue
@@ -9,12 +9,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'sy',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config:{
text1:{
label:"使用水浴锅",
@@ -74,6 +80,13 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
},
}
}]
+ if(this.sn==='sy_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/wxhy.vue b/src/components/Template/StepComponents/ry/wxhy.vue
index 2b147a8..5e12ccd 100644
--- a/src/components/Template/StepComponents/ry/wxhy.vue
+++ b/src/components/Template/StepComponents/ry/wxhy.vue
@@ -9,12 +9,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'wxhy',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config:{
text1:{
label:"使用涡旋混匀仪",
@@ -30,6 +36,13 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
},
}
}]
+ if(this.sn==='wxhy_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/zy.vue b/src/components/Template/StepComponents/ry/zy.vue
index 48e1756..32b3aab 100644
--- a/src/components/Template/StepComponents/ry/zy.vue
+++ b/src/components/Template/StepComponents/ry/zy.vue
@@ -9,12 +9,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'zy',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config:{
text1:{
label:"使用正压萃取仪",
@@ -30,6 +36,13 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
}
}
}]
+ if(this.sn==='zy_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}
diff --git a/src/components/Template/StepComponents/ry/zyhy.vue b/src/components/Template/StepComponents/ry/zyhy.vue
index 2113660..258339a 100644
--- a/src/components/Template/StepComponents/ry/zyhy.vue
+++ b/src/components/Template/StepComponents/ry/zyhy.vue
@@ -9,12 +9,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
export default {
mixins: [stepMixins],
+ props: {
+ sn: {
+ type: String,
+ default: 'zyhy',
+ },
+ },
components: {
StepFormPackage
},
computed: {
formConfig() {
- return [{
+ let config = [{
config:{
text1:{
label:"使用",
@@ -105,6 +111,13 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
}
}
}]
+ if(this.sn==='zyhy_b'){
+ config[0].config.remark = {
+ type: "input",
+ fillType: "actFill",
+ }
+ }
+ return config
}
},
}