feat:[模板管理][阶梯/平行配置组件抽离，未完]

src/components/Template/CustomTable.vue

@@ -183,7 +183,7 @@
 							</div>
 							<div class="m-l-5" :class="{ 'flex1': col.bodySubType !== 'button' }"
 								v-if="isShowBodySub(col, row)">
-								<template v-if="col.bodySubType === 'inputNumber' || col.bodySubType === 'input'">
+								<template v-if="col.bodySubType === 'inputNumber' || col.bodySubType === 'input' || col.bodySubType === 'select'">
 									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + rowIndex"
 										:fieldItemLabel="fieldItemLabel" :type="col.bodySubType"
 										@blur="onSubBlur(rowIndex, col.bodySubKey, $event)"

src/components/Template/HandleFormItem.vue

@@ -411,7 +411,7 @@ export default {
         getDecimalDigits() {
             const { precision } = this.item;
             if (!isNaN(precision)) {
-                return precision
+                return Number(precision)
             }
             return 6
         },

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

@@ -38,6 +38,7 @@
 						<LadderConfig :currentFormConfig="ladderStepFormConfig" :currentFormData="ladderConfig"
 							:showOperation="fillType === 'actFill' || fillType === 'preFill'"
 							:tableColumns="ladderStepColumns" :prefixKey="'ladder_' + ladderIndex"
+							:configType="'ladder'"
 							:ref="`ladderRef_${ladderIndex}`" :fieldItemLabel="$t('template.common.jtpz')"
 							@deleteConfig="deleteConfig('ladderConfigs',ladderConfig)"
 							:fillType="fillType" />
@@ -50,6 +51,7 @@
 						<LadderConfig :currentFormConfig="paralleStepFormConfig" :currentFormData="paralleConfig"
 							:showOperation="fillType === 'actFill' || fillType === 'preFill'"
 							:tableColumns="paralleStepColumns" :prefixKey="'paralle_' + paralleIndex"
+							:configType="'paralle'"
 							:ref="`paralleRef_${paralleIndex}`" :fieldItemLabel="$t('template.common.pxpz')"
 							@deleteConfig="deleteConfig('paralleConfigs',paralleConfig)"
 							:fillType="fillType" />
@@ -234,7 +236,7 @@ export default {
 			// 添加新的平行配制配置
 			this.formData.paralleConfigs.push({
 				id: getuuid(),
-				paralleStepData: [],
+				stepData: [],
 				paralleTableFormData: [],
 				showParalleConfig: true
 			});
@@ -250,7 +252,7 @@ export default {
 			// 添加新的阶梯配制配置
 			this.formData.ladderConfigs.push({
 				id: getuuid(),
-				ladderStepData: [],
+				stepData: [],
 				ladderTableFormData: [],
 				showLadderConfig: true
 			});
@@ -318,7 +320,7 @@ export default {
 					ladderConfigsData.push({
 						...baseFormData,
 						...tableData,
-						ladderStepData: stepData,
+						stepData: stepData,
 						showLadderConfig: true,
 						id
 					});
@@ -339,7 +341,7 @@ export default {
 					paralleConfigsData.push({
 						...baseFormData,
 						...tableData,
-						paralleStepData: stepData,
+						stepData: stepData,
 						showParalleConfig: true,
 						id
 					});

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

@@ -1,7 +1,7 @@
 <template>
     <div class="template-form-item">
         <div class="config-header">
-            <div>{{ $t('template.common.jtpz') }}</div>
+            <div>{{ $t(fieldItemLabel) }}</div>
             <el-button v-if="fillType === 'preFill'" type="text" icon="el-icon-delete"
                 @click="deleteConfig">{{
                     $t('template.common.deleteBtn')
@@ -18,8 +18,8 @@
             @bodySelectChange="bodySelectChange"
             @beforeSaveRecord="(data) => onBeforeSaveRecord(data )"
             @headerSelectChange="(data) => onHeaderSelectChange(data)"
-			@beforeReagentSubmit="(data) => onTableBeforeReagentSubmit(data, paralleIndex, paralleConfig)"
-			@onRegentSubmit="(data) => onTableRegentSubmit('paralle', paralleIndex, data)"
+			@beforeReagentSubmit="(data) => onTableBeforeReagentSubmit(data)"
+			@onRegentSubmit="(data) => onTableRegentSubmit( data)"
             :prefixKey="prefixKey" :fieldItemLabel="fieldItemLabel">
             <template slot="operation" slot-scope="{ row, rowIndex, columns }">
                 <TableOpertaion @printTag="(e) => printTag(e)"
@@ -32,7 +32,7 @@
             </template>
         </CustomTable>
 
-        <Step class="mt-0 s-container" ref="stepRef" :formData="currentFormData.ladderStepData"
+        <Step class="mt-0 s-container" ref="stepRef" :formData="currentFormData.stepData"
             :fieldItemLabel="fieldItemLabel" :prefixKey="prefixKey"></Step>
     </div>
 </template>
@@ -107,11 +107,10 @@ export default {
             }
         },
         // 实现getFormData方法，用于表单验证
-        getFormData() {
-            const baseFormData = this.$refs.formPackageRef?.getFormData();
-            const tableData = this.$refs.tableRef?.getFormData();
-            const stepData = this.$refs.stepRef?.getFormData();
-            
+        async getFormData() {
+            const baseFormData = await this.$refs.formPackageRef?.getFormData();
+            const tableData = await this.$refs.tableRef?.getFormData();
+            const stepData =await  this.$refs.stepRef?.getFormData();
             // 检查所有组件是否都返回了有效的数据
             if (!baseFormData || !tableData || !stepData) {
                 return false;
@@ -179,7 +178,7 @@ export default {
         // 表格失去焦点事件
 		onHandleTableBlur(e) {
             const { configType } = this;
-			const { colKey = "", item, rowIndex, headerSelectFields } = e;
+			const { colKey = "", item, rowIndex, headerSelectFields,dataSource } = e;
 			if (colKey === "targetStartSolutionConcentration" || colKey === "targetSolutionVolume" || colKey === "targetSolutionConcentration" || colKey === "targetStartSolutionVolumePrecision" || colKey === "targetDiluentVolumePrecision") {
 				if (configType === "ladder") {
 					const { targetStartSolution, subTargetStartSolution } = this.$refs.formPackageRef?.getFilledFormData();
@@ -196,9 +195,15 @@ export default {
 			} else if (colKey === "actStartSolutionVolume" || colKey === "actDiluentVolume") {//实际起始溶液体积和实际目标溶液体积
 				if (configType === "ladder") {
 					const targetAcSolution = this.$refs.formPackageRef?.getFormDataByKey("targetAcSolution");//获取实际起始溶液浓度
+					let initNd = 0;
+					if(rowIndex === 0){
+						initNd = targetAcSolution;
+					}else{
+						initNd = dataSource[rowIndex - 1].actSolutionConcentration;
+					}
 					const params = this.getLadderNdParamsByIndex();
 					if (targetAcSolution) {
-						const volResult = this.updateSjmbrynd(item, targetAcSolution, params);
+						const volResult = this.updateSjmbrynd(item, initNd, params);
 						if (!volResult) {
 							return
 						}
@@ -315,7 +320,6 @@ export default {
 			const { rowData, headerSelectFields } = val;
 			//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
 			const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
-			debugger
 			let postData = {
 				mc: null,
 				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
@@ -366,7 +370,7 @@ export default {
 			}
 		},
 		//平行配置 table选择试剂确定弹窗
-		onTableRegentSubmit(type, configIndex, data) {
+		onTableRegentSubmit(data) {
 			const { selectInfo, rowIndex, key, rowData } = data;
 			const { row, selectedId } = selectInfo;
 			if (key === "actStartSolutionCode") {//实际原始溶液编号点击事件
@@ -390,6 +394,9 @@ export default {
 				}
 			}
 		},
+		updateDataSourceByRowIndex(rowIndex, data) {
+			this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex, data);
+		},
     }
 }
 </script>

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

@@ -560,6 +560,7 @@ export default {
 		//计算目标溶液浓度
 		calcNd(item, targetAcSolution,params) {
 			console.log(params,"ppp")
+			// debugger
 			//targetStartSolutionUnit(实际起始源溶液浓度单位)
 			const {targetStartSolutionUnit,headerSelectFields} = params;
 			//actStartSolutionVolumeUnit(实际起始源溶液体积单位)actSolutionVolumeUnit(实际目标溶液体积单位)
@@ -575,6 +576,7 @@ export default {
 			if(isValueEmpty(actStartSolutionVolume) || isValueEmpty(actDiluentVolume) || isValueEmpty(targetStartSolutionUnit)){
 				return false
 			}
+			
 			const converActDiluentVolume = volumeConverter.convert(actDiluentVolume+actDiluentVolumeUnit,actSolutionVolumeUnit)
 			const converActStartSolutionVolume = volumeConverter.convert(actStartSolutionVolume+actStartSolutionVolumeUnit,actSolutionVolumeUnit)
 			//实际源溶液加入体积+实际稀释液加入体积