diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index c2b189a..818b7b4 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -444,6 +444,9 @@ export default {
},
// 表头选择器变化
onHeaderSelectChange(col, value) {
+ if(col.headerSelectTo){
+ this.headerSelectFields[col.headerSelectTo] = value;
+ }
this.headerSelectFields[col.headerSelectKey] = value;
// 输入时清除对应表单项的错误状态
this.formErrors = this.formErrors.filter(error =>
diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index ed5865d..f63b316 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -57,6 +57,11 @@ import Jrjb from "./StepComponents/ry/jrjb.vue";//溶液-加热搅拌
import Cs from "./StepComponents/ry/cs.vue";//溶液-超声
import Sy from "./StepComponents/ry/sy.vue";//溶液-水浴
import Dc from "./StepComponents/ry/dc.vue";//溶液-氮吹
+import Jd from "./StepComponents/ry/jd.vue";//溶液-解冻
+import Jz from "./StepComponents/ry/jz.vue";//溶液-静置
+import Glzd from "./StepComponents/ry/glzd.vue";//溶液-过滤(自动)
+import Glsd from "./StepComponents/ry/glsd.vue";//溶液-过滤(手动)
+
@@ -85,6 +90,10 @@ const stepTypes = [
{ label: '超声', value: 'cs' },
{ label: '水浴', value: 'sy' },
{ label: '氮吹', value: 'dc' },
+ { label: '解冻', value: 'jd' },
+ { label: '静置', value: 'jz' },
+ { label: '过滤(自动)', value: 'glzd' },
+ { label: '过滤(手动)', value: 'glsd' },
];
@@ -135,6 +144,10 @@ export default {
Cs,
Sy,
Dc,
+ Jd,
+ Jz,
+ Glzd,
+ Glsd,
},
computed: {
stepComponentMap() {
@@ -164,6 +177,10 @@ export default {
'sy': 'Sy',
'cs': 'Cs',
'dc': 'Dc',
+ 'jd': 'Jd',
+ 'jz': 'Jz',
+ 'glzd': 'Glzd',
+ 'glsd': 'Glsd',
}
}
return this.componentMap
diff --git a/src/components/Template/StepComponents/ry/glsd.vue b/src/components/Template/StepComponents/ry/glsd.vue
new file mode 100644
index 0000000..84510db
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/glsd.vue
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/glzd.vue b/src/components/Template/StepComponents/ry/glzd.vue
new file mode 100644
index 0000000..4450740
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/glzd.vue
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue
new file mode 100644
index 0000000..5a4421e
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/jd.vue
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/jz.vue b/src/components/Template/StepComponents/ry/jz.vue
new file mode 100644
index 0000000..82bce04
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/jz.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/mixins/stepMixins.js b/src/components/Template/mixins/stepMixins.js
index 9ba48da..3f26f53 100644
--- a/src/components/Template/mixins/stepMixins.js
+++ b/src/components/Template/mixins/stepMixins.js
@@ -1,5 +1,5 @@
export default {
- dicts:["business_tjdw","business_czhj","business_rqcz","business_zldw","business_yqscdw","business_zsdw"],
+ dicts:["business_tjdw","business_czhj","business_rqcz","business_zldw","business_yqscdw","business_zsdw","business_wddw","business_ccwz"],
props: {
formData: {
type: Object,