feat:[模板管理][update]

src/components/Template/BaseInfoFormPackage.vue

@@ -53,6 +53,22 @@
                     </div>
                 </div>
             </template>
+            <template v-else-if="item.type === 'attachment'">
+                <div class="form-item ">
+                    <div class="form-title fs-16" v-if="item.label">{{ $t( item.label) }}</div>
+                    <div v-for="(sItem, key) in item.config" class="c-Item  grid-container">
+                        <div class="p-r-20">
+                            <div class="form-title">{{ $t( sItem.label) }}</div>
+                            <div class="flex flex1">
+                                <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+key" type="attachment" :item="sItem" v-model="formFields[key]"
+                                    @copy="onCopy(sItem, key)" @change="(e,type)=>onSelectChange(key, e,type)"
+                                    :error="errors[key]" @update:error="errors[key] = false"
+                                    :orange-bg="orangeBgFields[key]" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </template>
             <template v-else-if="item.type === 'cellItem'">
                 <div class="form-item ">
                     <div class="form-title fs-16" v-if="item.label">{{ $t( item.label) }}</div>
@@ -173,6 +189,7 @@
                     </div>
                 </div>
             </template>
+
         </div>
     </div>
 </template>

src/lang/en/template/sp.js

@@ -63,6 +63,9 @@ export default {
     rqcz: 'Container Material',
     cctj:'Storage Condition',
   },
+  sp007:{
+    title: '生物样品分析样本处理表',
+  },
   // 生物样品分析方法学样品制备表-准确度与精密度
   sp008: {
     title:

src/lang/zh/template/sp.js

@@ -63,6 +63,9 @@ export default {
     rqcz: '容器材质',
     cctj:'存储条件',
   },
+  sp007:{
+    title: '生物样品分析样本处理表',
+  },
   // 生物样品分析方法学样品制备表-准确度与精密度
   sp008: {
     title: '生物样品分析方法学样品制备表（准确度与精密度）',

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

@@ -27,6 +27,7 @@ import SP001 from "./comps/sp/SP001.vue";
 import SP002 from "./comps/sp/SP002.vue";
 import SP003 from "./comps/sp/SP003.vue";
 import SP00456 from "./comps/sp/SP00456.vue";
+import SP007 from "./comps/sp/SP007.vue";
 //色谱生物样品分析方法学样品制备表-10个类似
 import SP008 from "./comps/sp/SWYPFXFFXYPZBB/SP008.vue";
 import SP009 from "./comps/sp/SWYPFXFFXYPZBB/SP009.vue";
@@ -56,7 +57,7 @@ export default {
     //供试品
     MJYLQSQD, SYWZPZJHB,
     //色谱
-    SP001, SP002, SP003, SP00456, SP008, SP009, SP010, SP011, SP012, SP013, SP014, SP015, SP016, SP017, SP018,
+    SP001, SP002, SP003, SP00456,SP007, SP008, SP009, SP010, SP011, SP012, SP013, SP014, SP015, SP016, SP017, SP018,
     // PCR
     PCR001, PCR002
   },
@@ -90,6 +91,7 @@ export default {
           'SP004': 'SP00456',
           'SP005': 'SP00456',
           'SP006': 'SP00456',
+          'SP007': 'SP007',
           'SP008': 'SP008',
           'SP009': 'SP009',
           'SP010': 'SP010',

src/views/business/comps/template/comps/sp/SP003.vue

@@ -280,6 +280,7 @@ export default {
 					bodyType: "input",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
+					bodyDisabled: true,
 				},
 				{
 					label: "template.sp.sp003.ysqsrytj",
@@ -552,15 +553,17 @@ export default {
 			// 遍历数据，按要求更新起始溶液编号
 			for (let i = 0; i < newStepTableData.length; i++) {
 				const item = newStepTableData[i];
+				let initNd = row.nd;//起始浓度是上一条记录的实际目标溶液浓度
 				if (i === 0) {
 					// 第一条记录的起始溶液编号是确认弹框带出来的，也就是row.code字段
 					newStepTableData[i].startSolutionCode = row.bh;
 				} else {
 					// 第二条的起始溶液编号是第一条数据里面的targetSolutionCode字段，
 					// 第三条的起始溶液编号是第二条数据里面的targetSolutionCode字段，以此类推
-					newStepTableData[i].startSolutionCode = newStepTableData[i - 1].targetSolutionCode;
+					newStepTableData[i].startSolutionCode = newStepTableData[i - 1].targetSolutionCode+newStepTableData[i - 1].subTargetSolutionCode;
+					initNd = newStepTableData[i - 1].actSolutionConcentration;
 				}
-				const volResult = this.updateSjmbrynd(item, row.nd);
+				const volResult = this.updateSjmbrynd(item, initNd);
 				if (!volResult) {
 					continue
 				}

src/views/business/comps/template/comps/sp/SP00456.vue

@@ -504,13 +504,19 @@ export default {
 			const newData = JSON.parse(JSON.stringify(stepTableFormData));
 			// 遍历数据，按要求更新起始溶液编号
 			newData.forEach((item, index) => {
-				const volResult = this.updateSjmbrynd(item, row.nd);
+				let initNd = row.nd;//起始浓度是上一条记录的实际目标溶液浓度
+				if(index ===0){
+					item.startSolutionCode = row.bh;
+				}else{
+					item.startSolutionCode = newData[index - 1].targetSolutionCode+ newData[index - 1].subTargetSolutionCode;
+					initNd = newData[i - 1].actSolutionConcentration;
+				}
+				const volResult = this.updateSjmbrynd(item, initNd);
 				if (!volResult) {
 					return
 				}
-				console.log(volResult.actNd, "actNd")
+				
 				item.actSolutionVolume = volResult.actVol;
-				debugger
 				item.actSolutionConcentration = volResult.actNd;
 				// 更新stepTableRef组件的数据
 			})

src/views/business/comps/template/comps/sp/SP007.vue

@@ -0,0 +1,158 @@
+<!-- 生物样品分析溶液配制表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc ||
+				$t('template.sp.sp007.title') }}<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.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" v-if="resourceWz.length>0"/>
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"
+						label="template.common.storageCondition" ref="storageConditionRef"
+						:formConfig="storageFormConfig" :formData="formData" />
+					<BaseInfoFormPackage fieldItemLabel="样本说明" label="样本说明"
+						ref="ybRef" :formConfig="ybFormConfig" :formData="formData" />
+					<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> -->
+	</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 {getBaseInfoFormConfig, getRemarkFormConfig,getStorageFormConfig,getYbFormConfig} from "../../formConfig/sp/SP007";
+
+export default {
+	name: "SP007",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		// 配置条件
+		storageFormConfig() {
+			return getStorageFormConfig(this);
+		},
+		// 备注表单配置
+		remarkConig() {
+			return getRemarkFormConfig();
+		},
+		// 样本说明
+		ybFormConfig() {
+			return getYbFormConfig();
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return getBaseInfoFormConfig(this);
+		},
+		
+	},
+	data() {
+		return {
+			formData: {}
+		};
+	},
+	mounted() {
+		const formData = this.getFormDataByTemplateData();
+		if(!formData.targetCodeSn&& this.fillType === "actFill"){
+			this.getCode(formData);
+		}
+
+	},
+	methods: {
+		//打印标签
+		printTag() {
+			const printConfig = this.getBasePrintConfig();
+			const { storageCondition, targetCodeSn } = this.formData;
+			printConfig["存储条件"] = storageCondition;
+			printConfig["编号"] = targetCodeSn;
+
+			EventBus.$emit('showTagPrintDialog', { printConfig })
+		},
+		//获取目标溶液编号
+		getCode: debounce(async function (v) {
+			const result = await getLatestSn({
+				count: 1,
+				pre:v.targetCode,
+				type:1
+			})
+			if (result.code == 200) {
+				this.$refs.stepFormPackageRef.updateFormData("targetCodeSn", result.data[0])
+			}
+		}, 100),
+		//获取已填写的表单数据
+		getFilledFormData() {
+			return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"])
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"]);
+			//生成resource
+			let tmpResource = []
+			if (this.fillType === "actFill") {
+				//配置的试剂
+				tmpResource.push({
+					mc: content.targetName,
+					bh: content.targetCode + content.targetCodeSn,
+					ph: '',
+					ndz: content.targetActConcentration + content.targetActConcentrationUnit,
+					nd: content.targetActConcentration,
+					nddw: content.targetActConcentrationUnit,
+					ly: 'ELN配制',
+					sxrq: content.expireDate,
+					kc: content.targetActVolume,
+					kcdw: content.targetActVolumeUnit,
+					syl: null,
+					type: null,
+					elnType: this.product,
+					syldw: content.targetActVolumeUnit,
+					yxzq: content.effectivePeriod,
+					yxzqdw: content.effectivePeriodUnit,
+				})
+			}
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
+			this.yqResourceTmp = stepResource.yqResource||[]
+			return content;
+		},
+		//保存
+		async onSave() {
+			let content =await this.$refs.stepRef.getFormData();
+			console.log(content);
+			
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+</style>

src/views/business/comps/template/formConfig/paralleAndLadderConfig.js

@@ -21,7 +21,7 @@ export const getLadderColumnsConfig = ($this) => {
       showWidth: 180,
       bodyType: 'input',
       bodyFillType: 'actFill',
-      bodyMaxlength: 10
+      bodyDisabled: true,
     },
     {
       label: 'template.sp.sp00456.ysqsrytj',

src/views/business/comps/template/formConfig/sp/SP007.js

@@ -0,0 +1,144 @@
+export const getBaseInfoFormConfig = ($this) => {
+    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
+                },
+                clpbh: {
+                    label: '处理批编号',
+                    type: "input",
+                    fillType: "actFill",
+                    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",
+            config: {
+                containerMaterial: {
+                    label: "template.sp.sp003.rqcz",
+                    type: "select",
+                    options: $this.getDictOptions('business_rqcz'),
+                    fillType: "actFill",
+                    otherCode: "containerMaterialOther",
+                }
+            }
+        },
+        {
+            type: "cellItem",
+            label: 'template.sp.sp008.clsj',
+            config: {
+                startDate: {
+                    label: 'template.common.startTime',
+                    type: "input",
+                },
+                endDate: {
+                    label: 'template.common.endTime',
+                    type: "input",
+                },
+            }
+        }
+    ]
+}
+//备注
+export const getRemarkFormConfig = () => {
+    return [
+        {
+            type: "cellItem",
+            config: {
+                remark: {
+                    label: "",
+                    type: "textarea",
+                    fillType: "actFill",
+                    span: 1,
+                    placeholder: 'template.common.remarkPlaceholder',
+                    maxlength: 1000,
+                    rows: 5
+                }
+            }
+        }
+    ]
+}
+//样本说明
+export const getYbFormConfig = () => {
+    return [
+        {
+            type: "cellItem",
+            config: {
+                remark: {
+                    label: "",
+                    type: "textarea",
+                    fillType: "actFill",
+                    span: 1,
+                    placeholder: '样本说明',
+                    maxlength: 1000,
+                    rows: 5
+                }
+            }
+        }
+    ]
+}
+
+//存储条件
+export const getStorageFormConfig = ($this) => {
+    return [
+            {
+                type: "conditionItem",
+                config: {
+                    storageCondition: {
+                        label: 'template.common.storageConditionLabel',
+                        type: "select",
+                        fillType: "preFill",
+                        options: $this.getDictOptions("business_cctj"),
+                        otherCode: "storageConditionOther",
+                    },
+                }
+            }
+        ]
+}

src/views/business/comps/template/mixins/templateMixin.js

@@ -347,6 +347,7 @@ export default {
 		//统一处理table失焦事件
 		onHandleTableBlur(params) {
 			const { rowIndex, colKey, value, item } = params
+			console.log(params,"params");
 			if (
 				colKey === 'targetSolutionVolume' ||
 				colKey === 'targetSolutionConcentration' ||
@@ -381,11 +382,11 @@ export default {
 		//计算并更新实际目标溶液浓度  先计算实际目标溶液体积再计算实际目标溶液浓度
 		updateSjmbrynd(item, targetAcSolution) {
 			//实际源溶液浓度÷（实际终体积÷源溶液加入体积）；
-			const precision = item.actSolutionConcentrationPrecision || 0
+			const precision = item.actSolutionConcentrationPrecision 
 			const volPrecision = item.actSolutionVolumePrecision || 0
 			//实际稀释液体积
-			const actDiluentVolume = item.actDiluentVolume || 0
-			const actStartSolutionVolume = item.actStartSolutionVolume || 0
+			const actDiluentVolume = item.actDiluentVolume
+			const actStartSolutionVolume = item.actStartSolutionVolume
 			//实际高源溶液加入体积+实际稀释液加入体积
 			const actVol = (
 				Number(actStartSolutionVolume) + Number(actDiluentVolume)
@@ -396,10 +397,12 @@ export default {
 			if(isValueEmpty(actDiluentVolume) && isValueEmpty(actStartSolutionVolume)){
 				return false
 			}
+			// 实际目标溶液浓度 = 实际源溶液浓度÷（实际终体积÷源溶液加入体积）；
 			const actNd = (
-				parseFloat(targetAcSolution) /
-				parseFloat(actStartSolutionVolume) /
-				parseFloat(actVol)
+				parseFloat(targetAcSolution) /(
+					parseFloat(actStartSolutionVolume) /
+					parseFloat(actVol)
+				)
 			).toFixed(precision)
 			const nd = actNd === 'Infinity' ? 0 : Number(actNd)
 			console.log(actNd, targetAcSolution, actStartSolutionVolume, actVol, "actNd")