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

src/components/Template/BaseInfoFormPackage.vue

@@ -444,9 +444,7 @@ export default {
             const arr = ["动物种属", "细胞系"];
             return arr.includes(value)
         },
-        onBeforeReagentSubmit(data, callback, key) {
-            this.$emit('beforeReagentSubmit', { selectData: data, callback, key, formFields: this.formFields })
-        },
+       
         // 点击按钮
         handleClickButton(e, item, val, data, key) {
             if (!item.isClearForm) {

src/components/Template/CustomTable.vue

@@ -813,6 +813,13 @@ export default {
 				!(error.rowIndex === -1 &&
 					error.field === col.headerSelectKey)
 			);
+			
+			if (col && col.headerSelectTo) {
+				this.formErrors = this.formErrors.filter(error =>
+					!(error.rowIndex === -1 &&
+						error.field === col.headerSelectTo)
+				);
+			}
 		},
 		// 检查并应用 compareTo 逻辑
 		checkCompareToLogic(rowIndex, colIndex, colKey, value) {

src/components/Template/StepComponents/ry/cs.vue

@@ -64,7 +64,7 @@ export default {
                         fillType: "preFill",
                     },
                     text5: {
-                        label: "，实际时长为",
+                        label: "，实际设置时长为",
                         type: "text",
                     },
                     sjsc: {

src/components/Template/StepComponents/ry/dc.vue

@@ -39,7 +39,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         text3:{
-                            label:"°C，实际温度为",
+                            label:"°C，实际温度设置为",
                             type:"text",
                         },
                         actTemp:{

src/components/Template/StepComponents/ry/fs.vue

@@ -34,7 +34,7 @@ export default {
                         fillType: "preFill",
                     },
                     text3: {
-                        label: "°C，实际温度",
+                        label: "°C，实际温度设置为",
                         type: "text",
                     },
                     sjwd: {

src/components/Template/StepComponents/ry/jb.vue

@@ -46,7 +46,7 @@ export default {
                         fillType: "preFill",
                     },
                     text5: {
-                        label: "实际转速为",
+                        label: "实际转速设置为",
                         type: "text",
                     },
                     sjzs: {

src/components/Template/StepComponents/ry/jrjb.vue

@@ -49,7 +49,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             copyFrom:"yjwd"
                         },
                         text4:{
-                            label:"，设置预计转速为",
+                            label:"°C，设置预计转速为",
                             type:"text",
                         },
                         yjzs2:{
@@ -63,7 +63,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill", 
                         },
                         text5:{
-                            label:"实际转速为",
+                            label:"实际转速设置为",
                             type:"text",
                         },
                         sjzs:{

src/components/Template/StepComponents/ry/sy.vue

@@ -39,7 +39,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         text3:{
-                            label:"°C，实际温度为",
+                            label:"°C，实际温度设置为",
                             type:"text",
                         },
                         actTemp:{

src/components/Template/StepComponents/ry/zlfz.vue

@@ -2,15 +2,15 @@
 <template>
     <StepFormPackage :fieldItemLabel="fieldItemLabel" @onRegentSubmit="onRegentSubmit" ref="stepFormPackageRef"
         :prefixKey="stepIndex + '_' + 'ry_zlfz'" @resetRecord="resetRecord" :form-config="formConfig"
-        @onSubPackageSubmit="onSubPackageSubmit" :formData="formData" />
+        @beforeReagentSubmit="beforeReagentSubmit" @onSubPackageSubmit="onSubPackageSubmit" :formData="formData" />
 </template>
 
 <script>
 import StepFormPackage from '@/components/Template/StepFormPackage.vue';
 import stepMixins from '@/components/Template/mixins/stepMixins.js';
-import { compareVolume } from '@/utils/volumeTools.js';
+import {isMassUnit,compareMass} from "@/utils/massTool";
 import {
-  sj_subpackage,
+    sj_subpackage,
 } from '@/api/business/sj/sj'
 export default {
     mixins: [stepMixins],
@@ -51,6 +51,12 @@ export default {
         }
     },
     methods: {
+        beforeReagentSubmit(data) {
+            const { selectData, callback} = data;
+            if (!isMassUnit(selectData.kcdw)) {
+                callback.prevent('源药库存量为非质量单位，请重新选择。')
+            }
+        },
         onRegentSubmit(data) {
             console.log(data, "onRegentSubmit")
             const { key, selectInfo } = data;
@@ -71,7 +77,7 @@ export default {
                         const dw = zlfz.formData.dw;
                         const errMsg = "分装后小份容量之和大于母液容量，是否确认分装？"
                         const totalVolume = zlfz.fzList.reduce((acc, cur) => acc + Number(cur.actnum), 0);
-                        const compareResult = compareVolume(totalVolume, dw, kc, kcdw);
+                        const compareResult = compareMass(totalVolume, dw, Number(kc), kcdw);
                         const fzInfo = {
                             ...zlfz.formData,
                             gg,
@@ -104,8 +110,8 @@ export default {
         },
         async submitEmit(fzInfo) {
             this.$refs.stepFormPackageRef.updateFormData("fzInfo", fzInfo);
-            const { dw,bh, gg, ggdw, fzList = [] } = fzInfo;
-            if(!fzList.length){
+            const { dw, bh, gg, ggdw, fzList = [] } = fzInfo;
+            if (!fzList.length) {
                 this.$message.error("请填写分装信息");
                 return;
             }
@@ -134,7 +140,7 @@ export default {
             } else {
                 this.$message.error('分装失败')
             }
-            
+
         }
     }
 }

src/components/Template/StepComponents/ry/zyhy.vue

@@ -49,7 +49,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         text3:{
-                            label:"，实际转速为",
+                            label:"，实际转速设置为",
                             type:"text",
                         },
                         sjzs:{

src/components/Template/StepFormPackage.vue

@@ -40,6 +40,7 @@
                     <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+ '_' + key"
                         :type="sItem.type" :error="errors[key]"
                         @onRegentSubmit="(data)=>onRegentSubmit(data,key,sItem)"
+                        @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, key)"
                         @update:error="errors[key] = false"  :item="getRegentItem(sItem)"
                         :orange-bg="regentIsExpired(key)"
                         :value="formFields[key]" />

src/components/Template/mixins/formPackageMixins.js

@@ -52,6 +52,9 @@ export default {
       const currentConfig = this.allFieldsConfig[key]
       if (currentConfig?.selectTo) {
         this.formFields[currentConfig?.selectTo] = val
+        if (this.errors[currentConfig?.selectTo]) {
+        this.$set(this.errors, currentConfig?.selectTo, false)
+      }
       }
       this.onValueChangeCompareTo(key, val)
       this.formFields[key] = val
@@ -76,7 +79,6 @@ export default {
     onRegentSubmit(data, inputValue, key, item) {
       this.updateFormData(key, inputValue)
       this.formFields[`selectInfo_${key}`] = data.selectInfo;
-      console.log(this.formFields,"fff")
       this.$emit('onRegentSubmit', {
         selectInfo: data,
         inputValue,
@@ -84,6 +86,9 @@ export default {
         config: item
       })
     },
+    onBeforeReagentSubmit(data, callback, key) {
+        this.$emit('beforeReagentSubmit', { selectData: data, callback, key, formFields: this.formFields })
+    },
     getRegentItem(item, fieldCode = 'type') {
       const type = item[fieldCode]
       const fillType =
@@ -388,9 +393,19 @@ export default {
         }
       })
       // 处理selectInfo_开头的字段，步骤表单需要保留selectInfo_开头的字段
-      const selectInfoKeys = Object.keys(formData).filter((key) =>
-        key.startsWith('selectInfo_')
-      )
+      // 优先使用this.formFields中以selectInfo_开头的字段
+      let selectInfoKeys = []
+      if (this.formFields) {
+        selectInfoKeys = Object.keys(this.formFields).filter((key) =>
+          key.startsWith('selectInfo_')
+        )
+      }
+      // 如果this.formFields中没有，则使用formData中的
+      if (selectInfoKeys.length === 0 && formData) {
+        selectInfoKeys = Object.keys(formData).filter((key) =>
+          key.startsWith('selectInfo_')
+        )
+      }
       selectInfoKeys.forEach((key) => {
         result[key] = this.formFields[key] || formData[key] || ''
       })

src/utils/massTool.js

@@ -0,0 +1,36 @@
+// massUnitUtils.js
+const toGramFactor = {
+    'pg': 1e-12,
+    'ng': 1e-9,
+    'ug': 1e-6,
+    'mg': 0.001,
+    'g': 1,
+    'kg': 1000
+};
+
+const validUnits = Object.keys(toGramFactor);
+
+export function isMassUnit(unit) {
+    if (typeof unit !== 'string') return false;
+    return validUnits.includes(unit.toLowerCase());
+}
+
+function toGrams(value, unit) {
+    if (typeof value !== 'number' || isNaN(value)) {
+        throw new Error('值必须是有效数字');
+    }
+    const lowerUnit = unit.toLowerCase();
+    if (!isMassUnit(lowerUnit)) {
+        throw new Error(`无效的质量单位: ${unit}`);
+    }
+    return value * toGramFactor[lowerUnit];
+}
+
+export function compareMass(value1, unit1, value2, unit2) {
+    const grams1 = toGrams(value1, unit1);
+    const grams2 = toGrams(value2, unit2);
+    
+    if (grams1 > grams2) return 1;
+    if (Math.abs(grams1 - grams2) < 1e-12) return 0;
+    return -1;
+}

src/views/business/comps/template/comps/dj/DJ001.vue

@@ -11,49 +11,32 @@
 					<!-- 操作步骤 -->
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
-						<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" 
-							ref="operateStepRef" :formConfig="operateConfig" :formData="formData" />
-						<BaseInfoFormPackage v-if="fillType !== 'preFill'" fieldItemLabel="template.dj.dj001.fhfw" 
+						<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" ref="operateStepRef"
+							:formConfig="operateConfig" :formData="formData" />
+						<BaseInfoFormPackage v-if="fillType !== 'preFill'" fieldItemLabel="template.dj.dj001.fhfw"
 							ref="fhfwCheckBoxRef" :formConfig="fhfwCheckBoxConfig" :formData="formData" />
-						<div class="template-form-item" >
-							<span>{{ $t('template.dj.dj001.fhfw')  }}</span>
-							<CustomTable
-								:columns="operateColumns"
-								ref="operateTableRef"
-								:showOperation="fillType === 'preFill'"
-								:showAddRow="fillType === 'preFill'"
-								:formData="formData"
-								:isBorder="false"
-								:prefixKey="`operateTable`"
-							>
+						<div class="template-form-item">
+							<span>{{ $t('template.dj.dj001.fhfw') }}</span>
+							<CustomTable :columns="operateColumns" ref="operateTableRef"
+								:showOperation="fillType === 'preFill'" :showAddRow="fillType === 'preFill'"
+								:formData="formData" :isBorder="false" :prefixKey="`operateTable`">
 								<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaionDelete
-									:row="row"
-									:rowIndex="rowIndex"
-									:columns="columns"
-									@deleteRow="() => deleteTableRow(rowIndex, 'operateTableRef')"
-								></TableOpertaionDelete>
+									<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="columns"
+										@deleteRow="() => deleteTableRow(rowIndex, 'operateTableRef')">
+									</TableOpertaionDelete>
 								</template>
 							</CustomTable>
 						</div>
-						<div class="template-form-item" >
+						<div class="template-form-item">
 							<span>{{ $t('template.dj.dj001.fhlr') }}</span>
-							<CustomTable
-								:columns="fhlrColumns"
-								ref="fhlrTableRef"
-								:showOperation="fillType === 'preFill'"
-								:showAddRow="fillType === 'preFill'"
-								:formData="{ stepTableFormData: formData.stepTableFormData_1 }"
-								:isBorder="false"
-								:prefixKey="`fhlrTable`"
-							>
+							<CustomTable :columns="fhlrColumns" ref="fhlrTableRef"
+								:showOperation="fillType === 'preFill'" :showAddRow="fillType === 'preFill'"
+								:formData="{ stepTableFormData: formData.stepTableFormData_1 }" :isBorder="false"
+								:prefixKey="`fhlrTable`">
 								<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaionDelete
-									:row="row"
-									:rowIndex="rowIndex"
-									:columns="columns"
-									@deleteRow="() => deleteTableRow(rowIndex, 'fhlrTableRef')"
-								></TableOpertaionDelete>
+									<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="columns"
+										@deleteRow="() => deleteTableRow(rowIndex, 'fhlrTableRef')">
+									</TableOpertaionDelete>
 								</template>
 							</CustomTable>
 						</div>
@@ -130,7 +113,7 @@ export default {
 						},
 					}
 				},
-				
+
 			]
 		},
 		//操作步骤配制
@@ -146,7 +129,7 @@ export default {
 						},
 					}
 				},
-				
+
 			]
 		},
 		//复核范围配制
@@ -166,11 +149,11 @@ export default {
 							type: "checkboxTree",
 							fillType: 'actFill',
 							options: Array.isArray(this.fhlrCheckOptions) ? this.fhlrCheckOptions : []
-							
+
 						},
 					}
 				},
-				
+
 			]
 		},
 		//复核范围
@@ -204,8 +187,8 @@ export default {
 				fhfwCheck: { checkedValues: [], otherValues: {} },
 				fhlrCheck: { checkedValues: [], otherValues: {} },
 			},
-			fhfwCheckOptions:[],
-			fhlrCheckOptions:[],
+			fhfwCheckOptions: [],
+			fhlrCheckOptions: [],
 			isFirstTableDataRecorded: false,
 		};
 	},
@@ -213,25 +196,29 @@ export default {
 		this.getTableData()
 	},
 	methods: {
+		// 删除表格行
+		async deleteTableRow(rowIndex, refName) {
+			this.$refs[refName].deleteRow(rowIndex)
+		},
 		//获取已填写的表单数据
 		getFilledFormData() {
 			return this.getFilledFormDataByRefs(
 				[
-				 "baseInfoRef",  "operateStepRef", "operateTableRef", "fhlrTableRef", "fhfwCheckBoxRef"
+					"baseInfoRef", "operateStepRef", "operateTableRef", "fhlrTableRef", "fhfwCheckBoxRef"
 				]
 			)
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
 			let content = await this.validFormFields([
-				"baseInfoRef",  "operateStepRef", "operateTableRef", "fhlrTableRef", "fhfwCheckBoxRef"
+				"baseInfoRef", "operateStepRef", "operateTableRef", "fhlrTableRef", "fhfwCheckBoxRef"
 			]);
 			return content;
 		},
 		getResource() {
 			//使用的试剂、仪器
 			// const stepResource = this.$refs.stepRef.getStepResource()
-			this.resourceTmp =  []
+			this.resourceTmp = []
 			this.yqResourceTmp = []
 			return this.resourceTmp;
 		},
@@ -241,7 +228,7 @@ export default {
 			console.log(content);
 		},
 		// 删除表格行
-		deleteRow(rowIndex,type) {
+		deleteRow(rowIndex, type) {
 			const tableRef1 = this.$refs['operateTableRef'];
 			const tableRef2 = this.$refs['tableSecondRef'];
 			if (type == 'firstTable' && tableRef1) {
@@ -258,12 +245,12 @@ export default {
 				// 修复：增加空值保护
 				const stepTableFormData = formData.stepTableFormData || this.formData.stepTableFormData || [];
 				const stepTableFormData_1 = formData.stepTableFormData_1 || this.formData.stepTableFormData_1 || [];
-				
+
 				// 处理数据为checkboxTree期望的格式（包含children结构）
 				const firstList = stepTableFormData
 					.filter(item => item && item.fhfw && item.fhfw.trim()) // 严格过滤空值
-					.map(item => ({ 
-						label: item.fhfw, 
+					.map(item => ({
+						label: item.fhfw,
 						value: item.fhfw,
 						children: [] // 必须包含children字段，否则checkboxTree会报错
 					}))
@@ -274,8 +261,8 @@ export default {
 
 				const secondList = stepTableFormData_1
 					.filter(item => item && item.fhlr && item.fhlr.trim()) // 严格过滤空值
-					.map(item => ({ 
-						label: item.fhlr, 
+					.map(item => ({
+						label: item.fhlr,
 						value: item.fhlr,
 						children: [] // 必须包含children字段
 					}))
@@ -284,11 +271,11 @@ export default {
 					});
 
 				// 响应式更新
-				this.$nextTick(()=>{
+				this.$nextTick(() => {
 					this.fhfwCheckOptions = firstList;
 					this.fhlrCheckOptions = secondList;
 				})
-				
+
 			} catch (error) {
 				// 异常时重置为空数组，避免页面崩溃
 				this.fhfwCheckOptions = [];
@@ -298,5 +285,4 @@ export default {
 	}
 };
 </script>
-<style rel="stylesheet/scss" lang="scss">
-</style>
+<style rel="stylesheet/scss" lang="scss"></style>

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

@@ -83,7 +83,7 @@
 								:showOperation="fillType === 'actFill' || fillType === 'preFill'"
 								:tableColumns="ladderStepColumns" :prefixKey="'ladder_1_' + ladderIndex"
 								:configType="'ladder'" :ref="`ladderRef_1_${ladderIndex}`"
-								:fieldItemLabel="'template.lba.lba005.zkpz'"
+								:fieldItemLabel="getTableLabel('ladder')"
 								@deleteConfig="deleteConfig('ladderConfigs_1', ladderConfig)" :fillType="fillType" />
 						</div>
 
@@ -94,7 +94,7 @@
 								:showOperation="fillType === 'actFill' || fillType === 'preFill'"
 								:tableColumns="paralleStepColumns1" :prefixKey="'paralle_1_' + paralleIndex"
 								:configType="'paralle'" :ref="`paralleRef_1_${paralleIndex}`"
-								:fieldItemLabel="'template.lba.lba005.zkpz'"
+								:fieldItemLabel="getTableLabel('paralle')"
 								@deleteConfig="deleteConfig('paralleConfigs_1', paralleConfig)" :fillType="fillType" />
 						</div>
 					</template>

src/views/business/comps/template/formConfig/xb/xb001.js

@@ -296,7 +296,7 @@ export const getStepFivth = ($this) => {
           fillType: 'preFill'
         },
         text4: {
-          label: '℃，实际温度',
+          label: '℃，实际温度设置',
           type: 'text'
         },
         sjwd: {