feat:[模板管理][PCR005]

src/views/business/comps/template/comps/pcr/PCR002.vue

@@ -50,7 +50,6 @@
 		<SelectReagentDialog @submit="onSelectReagentSubmit" ref="selectReagentDialogRef">
 		</SelectReagentDialog>
 		<!-- <button @click="onSave">保存</button> -->
-		 <ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadData"/>
 	</div>
 </template>
 
@@ -67,10 +66,9 @@ import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
 import { getLadderColumnsConfig } from "../../formConfig/PCRTableConfig.js";
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools";
-import ImportExcelDialog from '../../dialog/ImportExcelDialog'
 export default {
 	name: "PCR002",
-	components: { ImportExcelDialog, BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog },
+	components: {  BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -258,13 +256,6 @@ export default {
 
 	},
 	methods: {
-		showImportExcelDialog() {
-			this.$refs.ImportExcelDialog.show()
-		},
-		onLoadData(excelData) {
-			console.log('onLoadData')
-			console.log(excelData)
-		},
 		//更新记录
 		onSureModifyRecord(key) {
 			if (key === "subStartSolution") {//选择起始源溶液需要同步更新table的变更记录。

src/views/business/comps/template/comps/pcr/PCR005.vue

@@ -42,7 +42,7 @@
 		<SelectReagentDialog @submit="onSelectReagentSubmit" ref="selectReagentDialogRef">
 		</SelectReagentDialog>
 		<!-- <button @click="onSave">保存</button> -->
-		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadData" />
+		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadExcelData" />
 	</div>
 </template>
 
@@ -242,6 +242,9 @@ export default {
 		showImportExcelDialog() {
 			this.$refs.ImportExcelDialog.show()
 		},
+		onLoadExcelData(excelData) {
+			console.log(excelData)
+		},
 		// 失去焦点，计算
 		onHandleTableBlur() {
 			let content = this.getFilledFormData();
@@ -314,7 +317,6 @@ export default {
 
 						//使用的
 
-						// 起始溶液
 						tmpResource.push({
 							mc: null,
 							bh: item.startSolutionCode,
@@ -333,72 +335,7 @@ export default {
 							yxzq: null,
 							yxzqdw: null,
 						})
-						// 稀释液
-						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.actDiluentVolume,
-							type: 1,
-							elnType: this.product,
-							syldw: content.headerSelectFields.actDiluentVolumeUnit,
-							yxzq: null,
-							yxzqdw: null,
-						})
-						//分装的
-						let fzTotal = 0//分装总量
-						if (item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length > 0) {
-							for (let j = 0; j < item.fzsj.fzList.length; j++) {
-								let fzItem = item.fzsj.fzList[j]
-								tmpResource.push({
-									mc: null,
-									bh: item.fzsj.mybh + fzItem.preCode + fzItem.subCode,
-									ph: null,
-									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-									nd: item.hhwznd,
-									nddw: content.headerSelectFields.hhwzndUnit,
-									ly: 'ELN配制',
-									sxrq: null,
-									kc: fzItem.num,
-									kcdw: item.fzsj.dw,
-									syl: null,
-									type: null,
-									elnType: this.product,
-									syldw: item.fzsj.dw,
-									yxzq: null,
-									yxzqdw: null,
-								})
-								fzTotal = addDecimals(fzTotal, fzItem.num)
-							}
-						}
-						//生成的
-						// const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
-						const { total, unit } = addTj([item.actStartSolutionVolume, item.actDiluentVolume], [content.headerSelectFields.actStartSolutionVolumeUnit, content.headerSelectFields.actDiluentVolumeUnit])
-						tmpResource.push({
-							mc: null,
-							bh: item.targetSolutionCode + item.subTargetSolutionCode,
-							ph: null,
-							ndz: item.actSolutionConcentration + content.headerSelectFields.actSolutionConcentrationUnit,
-							nd: item.actSolutionConcentration,
-							nddw: content.headerSelectFields.actSolutionConcentrationUnit,
-							ly: 'ELN配制',
-							sxrq: null,
-							kc: total,
-							kcdw: unit,
-							type: null,
-							elnType: this.product,
-							syl: fzTotal > 0 ? fzTotal : null,
-							syldw: fzTotal > 0 ? item.fzsj.dw : unit,
-							yxzq: content.effectivePeriod,
-							yxzqdw: content.effectivePeriodUnit,
-						})
+
 					}
 				}
 			}