diff --git a/src/views/business/comps/template/comps/pcr/PCR010.vue b/src/views/business/comps/template/comps/pcr/PCR010.vue
new file mode 100644
index 0000000..bafd71e
--- /dev/null
+++ b/src/views/business/comps/template/comps/pcr/PCR010.vue
@@ -0,0 +1,371 @@
+<!-- PCR分析组织匀浆表-知组织重 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img
+					src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+
+					<LineLabel label="template.common.operationSteps" />
+					<div class="template-form-item">
+						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef"
+							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" />
+						<div v-if="fillType == 'preFill'">
+							<el-button type="primary" @click="downloadExcelTemplate">{{
+								$t('template.common.downloadTemplate') }}</el-button>
+							<el-button type="primary" @click="showImportExcelDialog">{{
+								$t('template.common.importTemplate')
+							}}</el-button>
+						</div>
+
+						<CustomTable @blur="onHandleTableBlur" @headerSelectChange="onHandleTableBlur"
+							:ref="`stepTableRef`" :columns="tableStepColumns" :formData="formData" :prefixKey="`table`"
+							:showOperation="fillType === 'preFill'" fieldItemLabel="template.common.operationSteps">
+							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+								<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
+									@deleteRow="(rowIndex) => deleteRow(rowIndex)"></TableOpertaion>
+							</template>
+						</CustomTable>
+					</div>
+					<Step ref="stepRef" :formData="formData.stepData"></Step>
+
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadExcelData" />
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin.js";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import { isValueEmpty } from '@/utils/index';
+import { getLatestSnArr } from '@/api/template';
+import { EventBus } from "@/utils/eventBus";
+import { volumeConverter } from "@/utils/volConverter";//体积单位转换
+import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
+import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
+import { getPCR009Config } from "../../formConfig/PCRTableConfig.js";
+import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
+import { addTj, subTj, uniqeResource, uniqeResourceOne, addDecimals } from "@/utils/calUnitTools";
+import ImportExcelDialog from '../../dialog/ImportExcelDialog'
+export default {
+	name: "PCR005",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog, ImportExcelDialog },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		tableStepColumns() {
+			return getPCR009Config(this);
+		},
+		// 附件表单配置
+		getFjFormConfig() {
+			return [
+				{
+					type: "attachment",
+					config: {
+						attTitle: {
+							label: 'template.pcr.pcr005.fj',
+							type: "attachment",
+							fillType: "actFill",
+						},
+					}
+				}
+			]
+		},
+		// 配置条件
+		storageFormConfig() {
+			return [
+				{
+					type: "conditionItem",
+					config: {
+						storageCondition: {
+							label: 'template.common.storageConditionLabel',
+							type: "select",
+							fillType: "preFill",
+							options: this.getDictOptions("business_cctj"),
+							otherCode: "storageConditionOther",
+						},
+					}
+				}
+			];
+		},
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+					}
+				},
+				{
+					type: "conditionItem",
+					label: 'template.common.processCondition',
+					config: {
+						pre: {
+							label: 'template.common.preFill',
+							type: "select",
+							multiple: true,
+							fillType: "preFill",
+							options: this.getDictOptions('business_pztj'),
+							otherCode: "preOther",
+						},
+						act: {
+							label: 'template.common.actualFill',
+							type: "select",
+							fillType: "actFill",
+							otherCode: "actOther",
+							multiple: true,
+							compareTo: "pre",
+							options: this.getDictOptions('business_pztj')
+						}
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.pcr.pcr009.clsj',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 操作步骤表单配置
+		stepFormConfig() {
+			return [
+				{
+					type: 'step',
+					config: {
+						yjry: {
+							label: 'template.pcr.pcr009.yjry',
+							type: 'input',
+							fillType: 'preFill',
+							subType: 'sj',
+							subKey: 'yjrybh',
+							subFillType: 'actFill',
+							maxlength: 20
+						},
+						bs: {
+							label: 'template.pcr.pcr009.bs',
+							type: 'inputNumber',
+							fillType: 'actFill',
+							maxlength: 20
+						},
+						yjyjry: {
+							label: 'template.pcr.pcr009.yjyjry',
+							type: 'inputNumber',
+							fillType: 'preFill',
+							subType: 'select',
+							subKey: 'yjyjryUnit',
+							subOptions: this.getDictOptions('business_tjdw'),
+							subFillType: 'preFill',
+							maxlength: 20
+						},
+					}
+				}
+			]
+		},
+	},
+	data() {
+		return {
+			reagentType: null, // 1-表单 2-表格
+			formData: {},
+			currentSubKey: "",//当前点击的子项key
+			currentType: "",//当前点击的类型
+			currentRowIndex: "",//当前点击的行索引
+		};
+	},
+	mounted() {
+		const formData = this.getFormDataByTemplateData();
+		this.onHandleTableBlur()
+	},
+	methods: {
+		downloadExcelTemplate() {
+			this.exportExcel(['样品名称', '组织重'], 'PCR分析组织匀浆表-知组织重导入模板')
+		},
+		//选择试剂提交事件
+		onSelectReagentSubmit(code, row) {
+
+		},
+		showImportExcelDialog() {
+			this.$refs.ImportExcelDialog.show()
+		},
+		onLoadExcelData(excelData) {
+			excelData.shift()
+			let list = []
+			excelData.forEach(item => {
+				list.push({
+					ypmc: item[0],
+					zzz: item[1],
+					targetStartSolutionVolumePrecision: 3
+				})
+			})
+			this.$refs.stepTableRef.addRows(list)
+			this.$refs.ImportExcelDialog.cancel()
+
+			setTimeout(() => {
+				this.justUpdateFilledFormData();
+			}, 100);
+		},
+		// 失去焦点，计算
+		onHandleTableBlur() {
+			this.updateTable()
+		},
+		onHandleBlur(fields) {
+			this.updateTable()
+		},
+		// 计算表格 预设匀浆溶液补加入量
+		updateTable() {
+			let content = this.getFilledFormData();
+
+			let bs = content.bs
+			content
+			if (this.fillType === "actFill") {
+				let tableList = content.stepTableFormData
+				if (tableList && tableList.length > 0) {
+					for (let i = 0; i < tableList.length; i++) {
+						let item = tableList[i]
+						let zzz = item.zzz * bs
+						// 组织重量 乘以 倍数 ）减去 已加匀浆溶液
+						const { total, unit } = subTj([zzz, content.yjyjry], [content.headerSelectFields.zzzUnit, content.yjyjryUnit])
+						let ysyjrybjrl = volumeConverter.convert(total + unit, content.headerSelectFields.ysyjrybjrlUnit)
+						tableList[i].ysyjrybjrl = ysyjrybjrl
+					}
+				}
+				this.$refs.stepTableRef.updateDataSource(tableList);
+			}
+		},
+		//获取已填写的表单数据
+		getFilledFormData() {
+			return this.getFilledFormDataByRefs(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"])
+		},
+		async getFormData() {
+			let content = await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"]);
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
+
+			//生成resource
+			let tmpResource = []
+			if (this.fillType === "actFill") {
+				let tableList = content.stepTableFormData
+				if (tableList && tableList.length > 0) {
+					for (let i = 0; i < tableList.length; i++) {
+						//配置的试剂
+						let item = tableList[i]
+						console.log('表格item:' + JSON.stringify(item))
+
+						//使用的
+
+						tmpResource.push({
+							mc: null,
+							bh: content.subSolution,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.ysxsyxytj,
+							type: 1,
+							elnType: this.product,
+							syldw: content.headerSelectFields.sjxsyxytjUnit,
+							yxzq: null,
+							yxzqdw: null,
+						})
+
+					}
+				}
+			}
+			if (tmpResource.length > 0) {
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			let content = this.$refs.stepRef.getStepResource();
+			console.log(content);
+
+		},
+		// 删除表格行
+		deleteRow(rowIndex) {
+			const stepTableRef = this.$refs['stepTableRef'];
+			if (stepTableRef) {
+				stepTableRef.deleteRow(rowIndex);
+			}
+		},
+
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/resource/gsp/comps/rkjl/Bj.vue b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
index aecdb21..9a9f254 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Bj.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
@@ -3,7 +3,6 @@
     <!-- 编辑弹窗 -->
     <el-dialog :title="$t('form.edit')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <div class="sbzdtcma"> <input type="text"> <input  type="password" show-password> </div>
         <el-row>
           <!-- 名称 -->
           <el-col :span="12">
@@ -20,16 +19,16 @@
         </el-row>
         <el-row>
           <!-- 规格 -->
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="gg">
               <el-input type="text" v-model="form.gg" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
           <!-- 规格单位 -->
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <BusinessSelect v-model="form.ggdw"
               dictType="business_nddw,business_zldw,business_tjdw"></BusinessSelect>
-          </el-col>
+          </el-col> -->
           <!-- 入库时间 -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.rksj')" prop="rksj">
@@ -204,20 +203,10 @@ export default {
     show(row) {
       this.reset()
       info({id: row.id}).then(response => {
-        this.form.id = response.data.id
-        this.form.mc = response.data.mc
-        this.form.ph = response.data.ph
-        this.form.gg = response.data.gg
-        this.form.ggdw = response.data.ggdw
-        this.form.rkl = response.data.rkl
-        this.form.rkdw = response.data.rkdw
-        this.form.rksj = response.data.rksj
-        this.form.cctj = response.data.cctj
-        this.form.zysx = response.data.zysx
-        this.form.qmyy = '编辑供试品入库记录'
-        console.log(this.form)
-        this.open = true
+        this.form = response.data
 
+        this.form.qmyy = this.$t('page.business.resource.gsp.bjgsprkjl'),
+        this.open = true
       })
     },
     save() {
diff --git a/src/views/business/resource/gsp/comps/rkjl/Xq.vue b/src/views/business/resource/gsp/comps/rkjl/Xq.vue
index a4b1568..c9f0c9b 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Xq.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Xq.vue
@@ -25,15 +25,14 @@
             <el-input type="text" :value="form.mc" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="left-title">{{ $t('page.business.resource.gsp.ph') }}</div>
+            <div class="right-title">{{ $t('page.business.resource.gsp.ph') }}</div>
             <el-input type="text" :value="form.ph" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="right-title">{{ $t('page.business.resource.gsp.gg') }}</div>
+            <div class="left-title">{{ $t('page.business.resource.gsp.gg') }}</div>
             <el-input type="text" :value="form.gg" maxlength="50" disabled>
-              <template slot="append">{{ form.ggdw }}</template>
             </el-input>
           </div>
           <div class="right">
diff --git a/src/views/business/resource/gsp/comps/rkjl/Xz.vue b/src/views/business/resource/gsp/comps/rkjl/Xz.vue
index 0f4eb5c..fbca554 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Xz.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Xz.vue
@@ -20,16 +20,16 @@
         </el-row>
         <el-row>
           <!-- 规格 -->
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="gg">
               <el-input type="text" v-model="form.gg" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
           <!-- 规格单位 -->
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <BusinessSelect v-model="form.ggdw"
               dictType="business_nddw,business_zldw,business_tjdw"></BusinessSelect>
-          </el-col>
+          </el-col> -->
           <!-- 入库时间 -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.rksj')" prop="rksj">
diff --git a/src/views/business/resource/gsp/comps/rkjlList.vue b/src/views/business/resource/gsp/comps/rkjlList.vue
index 6044664..7d7e69f 100644
--- a/src/views/business/resource/gsp/comps/rkjlList.vue
+++ b/src/views/business/resource/gsp/comps/rkjlList.vue
@@ -92,7 +92,8 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.gsp.gg')" align="center">
             <template slot-scope="scope">
-              {{ scope.row.gg }} {{ scope.row.ggdw }}
+              {{ scope.row.gg }}
+              <!-- {{ scope.row.ggdw }} -->
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.gsp.rksj')" align="center" prop="rksj" width="150px"
@@ -303,7 +304,7 @@ export default {
             '&nbsp;' + value.ph +
             '</td>' +
             ' <td>' +
-            value.gg + value.ggdw +
+            value.gg +
             '</td>' +
             ' <td>' +
             value.rksj +