Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

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

src/components/Template/StepComponents/b/cl.vue

@@ -1,6 +1,6 @@
 <!-- 称量 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_cl" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="b_cl" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/b/jrry_b.vue

@@ -1,6 +1,6 @@
 <!-- 加入溶液 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_jrry_b" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="b_jrry_b" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/spyjzzb/jszz.vue

@@ -0,0 +1,42 @@
+<!-- 剪碎组织 -->
+<template>
+    <StepFormPackage ref = "stepFormPackageRef" prefixKey="spyjzzb_jszz" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';    
+
+    export default {
+        mixins: [stepMixins],
+        props: {
+            sn: {
+                type: String,
+                default: 'jszz',
+            },
+        },
+        components: {
+            StepFormPackage
+        },
+        computed: {
+            formConfig() {
+                return [{
+                    config:{
+                        text1:{
+                            label:this.sn==='jszz'? "取上述组织，在冰板上剪碎。":this.sn==='cqzz'? "使用上述电子天平，称取剪碎的组织于匀浆管中。":this.sn==='yjyhh'? "将同一动物的同种组织匀浆液混匀。":"",
+                            type:"text",
+                        },
+                        check:{
+                            type:"checkbox",
+                            fillType:"actFill",
+                        },
+                    }
+                }]
+            }
+        },
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/components/Template/StepComponents/swypfx/hhspe.vue

@@ -1,6 +1,6 @@
 <!-- 活化（SPE） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_hhspe" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="swypfx_hhspe" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/swypfx/jryp.vue

@@ -1,6 +1,6 @@
 <!-- 加入样品 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_jryp" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="swypfx_jryp" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/swypfx/zyfc.vue

@@ -1,6 +1,6 @@
 <!-- 转移（分层） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_zyfc" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="swypfx_zyfc" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/lang/en/template/pcr.js

@@ -65,6 +65,16 @@ export default {
     ypznd: '样品终浓度',
     fj: 'Attachment',
   },
+  pcr009: {
+    clsj: 'Work Time',
+    yjry: '匀浆溶液',
+    bs: '倍数',
+    yjyjry: '已加匀浆溶液',
+    ypmc: '样品名称',
+    zzz: '组织重',
+    ysyjrybjrl: '预设匀浆溶液补加入量',
+    sjyjrybjrl: '实际匀浆溶液补加入量',
+  },
   // 生物样品分析方法学样品制备表-准确度与精密度
   sp008: {
     title:

src/lang/zh/template/pcr.js

@@ -64,6 +64,16 @@ export default {
     ypznd: '样品终浓度',
     fj: 'Attachment',
   },
+   pcr009: {
+    clsj: '处理时间',
+    yjry: '匀浆溶液',
+    bs: '倍数',
+    yjyjry: '已加匀浆溶液',
+    ypmc: '样品名称',
+    zzz: '组织重',
+    ysyjrybjrl: '预设匀浆溶液补加入量',
+    sjyjrybjrl: '实际匀浆溶液补加入量',
+  },
   // 生物样品分析方法学样品制备表-Recovery
   sp009: {
     title: '生物样品分析方法学样品制备表（Recovery）',

src/views/business/comps/template/TemplateTable.vue

@@ -53,6 +53,7 @@ import PCR003 from "./comps/pcr/PCR003.vue";
 import PCR004 from "./comps/pcr/PCR004.vue";
 import PCR005 from "./comps/pcr/PCR005.vue";
 import PCR007 from "./comps/pcr/PCR007.vue";
+import PCR009 from "./comps/pcr/PCR009.vue";
 
 //LBA
 // LBA001-使用SP001
@@ -115,7 +116,7 @@ export default {
     //色谱
     SP001, SP003, SP00456,SP007, SP008, SP009,SP0019,SP0020,
     // PCR
-    PCR002, PCR003, PCR004, PCR005,PCR007,
+    PCR002, PCR003, PCR004, PCR005,PCR007,PCR009,
     //LBA
     LBA002,
     LBA003,
@@ -234,6 +235,7 @@ export default {
           'PCR004': 'PCR004',
           'PCR005': 'PCR005',
           'PCR007': 'PCR007',
+          'PCR009': 'PCR009',
           //LBA
           'LBA001': 'SP001',
           'LBA002': 'LBA002',

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

@@ -260,6 +260,9 @@ export default {
 			})
 			this.$refs.stepTableRef.addRows(list)
 			this.$refs.ImportExcelDialog.cancel()
+			setTimeout(() => {
+				this.justUpdateFilledFormData();
+			}, 100);
 			this.onHandleTableBlur()
 		},
 		// 失去焦点，计算

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

@@ -209,11 +209,14 @@ export default {
 			excelData.forEach(item => {
 				list.push({
 					ypmc: item[0],
-					ypcsnd: item[1],
+					cyqypgsjyjtjtj: item[1],
 				})
 			})
 			this.$refs.stepTableRef.addRows(list)
 			this.$refs.ImportExcelDialog.cancel()
+			setTimeout(() => {
+				this.justUpdateFilledFormData();
+			}, 100);
 			this.onHandleTableBlur()
 		},
 		// 失去焦点，计算

src/views/business/comps/template/comps/pcr/PCR009.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>

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)

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,
+    }
+  ]
 }

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',