From 7978b3eb352bc3b02ec7f6f5710b8a4f55c35cf7 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Tue, 3 Mar 2026 14:46:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?=
 =?UTF-8?q?ate]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/BaseInfoFormPackage.vue    |  26 +---
 src/components/Template/HandleFormItem.vue         | 144 ++++++++++++++++++++-
 .../business/comps/template/comps/sp/SP0020.vue    |   6 +-
 .../comps/template/formConfig/sp/SP0019.js         |   4 +-
 .../comps/template/formConfig/sp/SP0020.js         |  58 ++++++++-
 5 files changed, 206 insertions(+), 32 deletions(-)

diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue
index b26a054..cb4705b 100644
--- a/src/components/Template/BaseInfoFormPackage.vue
+++ b/src/components/Template/BaseInfoFormPackage.vue
@@ -125,14 +125,6 @@
                                     @update:error="errors[key] = false" @resetRecord="resetRecord(key)" :item="sItem"
                                     :value="formFields[key]" />
                             </div>
-
-                            <div v-else-if="sItem.type === 'checkboxList'" class="flex1">
-                                <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                    type="checkboxList" :item="sItem" :value="formFields[key]"
-                                    @copy="onCopy(sItem, key)" @change="(e) => onAttachmentChange(key, e)"
-                                    :error="errors[key]" @update:error="errors[key] = false"
-                                    :orange-bg="orangeBgFields[key]" />
-                            </div>
                             <div v-else-if="isRegent(sItem)" class="flex1">
                                 <HandleFormItem
                                     @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, key)"
@@ -293,12 +285,6 @@
                                 @update:error="errors[key] = false" @resetRecord="resetRecord(key)" :item="sItem"
                                 :value="formFields[key]" />
                         </div>
-                        <div v-else-if="sItem.type === 'checkboxList'" class="flex flex1">
-                            <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                type="checkboxList" :item="sItem" :value="formFields[key]" @copy="onCopy(sItem, key)"
-                                @change="(e) => onAttachmentChange(key, e)" :error="errors[key]"
-                                @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" />
-                        </div>
                         <div v-else-if="isRegent(sItem)" class="flex item-center flex1">
                             <HandleFormItem :field-item-label="fieldItemLabel" sourceFrom="baseInfoFormPackage"
                                 @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, key)"
@@ -313,15 +299,17 @@
                 </div>
             </template>
             <template v-else-if="item.type === 'checkboxList'">
-                <div class="form-item ">
+                <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 item-center">
+                        <div class="p-r-20 item-center" :class="sItem.span == 1 ? 'full-row' : ''">
                             <div class="form-title mr-20">{{ $t(sItem.label) }}</div>
                             <div class="flex flex1">
-                                <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                    type="checkboxList" :item="sItem" :value="formFields[key]"
-                                    @copy="onCopy(sItem, key)" @change="(e) => onAttachmentChange(key, e)"
+                                <HandleFormItem 
+                                    v-if="sItem.type === 'checkboxList' || sItem.type === 'checkboxTree'"
+                                    :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
+                                    :type="sItem.type" :item="sItem" :value="formFields[key]"
+                                     @change="(e) => onAttachmentChange(key, e)"
                                     :error="errors[key]" @update:error="errors[key] = false"
                                     :orange-bg="orangeBgFields[key]" />
                             </div>
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index 091b4b1..58dc9b4 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -50,7 +50,33 @@
             </div>
             <div v-else-if="type === 'checkboxTree'" class="flex1 checkbox-list-container"
                 :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')">
-                
+                <div v-for="group in item.options" :key="group.value" class="checkbox-tree-group">
+                    <el-checkbox 
+                        :label="group.value" 
+                        :disabled="getDisabled()"
+                        :checked="isCheckboxTreeChecked(group.value)"
+                        @change="onCheckboxTreeChange(group.value, $event)">
+                        {{ group.label }}
+                    </el-checkbox>
+                    <div v-if="group.children && group.children.length > 0" class="checkbox-tree-children">
+                        <div v-for="child in group.children" :key="child.value" class="checkbox-tree-item">
+                            <el-checkbox 
+                                :label="child.value" 
+                                :disabled="getDisabled()"
+                                :checked="isCheckboxTreeChecked(child.value)"
+                                @change="onCheckboxTreeChange(child.value, $event)">
+                                {{ child.label }}
+                            </el-checkbox>
+                            <div v-if="(child.value === '样品信息' || child.value === '其他') && isCheckboxTreeChecked(child.value)" class="checkbox-tree-input-container">
+                                <el-input 
+                                    v-model="checkboxTreeValue.otherValues[child.value]"
+                                    :class="{ 'error-border': isCheckboxTreeOtherInputError(child.value) }" 
+                                    placeholder="请输入" 
+                                    @blur="onCheckboxTreeOtherBlur(child.value, $event)"/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
             <el-date-picker v-else-if="type === 'dateTime'" type="datetime" class="flex1"
                 :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')" v-model="inputValue"
@@ -295,6 +321,9 @@ export default {
             oldFqyqValue: {...initialValue}, // 记录上一次的fqyq值
             checkboxListValue: initialValue, // checkboxList类型的值
             oldCheckboxListValue: JSON.parse(JSON.stringify(initialValue)), // 记录上一次的checkboxList值
+            checkboxTreeValue: this.type === 'checkboxTree' ? (this.value || { checkedValues: [], otherValues: {} }) : {}, // checkboxTree类型的值
+            oldCheckboxTreeValue: this.type === 'checkboxTree' ? JSON.parse(JSON.stringify(this.value || { checkedValues: [], otherValues: {} })) : {}, // 记录上一次的checkboxTree值
+            checkboxTreeFirstCheck: this.type === 'checkboxTree' ? {} : {}, // 记录第一次勾选的状态
             uuid: getuuid(), // 唯一标识符，用于EventBus事件匹配
             regentType: ['sj', 'gsp', 'mix', 'xj', 'xb', 'gyzj', 'mjy', 'yq', 'jcb', 'qxbd'],  //试剂/仪器/供试品等类型
             selectRegentInfo: {},//选择的试剂/仪器/供试品等信息
@@ -308,6 +337,7 @@ export default {
             currentTagIndex:-1,//当前选中的checkboxTag索引
             currentHandleType:'',//当前操作的类型
             currentOtherCode:'',//当前操作的otherCode
+            currentCheckboxTreeValue: '',//当前操作的checkboxTree值
         }
     },
     watch: {
@@ -327,6 +357,10 @@ export default {
                     inputValue: newVal.inputValue || '',
                     subRadio: newVal.subRadio || ''
                 };
+            } else if (this.type === 'checkboxTree' && newVal && typeof newVal === 'object') {
+                // checkboxTree类型
+                this.checkboxTreeValue = JSON.parse(JSON.stringify(newVal));
+                this.oldCheckboxTreeValue = JSON.parse(JSON.stringify(newVal));
             } else {
                 this.inputValue = newVal;
             }
@@ -683,7 +717,7 @@ export default {
         },
         getFillTypeStyle(type) {
             const { fillType } = this.item;
-            const filterType = ["attachment","checkboxTag","fqyq"]
+            const filterType = ["attachment","checkboxTag","fqyq","checkboxTree"]
             const typeObj = {
                 actFill: "orange-border",//实际填写的边框颜色
                 green: "green-border",
@@ -884,6 +918,80 @@ export default {
             this.checkboxListValue.otherValues[otherCode] = e.target.value;
             this.onCommonHandleSaveRecord(e.target.value);
         },
+        
+        // 检查checkboxTree的某个值是否被选中
+        isCheckboxTreeChecked(value) {
+            return this.checkboxTreeValue.checkedValues && this.checkboxTreeValue.checkedValues.includes(value);
+        },
+        
+        // 检查checkboxTree的其他输入框是否有错误
+        isCheckboxTreeOtherInputError(value) {
+            if (!this.error) {
+                return false;
+            }
+            return isValueEmpty(this.checkboxTreeValue.otherValues[value]);
+        },
+        
+        // checkboxTree的复选框变化处理
+        onCheckboxTreeChange(value, checked) {
+            this.currentHandleType = 'checkboxTree';
+            this.currentCheckboxTreeValue = value;
+            
+            // 初始化checkedValues数组
+            if (!this.checkboxTreeValue.checkedValues) {
+                this.checkboxTreeValue.checkedValues = [];
+            }
+            
+            // 初始化otherValues对象
+            if (!this.checkboxTreeValue.otherValues) {
+                this.checkboxTreeValue.otherValues = {};
+            }
+            
+            // 处理选中状态
+            if (checked) {
+                if (!this.checkboxTreeValue.checkedValues.includes(value)) {
+                    this.checkboxTreeValue.checkedValues.push(value);
+                }
+            } else {
+                const index = this.checkboxTreeValue.checkedValues.indexOf(value);
+                if (index > -1) {
+                    this.checkboxTreeValue.checkedValues.splice(index, 1);
+                    // 清除对应的otherValues
+                    delete this.checkboxTreeValue.otherValues[value];
+                }
+            }
+            
+            // 检查是否是第一次勾选
+            const isFirstCheck = !this.checkboxTreeFirstCheck[value];
+            if (isFirstCheck) {
+                this.checkboxTreeFirstCheck[value] = true;
+                // 第一次勾选不需要验签
+                this.emitCheckboxTreeValue();
+                this.updateCheckboxTreeOldValue();
+            } else {
+                // 非第一次勾选需要验签
+                this.onCommonHandleSaveRecord();
+            }
+        },
+        
+        // checkboxTree的其他输入框失去焦点处理
+        onCheckboxTreeOtherBlur(value, e) {
+            this.currentHandleType = "checkboxTreeOther";
+            this.currentCheckboxTreeValue = value;
+            this.checkboxTreeValue.otherValues[value] = e.target.value;
+            this.onCommonHandleSaveRecord(e.target.value);
+        },
+        
+        // 发送checkboxTree的值
+        emitCheckboxTreeValue() {
+            this.$emit('input', JSON.parse(JSON.stringify(this.checkboxTreeValue)));
+            this.$emit('change', JSON.parse(JSON.stringify(this.checkboxTreeValue)));
+        },
+        
+        // 更新checkboxTree的旧值
+        updateCheckboxTreeOldValue() {
+            this.oldCheckboxTreeValue = JSON.parse(JSON.stringify(this.checkboxTreeValue));
+        },
         // 点击question图标
         onClickQuestion() {
             const { templateFillType } = this;
@@ -993,6 +1101,10 @@ export default {
                 const current = this.getFqyqInfo();
                 isSame = this.isEqual(current.oldValue,current.newValue);
                 isOldValueEmpty = isValueEmpty(current.oldValue);
+            } else if (this.type === "checkboxTree") {
+                // checkboxTree类型，比较checkedValues
+                isSame = this.isEqual(this.oldCheckboxTreeValue.checkedValues, this.checkboxTreeValue.checkedValues);
+                isOldValueEmpty = isValueEmpty(this.oldCheckboxTreeValue.checkedValues);
             } else {
                 isSame = this.isEqual(this.oldValue, this.inputValue)
                 isOldValueEmpty = isValueEmpty(this.oldValue);
@@ -1033,6 +1145,10 @@ export default {
                 // 如果没有指定字段，回退整个对象
                 this.fqyqValue = JSON.parse(JSON.stringify(this.oldFqyqValue));
                 oldValue = { ...this.fqyqValue };
+            } else if (this.type === "checkboxTree") {
+                // checkboxTree类型，回退整个对象
+                this.checkboxTreeValue = JSON.parse(JSON.stringify(this.oldCheckboxTreeValue));
+                oldValue = JSON.parse(JSON.stringify(this.oldCheckboxTreeValue));
             }
             this.inputValue = this.oldValue;
             this.$emit('input', oldValue); // 触发 v-model 更新
@@ -1071,6 +1187,14 @@ export default {
                 recordOldVlaue = `${current.des+(current.oldValue || '')}`;
                 recordValue = `${current.des+(current.newValue || '')}`;
                 isModify = !!current.oldValue;
+            } else if (this.type === "checkboxTree") {
+                // checkboxTree类型，记录当前操作的值变化
+                const value = this.currentCheckboxTreeValue;
+                const oldChecked = this.oldCheckboxTreeValue.checkedValues && this.oldCheckboxTreeValue.checkedValues.includes(value);
+                const currentChecked = this.checkboxTreeValue.checkedValues && this.checkboxTreeValue.checkedValues.includes(value);
+                recordOldVlaue = `${value}:${oldChecked ? '勾选' : '未勾选'}`;
+                recordValue = `${value}:${currentChecked ? '勾选' : '未勾选'}`;
+                isModify = oldChecked !== undefined;
             }
             const record = {
                 ...baseInfo,
@@ -1103,6 +1227,9 @@ export default {
             } else if (this.type === "fqyq") {
                 // 如果没有指定字段，更新整个对象
                 this.oldFqyqValue = JSON.parse(JSON.stringify(this.fqyqValue));
+            } else if (this.type === "checkboxTree") {
+                // checkboxTree类型，更新整个对象
+                this.oldCheckboxTreeValue = JSON.parse(JSON.stringify(this.checkboxTreeValue));
             }
             let value = this.inputValue;
             if (this.type === 'checkboxList') {
@@ -1114,6 +1241,8 @@ export default {
                 value = [...this.checkboxTagList];
             } else if (this.type === "fqyq") {
                 value = { ...this.fqyqValue };
+            } else if (this.type === "checkboxTree") {
+                value = JSON.parse(JSON.stringify(this.checkboxTreeValue));
             }
             if (this.type === "button") {
                 this.$emit('clickButton', this.item, this.inputValue, data);
@@ -1830,4 +1959,15 @@ export default {
 .mr-10{
     margin-right: 10px;
 }
+.checkbox-tree-children{
+    margin-left: 30px;
+    padding:16px 0;
+    gap: 16px;
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+}
+
+.checkbox-tree-item{
+    box-sizing: border-box;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/business/comps/template/comps/sp/SP0020.vue b/src/views/business/comps/template/comps/sp/SP0020.vue
index 0a9925b..55b0f15 100644
--- a/src/views/business/comps/template/comps/sp/SP0020.vue
+++ b/src/views/business/comps/template/comps/sp/SP0020.vue
@@ -8,7 +8,8 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						:ref="refConfig.baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<LineLabel label="试验内容" />
+					<BaseInfoFormPackage fieldItemLabel="试验内容" label="试验内容"
+						:ref="refConfig.synrRef" :formConfig="synrFormConfig" :formData="formData" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
 						:ref="refConfig.remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
@@ -33,6 +34,7 @@ import { getSynrFormConfig} from "../../formConfig/sp/SP0020";
 const refConfig = {
 	baseInfoRef: "baseInfoRef",
 	remarkRef: "remarkRef",
+	synrRef: "synrRef",
 }
 
 const compRefs = Object.values(refConfig);
@@ -53,7 +55,7 @@ export default {
 		},
 		// 试验基本信息表单配置
 		baseInfoFormConfig() {
-			return getBaseInfoFormConfig(this);
+			return getBaseInfoFormConfig('sp0020');
 		},
 		
 		// 备注表单配置
diff --git a/src/views/business/comps/template/formConfig/sp/SP0019.js b/src/views/business/comps/template/formConfig/sp/SP0019.js
index 4f1080b..e7ed166 100644
--- a/src/views/business/comps/template/formConfig/sp/SP0019.js
+++ b/src/views/business/comps/template/formConfig/sp/SP0019.js
@@ -1,4 +1,4 @@
-export const getBaseInfoFormConfig = ($this) => {
+export const getBaseInfoFormConfig = (formType) => {
     return [
         {
             type: 'cardItem',
@@ -16,7 +16,7 @@ export const getBaseInfoFormConfig = ($this) => {
                 methodCode: {
                     label: 'template.common.methodCode',
                     type: 'input',
-                    fillType: 'preFill',
+                    fillType: formType === 'sp0020' ? 'actFill' : 'preFill',
                     maxlength: 50
                 },
                 versionNum: {
diff --git a/src/views/business/comps/template/formConfig/sp/SP0020.js b/src/views/business/comps/template/formConfig/sp/SP0020.js
index a951969..21af9f2 100644
--- a/src/views/business/comps/template/formConfig/sp/SP0020.js
+++ b/src/views/business/comps/template/formConfig/sp/SP0020.js
@@ -1,13 +1,57 @@
-export const getSynrFormConfig = ($this) => {
+// checkboxTree 类型的配置
+const checkboxTreeOptions = [
+    {
+      label: '方法学验证',
+      value: '方法学验证',
+      children: [
+        { label: '储备液比对', value: '储备液比对' },
+        { label: '标准曲线线性范围', value: '标准曲线线性范围' },
+        { label: '准确度与精密度&灵敏度', value: '准确度与精密度&灵敏度' },
+        { label: '残留', value: '残留' },
+        { label: '选择性与特异性', value: '选择性与特异性' },
+        { label: '基质效应', value: '基质效应' },
+        { label: '提取回收率', value: '提取回收率' },
+        { label: '溶血基质效应', value: '溶血基质效应' },
+        { label: '批最大样本数', value: '批最大样本数' },
+        { label: '基质样品', value: '基质样品' },
+        { label: '基质样品长期冻存稳定性', value: '基质样品长期冻存稳定性' },
+        { label: '反复冻融稳定性', value: '反复冻融稳定性' },
+        { label: '稀释可靠性', value: '稀释可靠性' },
+        { label: '处理后样品稳定性', value: '处理后样品稳定性' },
+        { label: '进样重现性', value: '进样重现性' },
+        { label: '全血稳定性', value: '全血稳定性' },
+        { label: '储备液短期稳定性', value: '储备液短期稳定性' },
+        { label: '储备液长期稳定性', value: '储备液长期稳定性' },
+        { label: '工作液短期稳定性', value: '工作液短期稳定性' },
+        { label: '工作液长期稳定性', value: '工作液长期稳定性' }
+      ]
+    },
+    {
+      label: '样品分析',
+      value: '样品分析',
+      children: [
+        { label: '样品信息', value: '样品信息' }
+      ]
+    },
+    {
+      label: '其他',
+      value: '其他',
+      children: []
+    }
+  ]
+
+//试验内容
+export const getSynrFormConfig = ()=>{
     return [
         {
-            type: 'step',
+            type: 'checkboxList',
             config: {
-                yqmxh: {
-                    label: '色谱柱型号',
-                    type: 'yq',
-                    fillType: 'actFill',
-                    filledCodes:['mc','bh'],
+                ffxyz: {
+                     type: 'checkboxTree',
+                    label: '方法学验证',
+                    options:checkboxTreeOptions,
+                    span:1,
+                    fillType:"actFill"
                 },
             }
         },