diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index 6267f5c..4cf5c6f 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -121,6 +121,13 @@ import zyfc from './StepComponents/swypfx/zyfc.vue';//生物样品分析-转移
//生物样品分析-孵育:使用溶液-孵育
//生物样品分析-复溶:使用溶液-复溶
+
+
+//色谱匀浆组织表
+import jszz from './StepComponents/spyjzzb/jszz.vue';//色谱匀浆组织表-剪碎组织
+//色谱匀浆组织表-称取组织:使用色谱匀浆组织表-剪碎组织
+//色谱匀浆组织表-匀浆液混合:使用色谱匀浆组织表-剪碎组织
+
import { public_templateStepList } from '@/api/business/public/public';
@@ -245,7 +252,10 @@ export default {
//生物样品分析
jryp,
hhspe,
- zyfc
+ zyfc,
+
+ //色谱匀浆组织表
+ jszz,
},
computed: {
stepComponentMap() {
@@ -334,6 +344,12 @@ export default {
'xtspe': 'hhspe',
'zyfc': 'zyfc',
+
+ //色谱匀浆组织表
+ 'jszz':'jszz',
+ 'cqzz':'jszz',
+ 'yjyhh':'jszz',
+
}
}
return this.componentMap
diff --git a/src/components/Template/StepComponents/b/cl.vue b/src/components/Template/StepComponents/b/cl.vue
index 3be8500..72b8960 100644
--- a/src/components/Template/StepComponents/b/cl.vue
+++ b/src/components/Template/StepComponents/b/cl.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/components/Template/StepComponents/b/jrry_b.vue b/src/components/Template/StepComponents/b/jrry_b.vue
index b991793..b66c204 100644
--- a/src/components/Template/StepComponents/b/jrry_b.vue
+++ b/src/components/Template/StepComponents/b/jrry_b.vue
@@ -1,6 +1,6 @@
-
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/swypfx/hhspe.vue b/src/components/Template/StepComponents/swypfx/hhspe.vue
index b6d686e..2a703e5 100644
--- a/src/components/Template/StepComponents/swypfx/hhspe.vue
+++ b/src/components/Template/StepComponents/swypfx/hhspe.vue
@@ -1,6 +1,6 @@
-
+
+
\ No newline at end of file
diff --git a/src/views/business/comps/template/dialog/ImportExcelDialog.vue b/src/views/business/comps/template/dialog/ImportExcelDialog.vue
index e1029fa..64cc34b 100644
--- a/src/views/business/comps/template/dialog/ImportExcelDialog.vue
+++ b/src/views/business/comps/template/dialog/ImportExcelDialog.vue
@@ -93,7 +93,7 @@ export default {
const jsonData = XLSX.utils.sheet_to_json(worksheet, { header: 1 })
this.excelData = jsonData
this.$emit('onLoadData', this.excelData)
- this.$refs.fileUpload.handleRemove(file)
+ this.$refs.upload.handleRemove(file)
} catch (error) {
console.error('解析失败:', error)
this.$modal.msgError('文件解析失败,请检查格式', error)
diff --git a/src/views/business/comps/template/formConfig/PCRTableConfig.js b/src/views/business/comps/template/formConfig/PCRTableConfig.js
index cbaacc9..496f153 100644
--- a/src/views/business/comps/template/formConfig/PCRTableConfig.js
+++ b/src/views/business/comps/template/formConfig/PCRTableConfig.js
@@ -756,4 +756,65 @@ export const getPCR007Config = ($this) => {
bodySubPlaceholder: 'template.common.xswsPlaceholder',
}
]
+}
+
+// PCR009
+export const getPCR009Config = ($this) => {
+ return [
+ {
+ label: 'template.pcr.pcr009.ypmc',
+ prop: 'ypmc',
+ width: 280,
+ bodyType: 'input',
+ fillType: 'preFill',
+ otherCode: 'bhOther',
+ bodyFillType: 'preFill',
+ },
+ {
+ label: 'template.pcr.pcr009.zzz',
+ prop: 'zzz',
+ width: 280,
+ showWidth: 180,
+ fillType: 'preFill',
+ headerSelectKey: 'zzzUnit',
+ headerOptions: $this.getDictOptions('business_tjdw'),
+ bodyType: 'inputNumber',
+ bodyFillType: 'preFill',
+ bodyMaxlength: 10,
+ },
+ {
+ label: 'template.pcr.pcr009.ysyjrybjrl',
+ prop: 'ysyjrybjrl',
+ width: 280,
+ showWidth: 180,
+ fillType: 'preFill',
+ headerSelectKey: 'ysyjrybjrlUnit',
+ headerOptions: $this.getDictOptions('business_tjdw'),
+ bodyType: 'inputNumber',
+ bodyFillType: 'actFill',
+ bodyMaxlength: 10,
+ bodySubType: 'inputNumber',
+ bodySubKey: 'targetStartSolutionVolumePrecision',
+ bodySubFillType: 'preFill',
+ showBodySub: $this.fillType === 'preFill',
+ bodyPrecisionKey: 'targetStartSolutionVolumePrecision',
+ bodyMaxlength: 10,
+ bodyDisabled: $this.fillType === 'preFill',
+ bodySubPlaceholder: 'template.common.xswsPlaceholder',
+ headerSelectTo:"actStartSolutionVolumeUnit",
+ },
+ {
+ label: 'template.pcr.pcr009.sjyjrybjrl',
+ prop: 'sjyjrybjrl',
+ width: 280,
+ showWidth: 180,
+ fillType: 'preFill',
+ headerSelectKey: 'sjyjrybjrlUnit',
+ headerOptions: $this.getDictOptions('business_tjdw'),
+ bodyType: 'inputNumber',
+ bodyFillType: 'actFill',
+ copyFrom: 'ysyjrybjrl', //复制哪个字段
+ bodyMaxlength: 10,
+ }
+ ]
}
\ No newline at end of file
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 52f8d54..1e286b9 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -14,6 +14,7 @@ export default {
'business_cctj',
'business_nddw',
'business_tjdw',
+ 'business_zldw',
'business_yxqdw',
'business_rqcz',