From b2ec59b2f81509b5bd48a5e1ea2c6ed5c566f8eb Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Sat, 28 Feb 2026 12:26:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E8=A1=A8=E5=8D=95=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=E7=89=A9=E8=B5=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en/template/commonTemplate.js             |   6 +
 src/lang/zh/template/commonTemplate.js             |   6 +
 .../business/comps/template/TemplateTable.vue      |   5 +-
 .../business/comps/template/comps/dl/SYWZPZJHB.vue | 232 -----------
 .../comps/template/comps/gsp/DMYPPZJLB.vue         |   4 +-
 .../business/comps/template/comps/gsp/GSP001.vue   | 441 +++++++++++++++++++++
 .../business/comps/template/comps/gsp/GSP002.vue   |   5 +-
 .../business/comps/template/comps/gsp/GSP003.vue   |   4 +-
 .../business/comps/template/comps/gsp/GSP004.vue   |   4 +-
 .../business/comps/template/comps/gsp/GSP009.vue   |   4 +-
 .../business/comps/template/comps/gsp/GSP010.vue   |   4 +-
 .../business/comps/template/comps/sp/SP001.vue     |   4 +-
 .../business/comps/template/comps/sp/SP003.vue     |   3 +-
 .../business/comps/template/comps/sp/SP00456.vue   |   3 +-
 .../comps/template/mixins/templateMixin.js         |  66 ++-
 15 files changed, 532 insertions(+), 259 deletions(-)
 delete mode 100644 src/views/business/comps/template/comps/dl/SYWZPZJHB.vue
 create mode 100644 src/views/business/comps/template/comps/gsp/GSP001.vue

diff --git a/src/lang/en/template/commonTemplate.js b/src/lang/en/template/commonTemplate.js
index cf744fc..08f96da 100644
--- a/src/lang/en/template/commonTemplate.js
+++ b/src/lang/en/template/commonTemplate.js
@@ -20,6 +20,12 @@ export default {
   jtpz:'阶梯配制',
 
   // 字段标签
+  sjInfo:'Reagent Info',
+  gyzjInfo:'Formulation Info',
+  gspInfo:'Specimen Info',
+  gspsywzInfo:'试验物资信息',
+  mjyInfo:'Controlled Drug Info',
+
   storageConditionLabel: 'Storage Condition',
   testName: 'Study Name',
   testNumber: 'Study Number',
diff --git a/src/lang/zh/template/commonTemplate.js b/src/lang/zh/template/commonTemplate.js
index e38b352..1fa0ae9 100644
--- a/src/lang/zh/template/commonTemplate.js
+++ b/src/lang/zh/template/commonTemplate.js
@@ -4,6 +4,12 @@ export default {
 
   // 标签
   baseInfo: '试验基本信息',
+  sjInfo:'试验试剂信息',
+  gyzjInfo:'给药制剂信息',
+  gspInfo:'供试品信息',
+  gspsywzInfo:'试验物资信息',
+  mjyInfo:'麻精药信息',
+
   reagentInfo: '试验试剂信息',
   wzInfo: '试验物资信息',
   instrumentInfo: '仪器使用信息',
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index a5d7f89..19c13ac 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -33,6 +33,7 @@ import SP009 from "./comps/sp/SP009.vue";
 import SP0019 from "./comps/sp/SP0019.vue";
 import Demo from "./comps/sp/Demo.vue";
 //供试品
+import GSP001 from "./comps/gsp/GSP001.vue";
 import GSP002 from "./comps/gsp/GSP002.vue";
 import GSP003 from "./comps/gsp/GSP003.vue";
 import GSP004 from "./comps/gsp/GSP004.vue";
@@ -98,7 +99,7 @@ export default {
     //试验物质配制计划表/麻精药领取申请单/毒麻药品配制记录表
     MJYLQSQD, SYWZPZJHB, DMYPPZJLB,
     //供试品
-    GSP002, GSP003, GSP004,GSP009, GSP010,
+    GSP001,GSP002, GSP003, GSP004,GSP009, GSP010,
     //色谱
     SP001, SP003, SP00456,SP007, SP008, SP009,SP0019,
     // PCR
@@ -188,7 +189,7 @@ export default {
           'SP019': 'SP0019',
           //供试品
 
-          'GSP001': 'DMYPPZJLB',
+          'GSP001': 'GSP001',
           'GSP002': 'GSP002',
           'GSP003': 'GSP003',
           'GSP004': 'GSP004',
diff --git a/src/views/business/comps/template/comps/dl/SYWZPZJHB.vue b/src/views/business/comps/template/comps/dl/SYWZPZJHB.vue
deleted file mode 100644
index 39d145d..0000000
--- a/src/views/business/comps/template/comps/dl/SYWZPZJHB.vue
+++ /dev/null
@@ -1,232 +0,0 @@
-<!-- 试验物质配制计划表 -->
-<template>
-	<div>
-		<div class="detail-container">
-			<div class="detail-title"><img src="@/assets/images/detail-title.png">试验物质配制计划表<img
-					src="@/assets/images/detail-title.png" /></div>
-			<div class="detail-content">
-				<div class="content">
-					<BaseInfoFormPackage label="试验基本信息" ref="baseInfoRef" :formConfig="baseInfoFormConfig"
-						:formData="formData" />
-					<LineLabel label="计划信息" />
-					<div class="template-form-item">
-						<BaseInfoFormPackage  ref="stepFormPackageRef" :formConfig="stepFormConfig" @blur="onHandleBlur"
-							:formData="formData" />
-						<CustomTable @blur="onHandleTableBlur" :showHeaderSelect="fillType === 'actFill'" :showOperation="fillType === 'actFill'" ref="stepTableRef" :columns="stepColumns"
-							:formData="formData" >
-							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns" @deleteRow="deleteRow"></TableOpertaion>
-							</template>
-						</CustomTable>
-						<div class="add-row">
-							<el-button type="primary" plain @click="addRow">添加行</el-button>
-						</div>
-					</div>
-					<BaseInfoFormPackage label="特别说明" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
-
-				</div>
-			</div>
-			<button @click="onSave">保存</button>
-		</div>
-	</div>
-</template>
-
-<script>
-import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
-import LineLabel from "@/components/Template/LineLabel";
-import templateMixin from "../../mixins/templateMixin";
-import CustomTable from '@/components/Template/CustomTable.vue';
-import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
-
-export default {
-	name: "SYWZPZJHB",
-	components: { BaseInfoFormPackage, LineLabel, CustomTable, TableOpertaion },		
-	mixins: [templateMixin],
-	props: {
-		value: {
-			type: {},
-			default: () => { },
-		},
-		fillType: {
-			type: String,
-			default: 'preFill',
-		},
-	},
-	watch: {
-		value: {
-			immediate: true,
-			handler(v) {
-
-			}
-		},
-		fillType: {
-			immediate: true,
-			handler(v) {
-				console.log(v,"fillType")
-			}
-		},
-	},
-	computed: {
-		
-		// 备注表单配置
-		remarkConig() {
-			return [
-				{
-					type: "cellItem",
-					config: {
-						remark: {
-							label: "",
-							type: "textarea",
-							fillType: "actFill",
-							span: 1,
-							placeholder: "请输入特别说明",
-							maxlength: 1000,
-							rows: 5
-						}
-					}
-				}
-			]
-		},
-		// 试验基本信息表单配置
-		baseInfoFormConfig() {
-			return [
-				{
-					type: "cardItem",
-					config: {
-						studyMc: {
-							label: "试验名称",
-							type: "input",
-							disabled: true,
-						},
-						studySn: {
-							label: "试验编号",
-							type: "input",
-							disabled: true,
-						},
-
-					}
-				},
-			]
-		},
-		// 操作步骤表单配置
-		stepFormConfig() {
-			return [
-				{
-					type: "step",
-					config: {
-						drawTime: {
-							label: "领取时间",
-							type: "input",
-							fillType: "actFill",
-						},
-						analyzeTime: {
-							label: "分析时间",
-							type: "input",
-							fillType: "actFill",
-						},
-						testSubstance: {
-							label: "试验物质",
-							type: "input",
-							fillType: "actFill",
-						},
-						configFrequency: {
-							label: "配置频率",
-							type: "input",
-							fillType: "actFill",
-						},
-					}
-				}
-			]
-		},
-		// 步骤表格列配置
-		stepColumns() {
-			return [
-				{
-					label: "给药剂量或组别", 
-					prop: "startSolutionCode",
-					width: 280,
-					bodyType: "input",
-					bodyFillType: "actFill",
-					bodyMaxlength: 50,
-				},
-				{
-					label: "配制浓度", 
-					prop: "preparationConcentration",
-					width: 280,
-					headerSelectKey: "preparationConcentrationUnit",
-					fillType: "actFill",
-					headerOptions: this.getDictOptions('business_nddw'),
-					bodyType: "input",
-					bodyFillType: "actFill",
-					bodyMaxlength: 50,
-				},
-				{
-					label: "配制体积", 
-					prop: "preparationVolume",
-					width: 280,
-					headerSelectKey: "preparationVolumeUnit",
-					fillType: "actFill",
-					headerOptions: this.getDictOptions('business_tjdw'),
-					bodyType: "input",
-					bodyFillType: "actFill",
-					bodyMaxlength: 50,
-				},
-			]
-		},
-	},
-	data() {
-		return {
-			selectReagentVisible: false,
-			subSolutionVisible: false,
-			currentSubKey: "",//当前点击的子项key
-			dataSource: [],
-			stepTableDataSource: [],
-
-		};
-	},
-	mounted() {
-	},
-	methods: {
-		
-		async getFormData() {
-			const baseData = await this.$refs.baseInfoRef.getFormData();
-			const stepFormData = await this.$refs.stepFormPackageRef.getFormData();
-			const stepTableFormData = await this.$refs.stepTableRef.getFormData();
-			const remarkData = await this.$refs.remarkRef.getFormData();
-			if(!stepTableFormData.stepTableFormData.length){
-				this.$message.error("请添加计划信息");
-				return;
-			}
-			return {
-				...baseData,
-				...stepFormData,
-				...remarkData,
-				...stepTableFormData
-			}
-		},
-		async onSave() {
-			const formData = await this.getFormData();
-			// const formData = await this.$refs.stepTableRef.getFormData();
-			console.log(formData, "formData")
-		},
-		// 添加行
-		addRow() {
-			this.$refs.stepTableRef.addRow({
-				startSolutionCode: "",
-				preparationConcentration: "",
-				preparationVolume: "",
-			})
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss">
-.mt-20 {
-	margin-top: 20px;
-}
-.add-row{
-	display: flex;
-	justify-content: center;
-	padding: 20px 0;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
index d8674fb..e93b860 100644
--- a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
+++ b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
@@ -10,8 +10,8 @@
 					<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.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" />
+					<TableList label="template.common.gyzjInfo" :columns="gyzjColumns" :dataSource="resourceGyzj" />
+					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					<!-- 存储条件 -->
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"
diff --git a/src/views/business/comps/template/comps/gsp/GSP001.vue b/src/views/business/comps/template/comps/gsp/GSP001.vue
new file mode 100644
index 0000000..45eb149
--- /dev/null
+++ b/src/views/business/comps/template/comps/gsp/GSP001.vue
@@ -0,0 +1,441 @@
+<!-- 供试品部试剂配制记录表 -->
+<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.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+					<!-- 存储条件 -->
+					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"
+						label="template.common.storageCondition" ref="storageConditionRef"
+						:formConfig="storageFormConfig" :formData="formData" />
+					<LineLabel label="template.common.operationSteps" />
+					<!-- 操作步骤 -->
+					<div v-for="(formConfig, ladderIndex) in formData.formConfigs" :key="'ladder_' + ladderIndex">
+						<div class="template-form-item">
+							<div class="config-header-right">
+								<el-button v-if="fillType === 'preFill'" type="primary" @click="handleAddFormConfig">{{
+									$t('template.common.addBtn') }}</el-button>
+								<el-button v-if="fillType === 'preFill' && formData.formConfigs.length > 1"
+									type="danger" @click="handleDeleteFormConfig(ladderIndex)">{{
+										$t('template.common.deleteBtn')
+									}}</el-button>
+								<el-button class="print-btn" v-if="fillType === 'actFill'" type="primary"
+									@click="printTag">{{ $t('template.common.bqdy') }}</el-button>
+							</div>
+							<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps"
+								:ref="`formConfigStepFormPackageRef_${ladderIndex}`" :formConfig="stepFormConfig"
+								:formData="formConfig" />
+							<Step class="mt-0 s-container" :ref="`formStepRef_${ladderIndex}`"
+								:formData="formConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
+								:prefixKey="'form_' + ladderIndex"></Step>
+						</div>
+					</div>
+					<!-- 备注 -->
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+	</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";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import { getLatestSn } from '@/api/template';
+import { EventBus } from "@/utils/eventBus";
+import { uniqeResource } from "@/utils/calUnitTools";
+import { debounce } from 'lodash-es'
+import { duplicateResource, getExpireDate } from "@/utils/index.js";
+
+export default {
+	name: "DMYPPZJLB",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		// 配置条件
+		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,
+						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "actFill",
+							prepend: "V",
+							maxlength: 50
+						},
+
+					}
+				},
+				{
+					type: "conditionItem",
+					label: 'template.common.testConfigurationConditions',
+					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.common.configurationTime',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 操作步骤表单配置
+		stepFormConfig() {
+			return [
+				{
+					type: "step",
+					config: {
+						targetName: {
+							label: 'template.common.targetSolutionName',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						targetCode: {
+							label: 'template.common.targetSolutionCode',
+							type: "input",
+							subType: "span",
+							fillType: "preFill",
+							subKey: "targetCodeSn",
+							maxlength: 20
+						},
+						targetPreConcentration: {
+							label: 'template.common.targetPreConcentration',
+							type: "inputNumber",
+							subType: "select",
+							subKey: "targetPreConcentrationUnit",
+							fillType: "preFill",
+							subOptions: this.getDictOptions('business_nddw'),
+							maxlength: 10,
+							selectTo: "targetActConcentrationUnit",//下拉选择后，赋值到对应字段
+						},
+						targetActConcentration: {
+							label: 'template.common.targetActConcentration',
+							type: "inputNumber",
+							subType: "select",
+							subKey: "targetActConcentrationUnit",
+							compareTo: "targetPreConcentration",//与哪个字段比较
+							fillType: "actFill",
+							subFillType: "preFill",
+							subOptions: this.getDictOptions('business_nddw'),
+							copyFrom: "targetPreConcentration",//复制哪个字段
+							maxlength: 10
+						},
+						targetPreVolume: {
+							label: 'template.common.targetPreVolume',
+							type: "inputNumber",
+							subType: "select",
+							subKey: "targetPreVolumeUnit",
+							subOptions: this.getDictOptions('business_tjdw'),
+							fillType: "preFill",
+							maxlength: 10,
+							selectTo: "targetActVolumeUnit",//下拉选择后，赋值到对应字段
+						},
+						targetActVolume: {
+							label: 'template.common.targetActVolume',
+							type: "inputNumber",
+							subType: "select",
+							subKey: "targetActVolumeUnit",
+							fillType: "actFill",
+							subFillType: "preFill",
+							subOptions: this.getDictOptions('business_tjdw'),
+							compareTo: "targetPreVolume",//与哪个字段比较
+							copyFrom: "targetPreVolume",//复制哪个字段
+							maxlength: 10
+						},
+						effectivePeriod: {
+							label: 'template.common.effectivePeriod',
+							type: "inputNumber",
+							subType: "select",
+							subKey: "effectivePeriodUnit",
+							fillType: "preFill",
+							subOptions: this.getDictOptions('business_yxqdw'),
+							maxlength: 10
+						},
+						expireDate: {
+							label: 'template.common.expireDate',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+	},
+	data() {
+		return {
+			formData: {}
+		};
+	},
+	mounted() {
+		const formData = this.getFormDataByTemplateData();
+		if (!formData.targetCodeSn && this.fillType === "actFill") {
+			this.getCode(formData);
+		} else {
+			if (!this.formData.formConfigs) {
+				this.$set(this.formData, 'formConfigs', []);
+				this.formData.formConfigs.push({
+					formConfigs: [],
+				});
+			}
+		}
+	},
+	methods: {
+		//新增
+		handleAddFormConfig() {
+			if (!this.formData.formConfigs) {
+				this.$set(this.formData, 'formConfigs', []);
+			}
+			this.formData.formConfigs.push({
+				formConfigs: [],
+			});
+		},
+		//删除
+		handleDeleteFormConfig(index) {
+			this.formData.formConfigs.splice(index, 1);
+		},
+		//todo 打印标签
+		printTag() {
+			const printConfig = this.getBasePrintConfig();
+			const { storageCondition, targetCodeSn } = this.formData;
+			printConfig["存储条件"] = storageCondition;
+			printConfig["编号"] = targetCodeSn;
+
+			EventBus.$emit('showTagPrintDialog', { printConfig })
+		},
+		//填报获取编号
+		getCode: debounce(async function (v) {
+			if (this.formData.formConfigs && this.formData.formConfigs.length > 0) {
+				for (let i = 0; i < this.formData.formConfigs.length; i++) {
+					let item = this.formData.formConfigs[i]
+					const result = await getLatestSn({
+						count: 1,
+						pre: item.targetCode,
+						type: 1
+					})
+					if (result.code == 200) {
+						this.$refs[`formConfigStepFormPackageRef_${i}`][0].updateFormData("targetCodeSn", result.data[0])
+					}
+				}
+			}
+		}, 100),
+		//获取字段值，不检验
+		getFilledFormData() {
+			const baseData = this.$refs.baseInfoRef.getFilledFormData();
+			const conditionData = this.$refs.storageConditionRef.getFilledFormData();
+			const formConfigsData = [];
+			if (this.formData.formConfigs && this.formData.formConfigs.length > 0) {
+				for (let i = 0; i < this.formData.formConfigs.length; i++) {
+					const formData = this.$refs[`formConfigStepFormPackageRef_${i}`][0].getFilledFormData();
+					const stepData = this.$refs[`formStepRef_${i}`][0].getFilledFormData();
+					if(this.formData.startDate&&formData.effectivePeriod&&formData.effectivePeriodUnit){
+					   formData.expireDate=getExpireDate(this.formData.startDate, formData.effectivePeriod, formData.effectivePeriodUnit)
+					}
+					formConfigsData.push({
+						...formData,
+						...stepData,
+					});
+				}
+			}
+			const remarkData = this.$refs.remarkRef.getFilledFormData();
+			return {
+				...baseData,
+				...conditionData,
+				formConfigs: formConfigsData,
+				...remarkData
+			}
+		},
+		//检验
+		async validFields() {
+			// 构建需要验证的引用数组
+			let refsToValidate = ["baseInfoRef", "storageConditionRef", "remarkRef"];
+
+			if (this.formData.formConfigs && this.formData.formConfigs.length > 0) {
+				for (let i = 0; i < this.formData.formConfigs.length; i++) {
+					refsToValidate.push(`formConfigStepFormPackageRef_${i}`);
+					refsToValidate.push(`formStepRef_${i}`);
+				}
+			}
+
+			return await this.validFormFields(refsToValidate);
+		},
+		//获取字段值
+		async getFormData() {
+			//先校验再获取值
+			const validFlag = await this.validFields();
+			if (!validFlag) {
+				return false;
+			}
+			let content = this.getFilledFormData();
+			return content;
+		},
+		//获取生成，使用物资
+		getResource() {
+			let content = this.getFilledFormData();
+			//生成resource
+			let tmpResource = []
+			if (this.fillType === "actFill") {
+				let tableList = content.formConfigs
+				if (tableList && tableList.length > 0) {
+					for (let i = 0; i < tableList.length; i++) {
+						let item = tableList[i]
+						tmpResource.push({
+							mc: item.targetName,
+							bh: item.targetCode + item.targetCodeSn,
+							ph: '',
+							ndz: item.targetActConcentration + item.targetActConcentrationUnit,
+							nd: item.targetActConcentration,
+							nddw: item.targetActConcentrationUnit,
+							ly: 'ELN配制',
+							sxrq: item.expireDate,
+							kc: item.targetActVolume,
+							kcdw: item.targetActVolumeUnit,
+							syl: null,
+							type: null,
+							elnType: this.product,
+							syldw: item.targetActVolumeUnit,
+							yxzq: item.effectivePeriod,
+							yxzqdw: item.effectivePeriodUnit,
+						})
+					}
+				}
+			}
+			//使用的试剂、仪器
+			const stepResource = this.getStepResource()
+			this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//获取步骤使用物资
+		getStepResource() {
+			const sjResource = [], yqResource = [];
+			if (this.formData.formConfigs && this.formData.formConfigs.length > 0) {
+				for (let i = 0; i < this.formData.formConfigs.length; i++) {
+					const paralleResource = this.$refs[`formStepRef_${i}`][0].getStepResource();
+					sjResource.push(...paralleResource.sjResource);
+					yqResource.push(...paralleResource.yqResource);
+				}
+			}
+			//去重
+			const { sj, yq } = duplicateResource(sjResource, yqResource)
+			return { sjResource: sj, yqResource: yq };
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+
+.config-header-right {
+	margin-bottom: 15px;
+	font-weight: bold;
+	font-size: 16px;
+	color: #303133;
+	text-align: right;
+	width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/comps/template/comps/gsp/GSP002.vue b/src/views/business/comps/template/comps/gsp/GSP002.vue
index 9532c95..6ce5379 100644
--- a/src/views/business/comps/template/comps/gsp/GSP002.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP002.vue
@@ -8,8 +8,9 @@
 				<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.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" />
+					
+					<TableList label="template.common.gspsywzInfo" :columns="gspColumns" :dataSource="resourceGsp" v-if="sn!='GSP002'"/>
+					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
 					<LineLabel v-if="sn=='GSP002'" label="template.common.operationSteps" />
diff --git a/src/views/business/comps/template/comps/gsp/GSP003.vue b/src/views/business/comps/template/comps/gsp/GSP003.vue
index 672b2df..2c1e59b 100644
--- a/src/views/business/comps/template/comps/gsp/GSP003.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP003.vue
@@ -10,8 +10,8 @@
 					<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.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" />
+					<TableList label="template.common.gspsywzInfo" :columns="gspColumns" :dataSource="resourceGsp" />
+					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					<!-- 存储条件 -->
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"
diff --git a/src/views/business/comps/template/comps/gsp/GSP004.vue b/src/views/business/comps/template/comps/gsp/GSP004.vue
index 32952d7..af9fecf 100644
--- a/src/views/business/comps/template/comps/gsp/GSP004.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP004.vue
@@ -8,8 +8,8 @@
 				<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.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" />
+					<TableList label="template.common.gspsywzInfo" :columns="gspColumns" :dataSource="resourceGsp" />
+					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					<!-- 计算公式 -->
 					<BaseInfoFormPackage fieldItemLabel="template.gsp.GSP003.calcConditionLabel"
diff --git a/src/views/business/comps/template/comps/gsp/GSP009.vue b/src/views/business/comps/template/comps/gsp/GSP009.vue
index 126ee3f..b26cbed 100644
--- a/src/views/business/comps/template/comps/gsp/GSP009.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP009.vue
@@ -8,8 +8,8 @@
 					<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.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" />
+					<TableList label="template.common.gspsywzInfo" :columns="gspColumns" :dataSource="resourceGsp" />
+					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					
 					<LineLabel :label="sn=='GSP009'?'template.gsp.gsp009.xtsyx':'template.gsp.gsp011.cl'" />
diff --git a/src/views/business/comps/template/comps/gsp/GSP010.vue b/src/views/business/comps/template/comps/gsp/GSP010.vue
index f66495a..d947da1 100644
--- a/src/views/business/comps/template/comps/gsp/GSP010.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP010.vue
@@ -10,8 +10,8 @@
 					<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.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" />
+					<TableList label="template.common.gspsywzInfo" :columns="gspColumns" :dataSource="resourceGsp" />
+					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					<LineLabel label="template.common.operationSteps" />
 					<!-- 操作步骤 -->
diff --git a/src/views/business/comps/template/comps/sp/SP001.vue b/src/views/business/comps/template/comps/sp/SP001.vue
index fabb77a..f4e8766 100644
--- a/src/views/business/comps/template/comps/sp/SP001.vue
+++ b/src/views/business/comps/template/comps/sp/SP001.vue
@@ -8,9 +8,7 @@
 				<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.wzInfo" :columns="sywzColumns" :dataSource="resourceWz"
-						v-if="resourceWz.length > 0" />
+					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"
 						label="template.common.storageCondition" ref="storageConditionRef"
diff --git a/src/views/business/comps/template/comps/sp/SP003.vue b/src/views/business/comps/template/comps/sp/SP003.vue
index a6a9467..f4cbc95 100644
--- a/src/views/business/comps/template/comps/sp/SP003.vue
+++ b/src/views/business/comps/template/comps/sp/SP003.vue
@@ -8,8 +8,7 @@
 				<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.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" />
+					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					<!-- <BaseInfoFormPackage label="存储条件" ref="storageConditionRef" :formConfig="storageFormConfig"
 						:formData="formData" /> -->
diff --git a/src/views/business/comps/template/comps/sp/SP00456.vue b/src/views/business/comps/template/comps/sp/SP00456.vue
index a20ca1d..6b27430 100644
--- a/src/views/business/comps/template/comps/sp/SP00456.vue
+++ b/src/views/business/comps/template/comps/sp/SP00456.vue
@@ -8,8 +8,7 @@
 				<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.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" />
+					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"
 						label="template.common.storageCondition" ref="storageConditionRef"
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 331a3ce..46b73ea 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -62,12 +62,28 @@ export default {
 					if (v.resource) {
 						//type 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品
 						//试验试剂信息 试剂
-						this.resource = _.filter(JSON.parse(v.resource), function (o) {
+						// this.resource = _.filter(JSON.parse(v.resource), function (o) {
+						// 	return o.type == 1 || o.elnType == 1
+						// })
+						// //试验物资信息 供试品、给药制剂、麻精药
+						// this.resourceWz = _.filter(JSON.parse(v.resource), function (o) {
+						// 	return o.type == 3 || o.type == 5 || o.type == 7 || o.elnType == 3|| o.elnType == 5 || o.elnType == 7
+						// })
+                        //试验试剂信息
+						this.resourceSj = _.filter(JSON.parse(v.resource), function (o) {
 							return o.type == 1 || o.elnType == 1
 						})
-						//试验物资信息 供试品、给药制剂、麻精药
-						this.resourceWz = _.filter(JSON.parse(v.resource), function (o) {
-							return o.type == 3 || o.type == 5 || o.type == 7 || o.elnType == 3|| o.elnType == 5 || o.elnType == 7
+						//供试品信息
+						this.resourceGsp = _.filter(JSON.parse(v.resource), function (o) {
+							return o.type == 7 || o.elnType == 7
+						})
+						//给药制剂信息
+						this.resourceGyzj = _.filter(JSON.parse(v.resource), function (o) {
+							return o.type == 3 || o.elnType == 3
+						})
+						//麻精药信息
+						this.resourceMjy = _.filter(JSON.parse(v.resource), function (o) {
+							return o.type == 5 || o.elnType == 5
 						})
 					}
 					if (v.yqResource) {
@@ -133,14 +149,51 @@ export default {
 			formData: {},
 			templateDetail: {},
 			product: null,//产物：1：试剂；3：给药制剂；5：麻精药
-			resource: [], //试验试剂信息
-			resourceWz: [], //物资信息
+			resource: [], //试验试剂信息--弃用
+			resourceWz: [], //物资信息--弃用
+
+			resourceSj: [],//试验试剂信息
+			resourceGsp: [],//供试品信息
+			resourceGyzj: [],//给药制剂信息
+			resourceMjy: [],//麻精药信息
+
 			yqResource: [], //仪器信息
 			jcbList: [], //检测板信息
 
 			resourceTmp: [],//试验试剂信息提交用
 			yqResourceTmp: [], //仪器信息提交用
 			jcbListTmp: [], //检测板信息提交用
+            sjColumns: [
+				{ label: 'template.common.reagentName', prop: "mc" },//名称
+				{ label: 'template.common.reagentCode', prop: "bh" },//编号
+				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
+				{ label: 'template.common.concentration', prop: "ndz" },//浓度
+				{ label: 'template.common.source', prop: "ly" },//来源
+				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
+			],
+            gspColumns: [
+				{ label: 'template.common.wzName', prop: "mc" },//名称
+				{ label: 'template.common.wzCode', prop: "bh" },//编号
+				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
+				{ label: 'template.common.wzSource', prop: "ly" },//来源
+				{ label: 'template.common.wzConcentration', prop: "ndz" },//浓度
+				{ label: 'template.common.wzExpireDate', prop: "sxrq" },//失效日期
+			],
+			gyzjColumns: [
+				{ label: 'template.common.wzName', prop: "mc" },//名称
+				{ label: 'template.common.wzCode', prop: "bh" },//编号
+				{ label: 'template.common.wzSource', prop: "ly" },//来源
+				{ label: 'template.common.wzConcentration', prop: "ndz" },//浓度
+				{ label: 'template.common.wzExpireDate', prop: "sxrq" },//失效日期
+			],
+			mjyColumns: [
+				{ label: 'template.common.wzName', prop: "mc" },//名称
+				{ label: 'template.common.wzCode', prop: "bh" },//编号
+				{ label: 'template.common.wzSource', prop: "ly" },//来源
+				{ label: 'template.common.wzConcentration', prop: "ndz" },//浓度
+				{ label: 'template.common.wzExpireDate', prop: "sxrq" },//失效日期
+			],
+			//弃用
 			sysjColumns: [
 				{ label: 'template.common.reagentName', prop: "mc" },//名称
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
@@ -149,6 +202,7 @@ export default {
 				{ label: 'template.common.source', prop: "ly" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
+			//弃用
 			sywzColumns: [
 				{ label: 'template.common.wzName', prop: "mc" },//名称
 				{ label: 'template.common.wzCode', prop: "bh" },//编号