-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -34,6 +32,11 @@ import TableList from "@/components/Template/Table";
import Step from "@/components/Template/Step";
import templateMixin from "../../mixins/templateMixin";
import CustomTable from '@/components/Template/CustomTable.vue'
+
+const volumeUnitOptions = [
+ { label: 'mg', value: 'mg' },
+ { label: 'ng', value: 'ng' },
+]
export default {
name: "SWYPFXRYPZB",
components: { BaseInfoFormPcakge,LineLabel,TableList,Step,CustomTable },
@@ -55,75 +58,50 @@ export default {
data() {
return {
dataSource:[{name:"名称1"}],
- stepDataSource:[{
- code1:"目标溶液编号1",
- code1:"目标溶液编号1",
- code1:"目标溶液编号1",
- code1:"目标溶液编号1",
- code1:"目标溶液编号1",
- code1:"目标溶液编号1",
- code1:"目标溶液编号1",
- code1:"目标溶液编号1",
- code1:"目标溶液编号1",
- code2:"起始溶液编号1",
- code3:"预设起始溶液体积1",
- code4:"实际起始溶液体积1",
- code5:"预设稀释液体积1",
- code6:"实际稀释液体积1",
- code7:"预设目标溶液浓度1",
- code8:"实际目标溶液浓度1",
- }],
- stepColumns:[
- {label:"目标溶液编号",prop:"code1",width: 120},
- {label:"起始溶液编号",prop:"code2",width: 120},
- {label:"起始溶液编号",prop:"code2",width: 120},
- {label:"起始溶液编号",prop:"code2",width: 120},
- {label:"起始溶液编号",prop:"code2",width: 120},
- {label:"起始溶液编号",prop:"code2",width: 120},
- {label:"起始溶液编号",prop:"code2",width: 120},
- {label:"起始溶液编号",prop:"code2",width: 120},
- {label:"起始溶液编号",prop:"code2",width: 120},
- {
- label:"预设起始溶液体积",prop:"code3",showSelect: true,
- options: [
- { label: 'mg', value: 'mg' },
- { label: 'ng', value: 'ng' },
- ]
- },
+ stepDataSource:[
{
- label:"实际起始溶液体积",prop:"code4",showSelect: true,width: 180,
- options: [
- { label: 'mg', value: 'mg' },
- { label: 'ng', value: 'ng' },
- ]
+ code1:"目标溶液编号1",
+ code2:"起始溶液编号1",
},
{
- label:"预设稀释液体积",prop:"code5",showSelect: true,width: 180,
- options: [
- { label: 'mg', value: 'mg' },
- { label: 'ng', value: 'ng' },
- ]
+ code1:"目标溶液编号2",
+ code2:"起始溶液编号2",
},
+ ],
+ stepColumns:[
+ {label:"目标溶液编号",prop:"code1",width: 120},
{
- label:"实际稀释液体积",prop:"code6",showSelect: true,width: 180,
- options: [
- { label: 'mg', value: 'mg' },
- { label: 'ng', value: 'ng' },
- ]
+ label:"起始溶液编号",prop:"code2",
+ width: 280,
+ bodyType:"input",
+ bodyFillType:"actFill",
+ bodyMaxLength:10,
},
{
- label:"预设目标溶液浓度",prop:"code7",showSelect: true,width: 180,
- options: [
- { label: 'mg', value: 'mg' },
- { label: 'ng', value: 'ng' },
- ]
+ label:"预设起始溶液体积",prop:"code3",
+ width: 280,
+ headerSelectKey:"volumeUnit1",
+ fillType:"preFill",
+ headerOptions:volumeUnitOptions,
+ defaultValue:"mg",
+ bodyType:"inputNumber",
+ bodySubType:"precisionNumber",
+ bodySubKey:"volumePrecision1",
+ bodyFillType:"preFill",
+ bodySubFillType:"preFill",
},
{
- label:"实际目标溶液浓度",prop:"code8",showSelect: true,width: 180,
- options: [
- { label: 'mg', value: 'mg' },
- { label: 'ng', value: 'ng' },
- ]
+ label:"预设起始溶液体积",prop:"code4",
+ width: 280,
+ headerSelectKey:"volumeUnit2",
+ fillType:"preFill",
+ headerOptions:volumeUnitOptions,
+ defaultValue:"mg",
+ bodyType:"inputNumber",
+ bodySubType:"precisionNumber",
+ bodySubKey:"volumePrecision2",
+ bodyFillType:"preFill",
+ bodySubFillType:"preFill",
},
],
sysjColumns:[
@@ -267,25 +245,26 @@ export default {
mounted() {
setTimeout(()=>{
this.formData = {
- // code:"code1",name:"name1",act:["1","-1"],taget1:"mg",targetCode1:"123456",taget1c:"可点击"
+ code:"code1",name:"name1",act:["1","-1"],taget1:"mg",targetCode1:"123456",taget1c:"可点击"
}
- },3000)
+ },300)
setTimeout(()=>{
this.storageFormConfig[0].config.storageCondition1.options = [
{label:"白光",value:"1"},
{label:"黄光",value:"3"},
{label:"其他",value:"-1"},
]
- },4000)
+ },400)
},
methods: {
async onSave(){
// const result1 = await this.$refs.baseInfo.getFormData();
// const result2 = await this.$refs.storageCondition.getFormData();
// const result3 = await this.$refs.stepRef.getFormData();
- const result = await this.$refs.stepFormPackage.getFormData();
- console.log(result,"reee")
+ // const result = await this.$refs.stepFormPackage.getFormData();
+ const result1 = await this.$refs.stepTable.getFormData();
+ console.log(result1,"reee")
}
}
};
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
index a3387ea..094f877 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
@@ -6,21 +6,22 @@
src="@/assets/images/detail-title.png" />