diff --git a/src/lang/en/template/bl.js b/src/lang/en/template/bl.js index 1f9f5d3..8b1ac02 100644 --- a/src/lang/en/template/bl.js +++ b/src/lang/en/template/bl.js @@ -4,7 +4,7 @@ export default { fhsj: '复核时间', ybsm: '样本说明', smybh: '扫描仪编号', - dwypbh: '动物/样品编号', + dwypbh: '动物/样本编号', qprsbh: '切片/染色编号', smryqrxx: '扫描人员确认信息', ztblxjqrxx: '专题病理学家确认信息', diff --git a/src/lang/zh/template/bl.js b/src/lang/zh/template/bl.js index 1f9f5d3..8b1ac02 100644 --- a/src/lang/zh/template/bl.js +++ b/src/lang/zh/template/bl.js @@ -4,7 +4,7 @@ export default { fhsj: '复核时间', ybsm: '样本说明', smybh: '扫描仪编号', - dwypbh: '动物/样品编号', + dwypbh: '动物/样本编号', qprsbh: '切片/染色编号', smryqrxx: '扫描人员确认信息', ztblxjqrxx: '专题病理学家确认信息', diff --git a/src/views/business/comps/template/comps/bl/BL001.vue b/src/views/business/comps/template/comps/bl/BL001.vue index 7aaa37b..4fe1a10 100644 --- a/src/views/business/comps/template/comps/bl/BL001.vue +++ b/src/views/business/comps/template/comps/bl/BL001.vue @@ -293,7 +293,7 @@ export default { fillType: 'actFill', maxlength: 200, subType: 'button', - subKey: 'yjsj', + subKey: 'yjsjButton', buttonName: 'template.dj.dj003.hqsj', }, dsfs: { @@ -351,7 +351,7 @@ export default { // 点击按钮 handleClickButton(_item, signData) { this.$refs.yjczxxRef.updateFormData( - _item.subKey, + _item?.subKey?.replace("Button", ""), moment().format('YYYY/MM/DD HH:mm'), { isUpdateRecord: true, signData } ) diff --git a/src/views/business/comps/template/comps/bl/BL002.vue b/src/views/business/comps/template/comps/bl/BL002.vue index 9ff31c5..038979e 100644 --- a/src/views/business/comps/template/comps/bl/BL002.vue +++ b/src/views/business/comps/template/comps/bl/BL002.vue @@ -158,22 +158,6 @@ export default { } } }, - { - type: 'cellItem', - label: 'template.bl.bl002.fhsj', - config: { - startDate: { - label: 'template.common.startTime', - type: 'input', - disabled: true - }, - endDate: { - label: 'template.common.endTime', - type: 'input', - disabled: true - } - } - } ] }, diff --git a/src/views/business/comps/template/comps/dj/DJ002.vue b/src/views/business/comps/template/comps/dj/DJ002.vue index 2a98555..ae5b193 100644 --- a/src/views/business/comps/template/comps/dj/DJ002.vue +++ b/src/views/business/comps/template/comps/dj/DJ002.vue @@ -277,7 +277,7 @@ export default { fillType: 'actFill', maxlength: 200, subType: 'button', - subKey: 'yjsj', + subKey: 'yjsjButton', buttonName: 'template.dj.dj003.hqsj', }, dsfs: { @@ -335,7 +335,7 @@ export default { // 点击按钮 handleClickButton(_item, signData) { this.$refs.yjczxxRef.updateFormData( - _item.subKey, + _item?.subKey?.replace("Button", ""), moment().format('YYYY/MM/DD HH:mm'), { isUpdateRecord: true, signData } ) diff --git a/src/views/business/comps/template/comps/dj/DJ003.vue b/src/views/business/comps/template/comps/dj/DJ003.vue index 99ef70f..eef69bc 100644 --- a/src/views/business/comps/template/comps/dj/DJ003.vue +++ b/src/views/business/comps/template/comps/dj/DJ003.vue @@ -233,7 +233,7 @@ export default { fillType: 'actFill', maxlength: 200, subType: 'button', - subKey: 'yjsj', + subKey: 'yjsjButton', buttonName: 'template.dj.dj003.hqsj', }, dsfs: { @@ -287,7 +287,7 @@ export default { // 点击按钮 handleClickButton(_item, signData) { this.$refs.yjczxxRef.updateFormData( - _item.subKey, + _item?.subKey?.replace("Button", ""), moment().format('YYYY/MM/DD HH:mm'), { isUpdateRecord: true, signData } ) diff --git a/src/views/business/comps/template/comps/dl/DL003.vue b/src/views/business/comps/template/comps/dl/DL003.vue index abb327f..6deac9f 100644 --- a/src/views/business/comps/template/comps/dl/DL003.vue +++ b/src/views/business/comps/template/comps/dl/DL003.vue @@ -224,7 +224,8 @@ export default { fillType: 'actFill', maxlength: 200, subType: 'button', - subKey: 'jzkssj', + subKey: 'jzkssjButton', + subDisabled: this.fillType !== 'actFill', buttonName: 'template.dl.dl003.ksButton', }, jzjssj: { @@ -233,7 +234,7 @@ export default { fillType: 'actFill', maxlength: 200, subType: 'button', - subKey: 'jzjssj', + subKey: 'jzjssjButton', buttonName: 'template.dl.dl003.jsButton', }, fssygbh: { @@ -271,7 +272,7 @@ export default { fillType: 'actFill', type: 'input', subType: 'button', - subKey: 'pykssj', + subKey: 'pykssjButton', buttonName: 'template.dl.dl003.ksButton', }, @@ -343,7 +344,7 @@ export default { // 点击按钮 handleClickButton(_item, signData) { this.$refs.czInfoRef.updateFormData( - _item.subKey, + _item?.subKey?.replace("Button", ""), moment().format('YYYY/MM/DD HH:mm'), { isUpdateRecord: true, signData } ) diff --git a/src/views/business/comps/template/comps/dl/DL004.vue b/src/views/business/comps/template/comps/dl/DL004.vue index 9dd10c2..10fbfb9 100644 --- a/src/views/business/comps/template/comps/dl/DL004.vue +++ b/src/views/business/comps/template/comps/dl/DL004.vue @@ -196,7 +196,7 @@ export default { fillType: 'actFill', maxlength: 200, subType: 'button', - subKey: 'pykssj', + subKey: 'pykssjButton', buttonName: 'template.dl.dl003.ksButton', }, pyjssj: { @@ -205,7 +205,7 @@ export default { fillType: 'actFill', maxlength: 200, subType: 'button', - subKey: 'pyjssj', + subKey: 'pyjssjButton', buttonName: 'template.dl.dl003.jsButton', }, } @@ -259,7 +259,7 @@ export default { // 点击按钮 handleClickButton(_item, signData) { this.$refs.czInfoRef.updateFormData( - _item.subKey, + _item?.subKey?.replace("Button", ""), moment().format('YYYY/MM/DD HH:mm'), { isUpdateRecord: true, signData } ) diff --git a/src/views/business/comps/template/comps/dl/DL006.vue b/src/views/business/comps/template/comps/dl/DL006.vue index 81be375..ddc9eda 100644 --- a/src/views/business/comps/template/comps/dl/DL006.vue +++ b/src/views/business/comps/template/comps/dl/DL006.vue @@ -290,7 +290,7 @@ export default { fillType: 'preFill', subType: 'button', isClearForm: true, - subKey: 'jlzsl', + subKey: 'jlzslButton', buttonName: 'form.saveConfirm', maxlength: 2, },