diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue index 4e57bd5..5743dd1 100644 --- a/src/components/Template/Step.vue +++ b/src/components/Template/Step.vue @@ -71,6 +71,7 @@ import Js from "./StepComponents/ry/js.vue";//溶液-计数 import Mj from "./StepComponents/ry/mj.vue";//溶液-灭菌 import Fs from "./StepComponents/ry/fs.vue";//溶液-复苏 import Fb from "./StepComponents/ry/fb.vue";//溶液-封板 +import Zlfz from "./StepComponents/ry/zlfz.vue";//溶液-质量分装 @@ -113,6 +114,7 @@ const stepTypes = [ { label: '灭菌', value: 'mj' }, { label: '复苏', value: 'fs' }, { label: '封板', value: 'fb' }, + { label: '质量分装', value: 'zlfz' }, ]; @@ -177,6 +179,7 @@ export default { Mj, Fs, Fb, + Zlfz, }, computed: { stepComponentMap() { @@ -220,6 +223,7 @@ export default { 'mj': 'Mj', 'fs': 'Fs', 'fb': 'Fb', + 'zlfz': 'Zlfz', } } return this.componentMap diff --git a/src/components/Template/StepComponents/ZLSubPackage.vue b/src/components/Template/StepComponents/ZLSubPackage.vue new file mode 100644 index 0000000..fd881f5 --- /dev/null +++ b/src/components/Template/StepComponents/ZLSubPackage.vue @@ -0,0 +1,341 @@ + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/ry/qywz.vue b/src/components/Template/StepComponents/ry/qywz.vue index 5bbecc9..563a731 100644 --- a/src/components/Template/StepComponents/ry/qywz.vue +++ b/src/components/Template/StepComponents/ry/qywz.vue @@ -33,7 +33,9 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js'; type:"text", }, zl:{ - type:"span", + type:"input", + fillType:"actFill", + disabled:true, }, text3:{ diff --git a/src/components/Template/StepComponents/ry/zlfz.vue b/src/components/Template/StepComponents/ry/zlfz.vue new file mode 100644 index 0000000..a070892 --- /dev/null +++ b/src/components/Template/StepComponents/ry/zlfz.vue @@ -0,0 +1,52 @@ + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue index b1a6dc1..457e609 100644 --- a/src/components/Template/StepFormPackage.vue +++ b/src/components/Template/StepFormPackage.vue @@ -47,6 +47,9 @@ +
{{sItem.otherLabel ? $t(sItem.otherLabel) : $t("template.common.other") }}
@@ -64,6 +67,7 @@