diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue index f2f5caf..debf7d4 100644 --- a/src/components/Template/BaseInfoFormPackage.vue +++ b/src/components/Template/BaseInfoFormPackage.vue @@ -444,9 +444,7 @@ export default { const arr = ["动物种属", "细胞系"]; return arr.includes(value) }, - onBeforeReagentSubmit(data, callback, key) { - this.$emit('beforeReagentSubmit', { selectData: data, callback, key, formFields: this.formFields }) - }, + // 点击按钮 handleClickButton(e, item, val, data, key) { if (!item.isClearForm) { diff --git a/src/components/Template/StepComponents/ry/cs.vue b/src/components/Template/StepComponents/ry/cs.vue index 45e5b23..319d2b5 100644 --- a/src/components/Template/StepComponents/ry/cs.vue +++ b/src/components/Template/StepComponents/ry/cs.vue @@ -64,7 +64,7 @@ export default { fillType: "preFill", }, text5: { - label: ",实际时长为", + label: ",实际设置时长为", type: "text", }, sjsc: { diff --git a/src/components/Template/StepComponents/ry/dc.vue b/src/components/Template/StepComponents/ry/dc.vue index ba15dc4..da30953 100644 --- a/src/components/Template/StepComponents/ry/dc.vue +++ b/src/components/Template/StepComponents/ry/dc.vue @@ -39,7 +39,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js'; fillType:"preFill", }, text3:{ - label:"°C,实际温度为", + label:"°C,实际温度设置为", type:"text", }, actTemp:{ diff --git a/src/components/Template/StepComponents/ry/fs.vue b/src/components/Template/StepComponents/ry/fs.vue index c5f036d..389d3c0 100644 --- a/src/components/Template/StepComponents/ry/fs.vue +++ b/src/components/Template/StepComponents/ry/fs.vue @@ -34,7 +34,7 @@ export default { fillType: "preFill", }, text3: { - label: "°C,实际温度", + label: "°C,实际温度设置为", type: "text", }, sjwd: { diff --git a/src/components/Template/StepComponents/ry/jb.vue b/src/components/Template/StepComponents/ry/jb.vue index deace07..5b7af09 100644 --- a/src/components/Template/StepComponents/ry/jb.vue +++ b/src/components/Template/StepComponents/ry/jb.vue @@ -46,7 +46,7 @@ export default { fillType: "preFill", }, text5: { - label: "实际转速为", + label: "实际转速设置为", type: "text", }, sjzs: { diff --git a/src/components/Template/StepComponents/ry/jrjb.vue b/src/components/Template/StepComponents/ry/jrjb.vue index 406279e..ad6344a 100644 --- a/src/components/Template/StepComponents/ry/jrjb.vue +++ b/src/components/Template/StepComponents/ry/jrjb.vue @@ -49,7 +49,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js'; copyFrom:"yjwd" }, text4:{ - label:",设置预计转速为", + label:"°C,设置预计转速为", type:"text", }, yjzs2:{ @@ -63,7 +63,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js'; fillType:"preFill", }, text5:{ - label:"实际转速为", + label:"实际转速设置为", type:"text", }, sjzs:{ diff --git a/src/components/Template/StepComponents/ry/sy.vue b/src/components/Template/StepComponents/ry/sy.vue index 7ad349d..d44d803 100644 --- a/src/components/Template/StepComponents/ry/sy.vue +++ b/src/components/Template/StepComponents/ry/sy.vue @@ -39,7 +39,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js'; fillType:"preFill", }, text3:{ - label:"°C,实际温度为", + label:"°C,实际温度设置为", type:"text", }, actTemp:{ diff --git a/src/components/Template/StepComponents/ry/zlfz.vue b/src/components/Template/StepComponents/ry/zlfz.vue index e818924..6745b51 100644 --- a/src/components/Template/StepComponents/ry/zlfz.vue +++ b/src/components/Template/StepComponents/ry/zlfz.vue @@ -2,15 +2,15 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/business/comps/template/comps/sp/SP00456.vue b/src/views/business/comps/template/comps/sp/SP00456.vue index 456f193..4e13241 100644 --- a/src/views/business/comps/template/comps/sp/SP00456.vue +++ b/src/views/business/comps/template/comps/sp/SP00456.vue @@ -83,7 +83,7 @@ :showOperation="fillType === 'actFill' || fillType === 'preFill'" :tableColumns="ladderStepColumns" :prefixKey="'ladder_1_' + ladderIndex" :configType="'ladder'" :ref="`ladderRef_1_${ladderIndex}`" - :fieldItemLabel="'template.lba.lba005.zkpz'" + :fieldItemLabel="getTableLabel('ladder')" @deleteConfig="deleteConfig('ladderConfigs_1', ladderConfig)" :fillType="fillType" /> @@ -94,7 +94,7 @@ :showOperation="fillType === 'actFill' || fillType === 'preFill'" :tableColumns="paralleStepColumns1" :prefixKey="'paralle_1_' + paralleIndex" :configType="'paralle'" :ref="`paralleRef_1_${paralleIndex}`" - :fieldItemLabel="'template.lba.lba005.zkpz'" + :fieldItemLabel="getTableLabel('paralle')" @deleteConfig="deleteConfig('paralleConfigs_1', paralleConfig)" :fillType="fillType" /> diff --git a/src/views/business/comps/template/formConfig/xb/xb001.js b/src/views/business/comps/template/formConfig/xb/xb001.js index f10f685..1d252bc 100644 --- a/src/views/business/comps/template/formConfig/xb/xb001.js +++ b/src/views/business/comps/template/formConfig/xb/xb001.js @@ -296,7 +296,7 @@ export const getStepFivth = ($this) => { fillType: 'preFill' }, text4: { - label: '℃,实际温度', + label: '℃,实际温度设置', type: 'text' }, sjwd: {