Merge branch 'master' into ouqian_test

src/components/Template/BaseInfoFormPackage.vue

@@ -92,7 +92,7 @@
                                 <div v-show="isShowOther(formFields[key])" class="flex flex1 ml-10">
                                     <div class="other-title" v-if="isShowOtherLabel(sItem)">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
                                         $t("template.common.other") }}</div>
-                                    <div class="flex">
+                                    <div class="flex flex1">
                                         <HandleFormItem :field-item-label="fieldItemLabel"
                                             :field-key="prefixKey + '_' + sItem.otherCode" @blur="onBlur(key, $event)"
                                             :item="getOtherItem(sItem)" v-model="formFields[sItem.otherCode]"
@@ -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)"
@@ -194,7 +186,7 @@
                             <div v-show="isShowOther(formFields[key])" class="flex flex1 ml-10">
                                 <div class="other-title" v-if="isShowOtherLabel(sItem)">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
                                     $t("template.common.other") }}</div>
-                                <div class="flex">
+                                <div class="flex flex1">
                                     <HandleFormItem :field-item-label="fieldItemLabel"
                                         :field-key="prefixKey + '_' + sItem.otherCode" @blur="onBlur(key, $event)"
                                         :item="getOtherItem(sItem)" v-model="formFields[sItem.otherCode]"
@@ -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>

src/components/Template/CustomTable.vue

@@ -777,6 +777,9 @@ export default {
 			if (col.bodyDisabled) {
 				item.disabled = col.bodyDisabled;
 			}
+			if (col.qxbdType) {
+				item.qxbdType = col.qxbdType;
+			}
 			// 支持动态checkboxLabel - 从行数据中获取
 			const dynamicLabelKey = col.prop + 'Label';
 			if (currentItem && currentItem[dynamicLabelKey]) {

src/components/Template/HandleFormItem.vue

@@ -42,12 +42,38 @@
                         </el-checkbox>
                         <div v-if="isShowCheckboxListOther(option)">
                             <el-input v-model="checkboxListValue.otherValues[option.otherCode]"
-                                :class="{ 'error-border': isOtherInputError(option.otherCode) }" 
-                                :placeholder="option.otherPlaceholder || '请输入'" @blur="onCheckboxListOtherBlur($event, option.otherCode)"/>
+                                :class="{ 'error-border': isOtherInputError(option.otherCode) }"
+                                :placeholder="option.otherPlaceholder || '请输入'"
+                                @blur="onCheckboxListOtherBlur($event, option.otherCode)" />
                         </div>
                     </div>
                 </el-checkbox-group>
             </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()"
+                        :value="getCheckboxTreeChecked(group.value)"
+                        :indeterminate="getCheckboxTreeIndeterminate(group.value)"
+                        @change="onCheckboxTreeParentChange(group, $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()"
+                                :value="getCheckboxTreeChecked(child.value)"
+                                @change="onCheckboxTreeChildChange(group, 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="inputValue.otherValues[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"
                 :disabled="getDisabled()" format="yyyy/MM/dd HH:mm:ss" :placeholder="getPlaceholder()"
@@ -87,7 +113,8 @@
                     <div slot="tip" class="el-upload__tip">支持扩展名：.rar .zip .doc .docx .pdf .jpg，文件大小不超过2MB</div>
                 </el-upload>
             </template>
-            <div v-else-if="type === 'checkboxTag'" class="flex1 checkbox-tag-wrapper" :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')">
+            <div v-else-if="type === 'checkboxTag'" class="flex1 checkbox-tag-wrapper"
+                :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')">
                 <div v-for="(tag, tagIndex) in checkboxTagList" :key="tagIndex" class="checkbox-tag-container">
                     <div class="checkbox-tag-item">
                         <el-checkbox v-model="tag.checked" :disabled="getDisabled()"
@@ -95,8 +122,8 @@
                         <div class="tag-content blue-border">
                             <el-input v-if="templateFillType === 'preFill'" v-model="tag.tagValue"
                                 :ref="'tagInput_' + tagIndex" :maxlength="item.maxlength || 20"
-                                @blur="onTagBlur(tagIndex)" @keyup.enter.native="onTagBlur(tagIndex)"
-                                placeholder="请输入" size="mini" class="tag-input" />
+                                @blur="onTagBlur(tagIndex)" @keyup.enter.native="onTagBlur(tagIndex)" placeholder="请输入"
+                                size="mini" class="tag-input" />
                             <el-tag v-else :type="'info'" class="tag-display" :closable="false">
                                 {{ tag.tagValue }}
                             </el-tag>
@@ -110,13 +137,16 @@
                 </div>
             </div>
             <div v-else-if="type === 'fqyq'" :class="getFillTypeStyle()">
-                <el-radio-group v-model="fqyqValue.mainRadio" :disabled="getDisabled()" @input="onFqyqRadioChange($event,'mainRadio')">
+                <el-radio-group v-model="fqyqValue.mainRadio" :disabled="getDisabled()"
+                    @input="onFqyqRadioChange($event, 'mainRadio')">
                     <div class="item-center mb-10">
                         <el-radio label="是">是</el-radio>
                         <div class="item-center" v-if="fqyqValue.mainRadio === '是'">
-                            <el-input class="fqyq-input" maxlength="100" v-model="fqyqValue.inputValue" :disabled="getDisabled()" placeholder="请输入" @blur="onFqyqInputBlur" ></el-input>
+                            <el-input class="fqyq-input" maxlength="100" v-model="fqyqValue.inputValue"
+                                :disabled="getDisabled()" placeholder="请输入" @blur="onFqyqInputBlur"></el-input>
                             <div class="fs-14 mr-10">是否在规定时间完成</div>
-                            <el-radio-group v-model="fqyqValue.subRadio" :disabled="getDisabled()" @input="onFqyqRadioChange($event,'subRadio')">
+                            <el-radio-group v-model="fqyqValue.subRadio" :disabled="getDisabled()"
+                                @input="onFqyqRadioChange($event, 'subRadio')">
                                 <el-radio label="是"></el-radio>
                                 <el-radio label="否"></el-radio>
                             </el-radio-group>
@@ -197,7 +227,7 @@ import moment from "moment";
 import { deepClone } from "@/utils/index";
 import { getuuid } from "@/utils/index.js";
 import { getToken } from "@/utils/auth"
-import { isValueEmpty } from '@/utils/index.js';
+import { isValueEmpty, getDefaultValueByOptions } from '@/utils/index.js';
 
 export default {
     inject: ['templateData', 'templateFillType', "getZdxgjl", "getFhyjjl", "updateZdxgjl", "replaceFhyjjl", "updateFhyjjl", "getFieldCheckObj", "updateFieldCheckObj"],
@@ -256,14 +286,15 @@ export default {
     },
     data() {
         let initialValue = this.value;
+        console.log(this.value, "check value");
         let initialOtherValues = {}, checkboxTagList = [];
 
-       if(this.type === 'checkboxList' && !this.value) {
+        if (this.type === 'checkboxList' && !this.value) {
             initialValue = {
                 checkboxValues: [],
                 otherValues: {}
             };
-            
+
         } else if (this.type === 'checkboxTag' && Array.isArray(this.value)) {
             // checkboxTag类型，value是数组格式
             checkboxTagList = this.value.map(tag => ({
@@ -271,11 +302,14 @@ export default {
                 tagValue: tag.tagValue || ''
             }));
         } else if (this.type === 'fqyq' && !this.value) {
-            initialValue = {mainRadio: '', subRadio: '',inputValue:""};
+            initialValue = { mainRadio: '', subRadio: '', inputValue: "" };
+        } else if (this.type === 'checkboxTree' && !this.value) {
+            const defaultCheckedValue = getDefaultValueByOptions(this.item.options || []);
+            initialValue = { checkedValues: defaultCheckedValue, otherValues: {} };
         }
         return {
             inputValue: initialValue,
-            oldValue: initialValue, // 记录上一次的值
+            oldValue: typeof initialValue === 'object' ? JSON.parse(JSON.stringify(initialValue)) : initialValue, // 记录上一次的值
             showModal: false, // 控制模态框显示
             modificationRecords: [], // 存储修改记录
             modalTimer: null, // 用于延迟隐藏模态框
@@ -288,7 +322,7 @@ export default {
             checkboxTagList: checkboxTagList, // checkboxTag类型的列表数据
             oldCheckboxTagList: JSON.parse(JSON.stringify(checkboxTagList)), // 记录上一次的checkboxTagList
             fqyqValue: initialValue, // fqyq类型的值
-            oldFqyqValue: {...initialValue}, // 记录上一次的fqyq值
+            oldFqyqValue: { ...initialValue }, // 记录上一次的fqyq值
             checkboxListValue: initialValue, // checkboxList类型的值
             oldCheckboxListValue: JSON.parse(JSON.stringify(initialValue)), // 记录上一次的checkboxList值
             uuid: getuuid(), // 唯一标识符，用于EventBus事件匹配
@@ -301,13 +335,16 @@ export default {
             },
             pendingUploadFile: null, // 用于存储待上传的文件
             pendingRemoveFile: null, // 用于存储待删除的文件
-            currentTagIndex:-1,//当前选中的checkboxTag索引
-            currentHandleType:'',//当前操作的类型
-            currentOtherCode:'',//当前操作的otherCode
+            currentTagIndex: -1,//当前选中的checkboxTag索引
+            currentHandleType: '',//当前操作的类型
+            currentOtherCode: '',//当前操作的otherCode
+            currentCheckboxTreeValue: '',//当前操作的checkboxTree值
         }
     },
     watch: {
         value(newVal) {
+            console.log(newVal, "newVal")
+
             if (this.type === 'checkboxList' && newVal && typeof newVal === 'object') {
                 this.checkboxListValue = JSON.parse(JSON.stringify(newVal));
             } else if (this.type === 'checkboxTag' && Array.isArray(newVal)) {
@@ -324,7 +361,7 @@ export default {
                     subRadio: newVal.subRadio || ''
                 };
             } else {
-                this.inputValue = newVal;
+                this.inputValue = typeof newVal === 'object' ? JSON.parse(JSON.stringify(newVal)) : newVal;
             }
         }
     },
@@ -360,7 +397,7 @@ export default {
     },
     methods: {
         getFlexClass() {
-            const noFlexArr = ["radio", "checkboxTag","fqyq"]
+            const noFlexArr = ["radio", "checkboxTag", "fqyq"]
             return noFlexArr.includes(this.type) ? '' : 'flex1'
         },
         getDecimalDigits() {
@@ -598,6 +635,8 @@ export default {
                 };
                 if (type === "mix") {
                     params.mixType = true;
+                } else if (item.qxbdType) {
+                    params.qxbdType = item.qxbdType;
                 }
             }
             EventBus.$emit(eventName, params)
@@ -679,7 +718,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",
@@ -821,7 +860,7 @@ export default {
         },
         // 检查是否显示显示checkboxList的其他输入框
         isShowCheckboxListOther(option) {
-            const {checkboxValues   } = this.checkboxListValue
+            const { checkboxValues } = this.checkboxListValue
             if (!checkboxValues) {
                 return false;
             }
@@ -880,6 +919,148 @@ export default {
             this.checkboxListValue.otherValues[otherCode] = e.target.value;
             this.onCommonHandleSaveRecord(e.target.value);
         },
+
+        // 检查checkboxTree的某个值是否被选中
+        isCheckboxTreeChecked(value) {
+            if (!this.inputValue || !this.inputValue.checkedValues) {
+                return false;
+            }
+            const checkedItem = this.inputValue.checkedValues.find(item => item.label === value);
+            return checkedItem && checkedItem.checked;
+        },
+
+        // 检查checkboxTree的其他输入框是否有错误
+        isCheckboxTreeOtherInputError(value) {
+            if (!this.error) {
+                return false;
+            }
+            return isValueEmpty(this.inputValue.otherValues[value]);
+        },
+
+        // 获取checkboxTree的选中值
+        getCheckboxTreeChecked(value) {
+            const { checkedValues } = this.inputValue
+            const o = checkedValues.find(item => item.label === value) || {};
+            return !!o.checked;
+        },
+
+        // 获取或创建checkedItem
+        getOrCreateCheckedItem(value) {
+            let checkedItem = this.inputValue.checkedValues.find(item => item.label === value);
+            if (!checkedItem) {
+                checkedItem = { label: value, checked: false };
+                this.inputValue.checkedValues.push(checkedItem);
+            }
+            return checkedItem;
+        },
+
+        // 父级checkbox变化处理
+        onCheckboxTreeParentChange(group, checked) {
+            this.currentHandleType = 'checkboxTreeCheckbox';
+            this.currentCheckboxTreeValue = group.value;
+            
+            // 设置父级状态
+            const parentItem = this.getOrCreateCheckedItem(group.value);
+            parentItem.checked = checked;
+            
+            // 同步所有子级状态
+            if (group.children && group.children.length > 0) {
+                group.children.forEach(child => {
+                    const childItem = this.getOrCreateCheckedItem(child.value);
+                    childItem.checked = checked;
+                    // 如果取消选中，清除otherValues
+                    if (!checked) {
+                        delete this.inputValue.otherValues[child.value];
+                    }
+                });
+            }
+            
+            this.onCommonHandleSaveRecord();
+        },
+
+        // 子级checkbox变化处理
+        onCheckboxTreeChildChange(group, childValue, checked) {
+            this.currentHandleType = 'checkboxTreeCheckbox';
+            this.currentCheckboxTreeValue = childValue;
+            
+            // 设置子级状态
+            const childItem = this.getOrCreateCheckedItem(childValue);
+            childItem.checked = checked;
+            
+            // 如果取消选中，清除otherValues
+            if (!checked) {
+                delete this.inputValue.otherValues[childValue];
+            }
+            
+            // 更新父级状态
+            this.updateParentState(group);
+            
+            this.onCommonHandleSaveRecord();
+        },
+
+        // 更新父级状态（根据子级状态）
+        updateParentState(group) {
+            if (!group.children || group.children.length === 0) return;
+            
+            const parentItem = this.getOrCreateCheckedItem(group.value);
+            const childValues = group.children.map(child => child.value);
+            
+            // 统计子级选中状态
+            let checkedCount = 0;
+            let totalCount = childValues.length;
+            
+            childValues.forEach(childValue => {
+                const childItem = this.inputValue.checkedValues.find(item => item.label === childValue);
+                if (childItem && childItem.checked) {
+                    checkedCount++;
+                }
+            });
+            
+            // 根据子级状态设置父级状态
+            if (checkedCount === 0) {
+                // 全部未选中，父级取消选中
+                parentItem.checked = false;
+            } else if (checkedCount === totalCount) {
+                // 全部选中，父级选中
+                parentItem.checked = true;
+            }
+            // 部分选中时，父级保持当前状态（由indeterminate显示半选）
+        },
+
+        // 获取父级的半选状态
+        getCheckboxTreeIndeterminate(groupValue) {
+            if (!this.inputValue || !this.inputValue.checkedValues) {
+                return false;
+            }
+            
+            // 找到对应的group
+            const group = this.item.options.find(opt => opt.value === groupValue);
+            if (!group || !group.children || group.children.length === 0) {
+                return false;
+            }
+            
+            const childValues = group.children.map(child => child.value);
+            let checkedCount = 0;
+            
+            childValues.forEach(childValue => {
+                const childItem = this.inputValue.checkedValues.find(item => item.label === childValue);
+                if (childItem && childItem.checked) {
+                    checkedCount++;
+                }
+            });
+            
+            // 半选状态：有子级被选中但不是全部
+            return checkedCount > 0 && checkedCount < childValues.length;
+        },
+
+        // checkboxTree的其他输入框失去焦点处理
+        onCheckboxTreeOtherBlur(value, e) {
+            this.currentHandleType = "checkboxTreeOther";
+            this.currentCheckboxTreeValue = value;
+            this.inputValue.otherValues[value] = e.target.value;
+            this.onCommonHandleSaveRecord(e.target.value);
+        },
+
         // 点击question图标
         onClickQuestion() {
             const { templateFillType } = this;
@@ -908,25 +1089,37 @@ export default {
                 this.visible = true;
             }
         },
-        getCheckboxListInfo(){
-            const { otherValues,checkboxValues } = this.checkboxListValue;
-            const { otherValues: oldOtherValues,checkboxValues: oldCheckboxValues } = this.oldCheckboxListValue;
+        getCheckboxListInfo() {
+            const { otherValues, checkboxValues } = this.checkboxListValue;
+            const { otherValues: oldOtherValues, checkboxValues: oldCheckboxValues } = this.oldCheckboxListValue;
             const o = {
-                "checkboxListValue":{oldValue:oldCheckboxValues,newValue:checkboxValues,des:""},
-                "checkboxListOther":{oldValue:oldOtherValues[this.currentOtherCode],newValue:otherValues[this.currentOtherCode],des:"样品信息："},
+                "checkboxListValue": { oldValue: oldCheckboxValues, newValue: checkboxValues, des: "" },
+                "checkboxListOther": { oldValue: oldOtherValues[this.currentOtherCode], newValue: otherValues[this.currentOtherCode], des: "样品信息：" },
             }
             return o[this.currentHandleType];
         },
-        getFqyqInfo(){
-            const { mainRadio,inputValue,subRadio } = this.fqyqValue;
-            const { mainRadio: oldMainRadio,inputValue: oldInputValue,subRadio: oldSubRadio } = this.oldFqyqValue;
-            const o ={
-                "mainRadio":{oldValue:oldMainRadio,newValue:mainRadio,des:""},
-                "inputValue":{oldValue:oldInputValue,newValue:inputValue,des:""},
-                "subRadio":{oldValue:oldSubRadio,newValue:subRadio,des:"是否在规定时间完成："}
+        getFqyqInfo() {
+            const { mainRadio, inputValue, subRadio } = this.fqyqValue;
+            const { mainRadio: oldMainRadio, inputValue: oldInputValue, subRadio: oldSubRadio } = this.oldFqyqValue;
+            const o = {
+                "mainRadio": { oldValue: oldMainRadio, newValue: mainRadio, des: "" },
+                "inputValue": { oldValue: oldInputValue, newValue: inputValue, des: "" },
+                "subRadio": { oldValue: oldSubRadio, newValue: subRadio, des: "是否在规定时间完成：" }
             }
             return o[this.currentHandleType];
         },
+        getCheckboxTreeInfo() {
+            const { checkedValues, otherValues } = this.inputValue;
+            const { checkedValues: oldCheckedValues, otherValues: oldOtherValues } = this.oldValue;
+            const { currentHandleType, currentCheckboxTreeValue } = this;
+            const newItem = checkedValues.find(item => item.label === currentCheckboxTreeValue);
+            const oldItem = oldCheckedValues.find(item => item.label === currentCheckboxTreeValue);
+            const o = {
+                "checkboxTreeCheckbox": { oldValue: oldItem, newValue: newItem, des: "" },
+                "checkboxTreeOther": { oldValue: oldOtherValues[currentCheckboxTreeValue], newValue: otherValues[currentCheckboxTreeValue], des: `${currentCheckboxTreeValue}：` },
+            }
+            return o[currentHandleType];
+        },
         async onCommonHandleSaveRecord(val) {
             const isEmpty = isValueEmpty(this.inputValue);
             if (this.error && !isEmpty) {
@@ -970,14 +1163,13 @@ export default {
                 this.$emit("change", this.inputValue);
                 return;
             }
-
             // 值发生了变化，需要弹出密码输入框
             let isSame = true, isOldValueEmpty = true;
             const { currentHandleType } = this;
             // 如果是checkboxList类型，需要同时比较otherValues
             if (this.type === 'checkboxList') {
                 const current = this.getCheckboxListInfo();
-                isSame = this.isEqual(current.oldValue,current.newValue);
+                isSame = this.isEqual(current.oldValue, current.newValue);
                 isOldValueEmpty = isValueEmpty(current.oldValue);
             } else if (this.type === "checkboxTag") {
                 // checkboxTag类型，只比较当前tagIndex的数据
@@ -987,13 +1179,25 @@ export default {
                 isOldValueEmpty = isValueEmpty(oldTag.checked);
             } else if (this.type === "fqyq") {
                 const current = this.getFqyqInfo();
-                isSame = this.isEqual(current.oldValue,current.newValue);
+                isSame = this.isEqual(current.oldValue, current.newValue);
                 isOldValueEmpty = isValueEmpty(current.oldValue);
+            } else if (this.type === "checkboxTree") {
+                const current = this.getCheckboxTreeInfo();
+                const { oldValue, newValue } = current;
+                if (currentHandleType === "checkboxTreeCheckbox") {
+                    isSame = this.isEqual(oldValue.checked, newValue.checked);
+                    isOldValueEmpty = isValueEmpty(oldValue.checked);
+                } else {
+                    isSame = this.isEqual(current.oldValue, current.newValue);
+                    isOldValueEmpty = isValueEmpty(current.oldValue);
+                }
+
+
             } else {
                 isSame = this.isEqual(this.oldValue, this.inputValue)
                 isOldValueEmpty = isValueEmpty(this.oldValue);
             }
-            console.log(isSame,isOldValueEmpty,this.fqyqValue,this.oldFqyqValue,"isSame")
+            console.log(isSame, isOldValueEmpty, this.currentCheckboxTreeValue, this.oldValue, this.inputValue, "isSame")
             if (isSame) {
                 return;
             }
@@ -1030,13 +1234,10 @@ export default {
                 this.fqyqValue = JSON.parse(JSON.stringify(this.oldFqyqValue));
                 oldValue = { ...this.fqyqValue };
             }
-            this.inputValue = this.oldValue;
+            this.inputValue = typeof oldValue === 'object' ? JSON.parse(JSON.stringify(oldValue)) : oldValue;
             this.$emit('input', oldValue); // 触发 v-model 更新
             // this.$emit("blur", this.oldValue);
             this.$emit("change", oldValue, "cancel");
-            if (this.item.type === "clickable") {
-                this.$emit("resetRecord");
-            }
         },
 
         //处理更新记录
@@ -1059,14 +1260,27 @@ export default {
                 isModify = oldTag.checked !== undefined;
             } else if (this.type === "fqyq") {
                 const current = this.getFqyqInfo();
-                recordOldVlaue = `${current.des+current.oldValue}`;
-                recordValue = `${current.des+current.newValue}`;
-                isModify = !!this.oldFqyqValue.mainRadio 
-            }else if(this.type === "checkboxList"){
+                recordOldVlaue = `${current.des + current.oldValue}`;
+                recordValue = `${current.des + current.newValue}`;
+                isModify = !!this.oldFqyqValue.mainRadio
+            } else if (this.type === "checkboxList") {
                 const current = this.getCheckboxListInfo();
-                recordOldVlaue = `${current.des+(current.oldValue || '')}`;
-                recordValue = `${current.des+(current.newValue || '')}`;
+                recordOldVlaue = `${current.des + (current.oldValue || '')}`;
+                recordValue = `${current.des + (current.newValue || '')}`;
                 isModify = !!current.oldValue;
+            } else if (this.type === "checkboxTree") {
+                // checkboxTree类型，记录当前操作的值变化
+                const current = this.getCheckboxTreeInfo();
+                if (this.currentHandleType === "checkboxTreeCheckbox") {
+                    const { oldValue, newValue } = current;
+                    recordOldVlaue = `${oldValue.label || ''}:${oldValue.checked ? '勾选' : '未勾选'}`;
+                    recordValue = `${newValue.label || ''}:${newValue.checked ? '勾选' : '未勾选'}`;
+                    isModify = newValue.checked !== undefined;
+                } else {
+                    recordOldVlaue = `${current.des + current.oldValue}`;
+                    recordValue = `${current.des + current.newValue}`;
+                    isModify = !!current.oldValue;
+                }
             }
             const record = {
                 ...baseInfo,
@@ -1118,7 +1332,7 @@ export default {
                 }
             }
             //用户输入密码并点击确定，保存修改
-            this.oldValue = value; // 更新旧值
+            this.oldValue = typeof value === 'object' ? JSON.parse(JSON.stringify(value)) : value; // 更新旧值
             this.$emit("blur", value);
             this.$emit('input', value);
             this.$emit("change", value, data ? "save" : "");
@@ -1757,6 +1971,7 @@ export default {
                 border-color: #f9c588;
             }
         }
+
         .el-radio__inner {
             border-color: #f9c588;
         }
@@ -1814,17 +2029,39 @@ export default {
         }
     }
 }
-.fqyq-input{
+
+.fqyq-input {
     width: 500px;
-    margin-right:10px;
+    margin-right: 10px;
 }
-.mb-10{
+
+.mb-10 {
     margin-bottom: 10px;
 }
-.fs-14{
+
+.fs-14 {
     font-size: 14px;
 }
-.mr-10{
+
+.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;
+    display: flex;
+    align-items: center;
+}
+.checkbox-tree-input-container{
+    margin-left: 10px;
+    width: 500px;
+}
 </style>

src/components/Template/Step.vue

@@ -13,7 +13,7 @@
 					<!-- 根据步骤类型显示对应的表单 -->
 					<!-- 根据步骤类型显示对应的表单 -->
 					<component class="flex1" :sn="step.type" :is="getStepComponent(step.type)" :formData="step.formData"
-						@update="onFormUpdate(index, $event)" :ref="'stepCompRef_' + index">
+						@update="onFormUpdate(index, $event)" :stepIndex = "index" :ref="'stepCompRef_' + index">
 					</component>
 					<div v-if="templateFillType === 'preFill'" class="step-header-item">
 						<el-popconfirm
@@ -103,6 +103,24 @@ import cl from './StepComponents/b/cl.vue';//表配置-称量
 //表配置-孵育：使用溶液-孵育
 //表配置-复溶：使用溶液-复溶
 
+
+//生物样品分析
+//生物样品分析-解冻：使用溶液-解冻
+//生物样品分析-涡旋混匀：使用溶液-涡旋混匀
+//生物样品分析-选择容器：使用溶液-选择容器
+import jryp from './StepComponents/swypfx/jryp.vue';//生物样品分析-加入样品
+//生物样品分析-衍生反应：使用溶液-离心
+import hhspe from './StepComponents/swypfx/hhspe.vue';//生物样品分析-活化（SPE）
+//生物样品分析-平衡（SPE）：使用溶液-活化（SPE）
+//生物样品分析-上样（SPE）：使用溶液-活化（SPE）
+//生物样品分析-淋洗（SPE）：使用溶液-活化（SPE）
+//生物样品分析-洗脱（SPE）：使用溶液-活化（SPE）
+import zyfc from './StepComponents/swypfx/zyfc.vue';//生物样品分析-转移（分层）
+//生物样品分析-氮吹：使用溶液-氮吹
+//生物样品分析-正压：使用溶液-正压
+//生物样品分析-孵育：使用溶液-孵育
+//生物样品分析-复溶：使用溶液-复溶
+
 import { public_templateStepList } from '@/api/business/public/public';
 
 
@@ -223,6 +241,11 @@ export default {
 		//表配置
 		jrry_b,
 		cl,
+
+		//生物样品分析
+		jryp,
+		hhspe,
+		zyfc
 	},
 	computed: {
 		stepComponentMap() {
@@ -280,8 +303,8 @@ export default {
 					//标配配置
 					'jrry_b': 'jrry_b',
 					'cl': 'cl',
-					'lx_b': 'lx',
-					'cs_b': 'cs',
+					'lx_b': 'Lx',
+					'cs_b': 'Cs',
 					'hwhy_b': 'Hwhy',
 					'zyhy_b': 'Zyhy',
 					'wxhy_b': 'Wxhy',
@@ -298,6 +321,19 @@ export default {
 					'jd_b': 'Jd',
 					'fy_b': 'Fy',
 					'fr_b': 'Fr',
+
+					//生物样品分析
+					'jd_swypfx': 'Jd',
+					'jryp': 'jryp',
+					'ysfy': 'Lx',
+					'hhspe': 'hhspe',
+
+					'phspe': 'hhspe',
+					'syspe': 'hhspe',
+					'lxspe': 'hhspe',
+					'xtspe': 'hhspe',
+					'zyfc': 'zyfc',
+					
 				}
 			}
 			return this.componentMap
@@ -339,6 +375,7 @@ export default {
 	},
 	methods: {
 		getStepList(){
+			debugger
 			public_templateStepList({templateId:this.templateData.templateId}).then(response => {
 				let options = []
 				_.forEach(response.data,(item)=>{

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

@@ -40,7 +40,7 @@ export default {
                         fillType: "preFill",
                     },
                     text3: {
-                        label: "实际条件为",
+                        label: "实际设置条件为",
                         type: "text",
                     },
                     sjtj: {

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

@@ -21,7 +21,107 @@ export default {
     },
     computed: {
         formConfig() {
-            let config = [{
+            let config = this.sn==='jd_swypfx'?
+            [{
+                config: {
+                    text1: {
+                        label: "将上述样品预计放置于",
+                        type: "text",
+                    },
+                    ccwz: {
+                        type: "select",
+                        options: this.getDictOptions("business_ccwz"),
+                        fillType: "preFill",
+                        otherCode: "ccwzOther",
+                    },
+                    text3: {
+                        label: "实际放置于",
+                        type: "text",
+                    },
+                    sjccwz: {
+                        type: "select",
+                        options: this.getDictOptions("business_ccwz"),
+                        fillType: "actFill",
+                        otherCode: "sjccwzOther",
+                        compareTo: "ccwz",
+                    },
+                    text4: {
+                        label: "位置，其环境条件预计为",
+                        type: "text",
+                    },
+                    yjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_wddw"),
+                        fillType: "preFill",
+                        otherCode: "yjwdOther",
+                    },
+                    yjhj: {
+                        type: "select",
+                        options: this.getDictOptions("business_hjxx"),
+                        fillType: "preFill",
+                        otherCode: "yjhjOther",
+                    },
+                    text5: {
+                        label: "，实际条件为",
+                        type: "text",
+                    },
+                    sjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_wddw"),
+                        fillType: "actFill",
+                        otherCode: "sjwdOther",
+                        compareTo: "yjwd",
+                    },
+                    sjhj: {
+                        type: "select",
+                        options: this.getDictOptions("business_hjxx"),
+                        fillType: "actFill",
+                        otherCode: "sjhjOther",
+                        compareTo: "yjhj",
+                    },
+                     text6: {
+                        label: "，放置",
+                        type: "text",
+                    },
+                    sr1:{
+                        type: "input",
+                        fillType: "preFill",
+                    },  
+                    text7:{
+                        type:"text",
+                        label:"，解冻",
+                    },
+                    startDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button1:{
+                        type:"button",
+                        buttonName:"开始",
+                    },
+                    text8:{
+                        type:"text",
+                        label:"，解冻",
+                    },
+                    endDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button2:{
+                        type:"button",
+                        buttonName:"结束",
+                    },
+                    text9: {
+                        type: "text",
+                        label: "。",
+                    },
+                    
+
+                }
+            }]:
+            [{
                 config: {
                     text1: {
                         label: "将",

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

@@ -23,7 +23,7 @@ export default {
             let config = [{
                 config: {
                     text1: {
-                        label: "使用离心机",
+                        label: this.sn==='ysfy'?"使用恒温混匀仪":"使用离心机",
                         type: "text",
                     },
                     yq: {
@@ -110,7 +110,7 @@ export default {
                         fillType: "preFill",
                     },
                     text8: {
-                        label: "，进行离心。离心",
+                        label: this.sn==='ysfy'?"，进行衍生反应，反应":"，进行离心。离心",
                         type: "text",
                     },
                     startDate: {

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

@@ -0,0 +1,91 @@
+<!-- 活化（SPE） -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_hhspe" @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: 'hhsep',
+		},
+	},
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            return [{
+                config: {
+                    text1: {
+                        label: "使用",
+                        type: "text",
+                    },
+                    ytrq: {
+                        fillType: "preFill",
+                        type: "input",
+                    },
+                    sjrqcz: {
+                        fillType: "actFill",
+                        type: "yq",
+                    },
+                    text2: {
+                        label: this.sn==='syspe'?"向预先活化平衡好的固相萃取版中加入":"向固相萃取版中加入",
+                        type: "text",
+                    },
+                    srry: {
+                        fillType: "preFill",
+                        type: "input",
+                    },
+                    sjrq:{
+                        fillType: "actFill",
+                        type: "sj",
+                        ylCode: "sjsr2",
+                        dwCode: "sjsrdw2",
+                    },
+                    text3:{
+                        label: this.sn==='syspe'?"样品，预计加入":"溶液，预计加入",
+                        type: "text",
+                    },
+                    ytsr1:{
+                        fillType: "preFill",
+                        type: "inputNumber",
+                    },
+                    tjxz:{
+                        fillType: "preFill",
+                        type: "select",
+                        selectTo: "sjsrdw2",
+                        options:this.getDictOptions('business_tjdw'),  
+                    },
+                    text4:{
+                        label: "，实际加入",
+                        type: "text",
+                    },
+                    sjsr2:{
+                        fillType: "actFill",
+                        type: "inputNumber",
+                        compareTo:"ytsr1",
+                        copyFrom:"ytsr1"
+                    },
+                    sjsrdw2:{
+                        fillType: "preFill",
+                        type: "select",
+                        options: this.getDictOptions('business_tjdw'),  
+                    },
+                    text5:{
+                        label: this.sn==='phspe'?"进行平衡。":this.sn==='syspe'?"进行上样。":this.sn==='lxspe'?"进行淋洗，弃去淋洗液。":this.sn==='xtspe'?"进行洗脱，收集洗脱液。":"进行活化。",
+                        type: "text",
+                    }
+                }
+            }]
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,67 @@
+<!-- 加入样品 -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_jryp" @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],
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            return [{
+                config: {
+                    text1: {
+                        label: "使用移液器",
+                        type: "text",
+                    },
+                    sjrqcz: {
+                        fillType: "actFill",
+                        type: "yq",
+                    },
+                    text2: {
+                        label: "仪器，预计加入样品",
+                        type: "text",
+                    },
+                    ytsr1:{
+                        fillType: "preFill",
+                        type: "inputNumber",
+                    },
+                    tjxz:{
+                        fillType: "preFill",
+                        type: "select",
+                        selectTo: "sjsrdw2",
+                        options:this.getDictOptions('business_tjdw'),  
+                    },
+                    text4:{
+                        label: "，实际加入样品",
+                        type: "text",
+                    },
+                    sjsr2:{
+                        fillType: "actFill",
+                        type: "inputNumber",
+                        compareTo:"ytsr1",
+                        copyFrom:"ytsr1"
+                    },
+                    sjsrdw2:{
+                        fillType: "preFill",
+                        type: "select",
+                        options: this.getDictOptions('business_tjdw'),  
+                    },
+                    text5:{
+                        label: "。",
+                        type: "text",
+                    }
+                }
+            }]
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,79 @@
+<!-- 转移（分层） -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_zyfc" @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],
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            return [{
+                config: {
+                    text1: {
+                        label: "使用",
+                        type: "text",
+                    },
+                    ytyq: {
+                        fillType: "preFill",
+                        type: "input",
+                    },
+                    sjrqcz: {
+                        fillType: "actFill",
+                        type: "yq",
+                    },
+                    text2: {
+                        label: "转移",
+                        type: "text",
+                    },
+                    shang:{
+                        fillType: "preFill",
+                        type: "input",
+                    },
+                    text3: {
+                        label: "层清液，预计转移",
+                        type: "text",
+                    },
+                    ytsr1:{
+                        fillType: "preFill",
+                        type: "inputNumber",
+                    },
+                    tjxz:{
+                        fillType: "preFill",
+                        type: "select",
+                        selectTo: "sjsrdw2",
+                        options:this.getDictOptions('business_tjdw'),  
+                    },
+                    text4:{
+                        label: "，实际转移",
+                        type: "text",
+                    },
+                    sjsr2:{
+                        fillType: "actFill",
+                        type: "inputNumber",
+                        compareTo:"ytsr1",
+                        copyFrom:"ytsr1"
+                    },
+                    sjsrdw2:{
+                        fillType: "preFill",
+                        type: "select",
+                        options: this.getDictOptions('business_tjdw'),  
+                    },
+                    text5:{
+                        label: "至容器中。",
+                        type: "text",
+                    }
+                }
+            }]
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>

src/components/Template/StepFormPackage.vue

@@ -4,25 +4,25 @@
             <div v-for="(sItem, key) in item.config" class="step-item" :key="key">
                 <template v-if="sItem.type === 'input'">
                     <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" @blur="onBlur(key, $event)"
-                        :item="sItem" v-model="formFields[key]" :field-key="prefixKey + '_' + key"
+                        :item="sItem" v-model="formFields[key]" :field-key="prefixKey+uuid + '_' + key"
                         @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
                         :orange-bg="orangeBgFields[key]" />
                 </template>
                 <template v-else-if="sItem.type === 'inputNumber'">
-                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
+                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid + '_' + key"
                         type="inputNumber" @blur="onBlur(key, $event)" :item="sItem"
                         @input="onInputNumberChange(key, $event)" v-model="formFields[key]" @copy="onCopy(sItem, key)"
                         :error="errors[key]" @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" />
                 </template>
                 <template v-else-if="sItem.type === 'select'">
-                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
+                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid + '_' + key"
                         type="select" @blur="onBlur(key, $event)" :item="sItem" v-model="formFields[key]"
                         @change="onSelectChange(key, $event, sItem.type)"
                         @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
                         :orange-bg="orangeBgFields[key]" />
                 </template>
                 <template v-else-if="sItem.type === 'checkbox'">
-                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
+                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid + '_' + key"
                         type="checkbox" :item="sItem" v-model="formFields[key]"
                         @change="onSelectChange(key, $event, sItem.type)"
                         @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
@@ -36,7 +36,7 @@
                 </template>
                 <!-- 仪器（instrument）sj(药剂) gsp(供试品) mix（药剂/供试品/给药制剂） -->
                 <template v-else-if="isRegent(sItem)">
-                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
+                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid + '_' + key"
                         :type="sItem.type" :error="errors[key]"
                         @onRegentSubmit="(data)=>onRegentSubmit(data,key,sItem)"
                         @update:error="errors[key] = false"  :item="getRegentItem(sItem)"
@@ -55,7 +55,7 @@
             
                 <div v-show="isShowOther(formFields[key])" class="flex flex1">
                     <div class="other-title">{{sItem.otherLabel ? $t(sItem.otherLabel) : $t("template.common.other") }}</div>
-                    <HandleFormItem sourceFrom = "step" class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+sItem.otherCode" @blur="onBlur(key, $event)" :item="getOtherItem(sItem)"
+                    <HandleFormItem sourceFrom = "step" class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid+'_'+sItem.otherCode" @blur="onBlur(key, $event)" :item="getOtherItem(sItem)"
                         v-model="formFields[sItem.otherCode]" @copy="onCopy(sItem, key)"
                         :error="errors[sItem.otherCode]" @update:error="errors[sItem.otherCode] = false"
                         :orange-bg="orangeBgFields[sItem.otherCode]" />

src/components/Template/mixins/formPackageMixins.js

@@ -75,6 +75,7 @@ export default {
                 fillType: item.subFillType || item.fillType,
                 parentLabel: item.label,
                 filledCodes: item.filledCodes,
+                qxbdType: item.qxbdType,
             }
         },
 

src/lang/en/template/pcr.js

@@ -47,6 +47,24 @@ export default {
     ypznd: '样品终浓度',
     fj: 'Attachment',
   },
+  pcr007: {
+    dztpbh: '电子天平编号',
+    ypmc: '样品名称',
+    cyqypgsjyjtjtj: '采样前样品管试剂预计添加体积',
+    cyqypgsjsjtjtj: '采样前样品管试剂实际添加体积',
+    cygzl: '采集管重量',
+    czsj: '称重时间',
+    clpbh: 'Analysis Batch Number',
+    ypmc: '样品名称',
+    ypcsnd: '样品初始浓度',
+    sxbs: '稀释倍数',
+    ysypxytj: '预设样品吸样体积',
+    sjypxytj: '实际样品吸样体积',
+    ysxsyxytj: '预设稀释液吸样体积',
+    sjxsyxytj: '实际稀释液吸样体积',
+    ypznd: '样品终浓度',
+    fj: 'Attachment',
+  },
   // 生物样品分析方法学样品制备表-准确度与精密度
   sp008: {
     title:

src/lang/zh/template/dl.js

@@ -194,9 +194,8 @@ export default {
     dlbz: '备注',
     gcqk: '观察情况',
 
-    jlzb:'剂量组别',
-    xybh:'悬液编号',
-    bplsh1:'玻片流水号',
-    bplsh2:'玻片流水号',
+    bpbh:'玻片编号',
+    gcxps:'观察细胞数目',
+    zqxxbs:'中期相细胞数',
   },
 }

src/lang/zh/template/pcr.js

@@ -46,6 +46,24 @@ export default {
     ypznd: '样品终浓度',
     fj: '附件',
   },
+  pcr007: {
+    dztpbh: '电子天平编号',
+    ypmc: '样品名称',
+    cyqypgsjyjtjtj: '采样前样品管试剂预计添加体积',
+    cyqypgsjsjtjtj: '采样前样品管试剂实际添加体积',
+    cygzl: '采集管重量',
+    czsj: '称重时间',
+    clpbh: 'Analysis Batch Number',
+    ypmc: '样品名称',
+    ypcsnd: '样品初始浓度',
+    sxbs: '稀释倍数',
+    ysypxytj: '预设样品吸样体积',
+    sjypxytj: '实际样品吸样体积',
+    ysxsyxytj: '预设稀释液吸样体积',
+    sjxsyxytj: '实际稀释液吸样体积',
+    ypznd: '样品终浓度',
+    fj: 'Attachment',
+  },
   // 生物样品分析方法学样品制备表-Recovery
   sp009: {
     title: '生物样品分析方法学样品制备表（Recovery）',

src/utils/index.js

@@ -441,7 +441,7 @@ export function isValueEmpty(value) {
   if (Array.isArray(value) && value.length === 0) {
     return true
   }
-  if (Object.keys(value).length === 0) {
+  if (Object.keys(value).length === 0 && typeof value=='object') {
     return true;
   }
   return false
@@ -584,3 +584,20 @@ export function getStringWidth(str) {
   }
   return width
 }
+
+//根据选项获取默认值,为了
+export const getDefaultValueByOptions = (options = []) => {
+  const arr = [];
+  options.forEach(item => {
+    const { children = [], label } = item;
+    //目前只考虑2层，也不考虑label值重复的问题；
+    if (children.length > 0) {
+      children.forEach(child => {
+        arr.push({ label: child.label, checked: undefined })
+      })
+    } else {
+      arr.push({ label, checked: undefined })
+    }
+  })
+  return arr;
+}

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

@@ -52,6 +52,7 @@ import PCR002 from "./comps/pcr/PCR002.vue";
 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";
 
 //LBA
 // LBA001-使用SP001
@@ -114,7 +115,7 @@ export default {
     //色谱
     SP001, SP003, SP00456,SP007, SP008, SP009,SP0019,SP0020,
     // PCR
-    PCR002, PCR003, PCR004, PCR005,
+    PCR002, PCR003, PCR004, PCR005,PCR007,
     //LBA
     LBA002,
     LBA003,
@@ -162,7 +163,7 @@ export default {
     handleEditSignCancel(e) {
       EventBus.$emit('edit-sign-cancel', e);
     },
- 
+
   },
   props: {
     sn: {
@@ -232,6 +233,7 @@ export default {
           'PCR003': 'PCR003',
           'PCR004': 'PCR004',
           'PCR005': 'PCR005',
+          'PCR007': 'PCR007',
           //LBA
           'LBA001': 'SP001',
           'LBA002': 'LBA002',

src/views/business/comps/template/comps/dl/DL016.vue

@@ -150,6 +150,7 @@ export default {
 							fillType: 'preFill',
 							options: this.getDictOptions('business_dl_qsxjbltj'),
 							otherCode: 'bltjOther',
+              showOtherLabel:false
 						},
 					}
 				}

src/views/business/comps/template/comps/dl/DL017.vue

@@ -151,6 +151,7 @@ export default {
 							fillType: 'preFill',
 							options: this.getDictOptions('business_dl_qsxjbltj'),
 							otherCode: 'bltjOther',
+              showOtherLabel:false
 						},
 					}
 				}

src/views/business/comps/template/comps/dl/DL018.vue

@@ -151,6 +151,7 @@ export default {
 							fillType: 'preFill',
 							options: this.getDictOptions('business_dl_qsxjbltj'),
 							otherCode: 'bltjOther',
+              showOtherLabel:false
 						},
 					}
 				}

src/views/business/comps/template/comps/dl/DL019.vue

@@ -151,6 +151,7 @@ export default {
 							fillType: 'preFill',
 							options: this.getDictOptions('business_dl_qsxjbltj'),
 							otherCode: 'bltjOther',
+              showOtherLabel:false
 						},
 					}
 				}

src/views/business/comps/template/comps/dl/DL021.vue

@@ -123,21 +123,16 @@ export default {
 				bodyMaxlength: 50,
 			},{
 				label: 'template.dl.dl021.gcxps',
-				prop: 'dwbh',
-				bodyType: 'checkboxTag',
+				prop: 'cyd',
+				bodyType: 'input',
 				bodyFillType: 'actFill',
-				bodySubType:"button",
-				bodySubFillType:"preFill",
-				bodySubButtonName:"template.common.importTemplate",
-				bodySubKey:"exportBtn",
-				showBodySub:this.fillType === "preFill",
-				width: 280,
+				width: 100,
         bodyMaxlength: 10,
 			},{
 				label: 'template.dl.dl021.zqxxbs',
-				prop: 'ypsl',
+				label: 'template.dl.dl021.gcxps',
+				prop: 'cyd',
 				bodyType: 'input',
-				bodyDisabled: true,
 				bodyFillType: 'actFill',
 				width: 80,
         bodyMaxlength: 10,

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

@@ -16,16 +16,21 @@
 					<div class="template-form-item">
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef"
 							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" />
-						<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 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>
+									@deleteRow="(rowIndex) => deleteRow(rowIndex)" ></TableOpertaion>
 							</template>
 						</CustomTable>
 					</div>
@@ -39,8 +44,6 @@
 				</div>
 			</div>
 		</div>
-		<SelectReagentDialog @submit="onSelectReagentSubmit" ref="selectReagentDialogRef">
-		</SelectReagentDialog>
 		<!-- <button @click="onSave">保存</button> -->
 		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadExcelData" />
 	</div>
@@ -57,7 +60,7 @@ 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 { convertConcentration } from "@/utils/conConverter";//浓度单位转换
 import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
 import { getPCR005Config } from "../../formConfig/PCRTableConfig.js";
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
@@ -173,11 +176,11 @@ export default {
 					type: "cellItem",
 					label: 'template.pcr.pcr005.clpbh',
 					config: {
-						act: {
+						clpbh: {
 							label: '',
 							type: "input",
 							fillType: "actFill",
-							otherCode: "preOther",
+							otherCode: "clpbh",
 						}
 					}
 				},
@@ -233,7 +236,7 @@ export default {
 	},
 	methods: {
 		downloadExcelTemplate() {
-			this.exportExcel(['样品名称', '样品初始浓度', '稀释倍数', '预设样品吸样体积'])
+			this.exportExcel(['样品名称', '样品初始浓度', '稀释倍数', '预设样品吸样体积'], 'PCR分析样品处理表导入模板')
 		},
 		//选择试剂提交事件
 		onSelectReagentSubmit(code, row) {
@@ -243,7 +246,21 @@ export default {
 			this.$refs.ImportExcelDialog.show()
 		},
 		onLoadExcelData(excelData) {
-			console.log(excelData)
+			excelData.shift()
+			let list = []
+			excelData.forEach(item => {
+				list.push({
+					ypmc: item[0],
+					ypcsnd: item[1],
+					sxbs: item[2],
+					ysypxytj: item[3],
+					targetDiluentVolumePrecision: 3,
+					actSolutionVolumePrecision: 3
+				})
+			})
+			this.$refs.stepTableRef.addRows(list)
+			this.$refs.ImportExcelDialog.cancel()
+			this.onHandleTableBlur()
 		},
 		// 失去焦点，计算
 		onHandleTableBlur() {
@@ -259,8 +276,6 @@ export default {
 				if (tableList && tableList.length > 0) {
 					for (let i = 0; i < tableList.length; i++) {
 						let item = tableList[i]
-						console.log(item)
-
 						if (
 							isValueEmpty(ysypxytjUnit) ||
 							isValueEmpty(ysxsyxytjUnit) ||
@@ -271,6 +286,7 @@ export default {
 						) {
 							continue;
 						}
+
 						// 计算预设稀释液吸样体积  公式：(稀释倍数-1)*样品理论体积
 						let ysxsyxytj = (item.sxbs - 1) * item.ysypxytj
 						ysxsyxytj = volumeConverter.convert(ysxsyxytj + ysypxytjUnit, ysxsyxytjUnit).toFixed(
@@ -280,31 +296,28 @@ export default {
 
 
 						// 计算样品终浓度： 样品初始浓度/稀释倍数
-						let ypznd = (item.ypcsnd ) / item.sxbs
+						let ypznd = (item.ypcsnd) / item.sxbs
 						ypznd = convertConcentration.convert(ypznd + ypcsndUnit, ypzndUnit).toFixed(
 							item.targetDiluentVolumePrecision
 						)
 						tableList[i].ypznd = ypznd
+
 					}
 				}
 				this.$refs.stepTableRef.updateDataSource(tableList);
 			}
-
-
-
-
 		},
 		//获取已填写的表单数据
 		getFilledFormData() {
-			return this.getFilledFormDataByRefs(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"])
+			return this.getFilledFormDataByRefs(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "fjRef", "remarkRef"])
 		},
 		async getFormData() {
-			let content = await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"]);
+			let content = await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "fjRef", "remarkRef"]);
 			return content;
 		},
 		getResource() {
 			let content = this.getFilledFormData();
-
+			console.log(content)
 			//生成resource
 			let tmpResource = []
 			if (this.fillType === "actFill") {
@@ -319,7 +332,7 @@ export default {
 
 						tmpResource.push({
 							mc: null,
-							bh: item.startSolutionCode,
+							bh: content.subSolution,
 							ph: null,
 							ndz: null,
 							nd: null,
@@ -328,10 +341,10 @@ export default {
 							sxrq: null,
 							kc: null,
 							kcdw: null,
-							syl: item.actStartSolutionVolume,
+							syl: item.ysxsyxytj,
 							type: 1,
 							elnType: this.product,
-							syldw: content.headerSelectFields.actStartSolutionVolumeUnit,
+							syldw: content.headerSelectFields.sjxsyxytjUnit,
 							yxzq: null,
 							yxzqdw: null,
 						})

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

@@ -0,0 +1,277 @@
+<!-- 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 { getPCR007Config  } from "../../formConfig/PCRTableConfig.js";
+import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
+import { addTj, 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 getPCR007Config(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: "cellItem",
+					label: 'template.pcr.pcr007.czsj',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 操作步骤表单配置
+		stepFormConfig() {
+			return [
+				{
+					type: 'step',
+					config: {
+						solution: {
+							labelWidth: 100,
+							label: 'template.pcr.pcr007.dztpbh',
+							type: 'yq',
+							fillType: 'actFill',
+						},
+					}
+				}
+			]
+		},
+	},
+	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],
+					ypcsnd: item[1],
+				})
+			})
+			this.$refs.stepTableRef.addRows(list)
+			this.$refs.ImportExcelDialog.cancel()
+			this.onHandleTableBlur()
+		},
+		// 失去焦点，计算
+		onHandleTableBlur() {
+
+
+		},
+		//获取已填写的表单数据
+		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++) {
+					}
+				}
+			}
+			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();
+
+		},
+		// 删除表格行
+		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/comps/sp/SP0020.vue

@@ -7,10 +7,11 @@
 			<div class="detail-content">
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
-						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<LineLabel label="试验内容" />
+						:ref="refConfig.baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+					<BaseInfoFormPackage fieldItemLabel="试验内容" label="试验内容"
+						:ref="refConfig.synrRef" :formConfig="synrFormConfig" :formData="formData" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
-						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+						:ref="refConfig.remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
 			</div>
 		</div>
@@ -30,6 +31,13 @@ import TableOpertaionDelete from "@/components/Template/operation/TableOpertaion
 import { getBaseInfoFormConfig} from "../../formConfig/sp/SP0019";
 import { getSynrFormConfig} from "../../formConfig/sp/SP0020";
 
+const refConfig = {
+	baseInfoRef: "baseInfoRef",
+	remarkRef: "remarkRef",
+	synrRef: "synrRef",
+}
+
+const compRefs = Object.values(refConfig);
 
 export default {
 	name: "SP0020",
@@ -47,7 +55,7 @@ export default {
 		},
 		// 试验基本信息表单配置
 		baseInfoFormConfig() {
-			return getBaseInfoFormConfig(this);
+			return getBaseInfoFormConfig('sp0020');
 		},
 		
 		// 备注表单配置
@@ -74,7 +82,7 @@ export default {
 	data() {
 		return {
 			formData: {},
-			compRefs:["baseInfoRef", "storageConditionRef", "spzxhRef","yqInfoTableRef","ryTableRef", "remarkRef"]
+			refConfig
 		};
 	},
 	mounted() {
@@ -93,16 +101,13 @@ export default {
 				this.$refs.ryTableRef.updateDataSourceByRowIndex(rowIndex, params);
 			}
 		},
-		onYqSubmit(data, col, rowIndex, colIndex, row){
-			console.log(data, col, rowIndex, colIndex, row,"onRegentSubmit")
-		},
 		//获取已填写的表单数据
 		getFilledFormData() {
-			return this.getFilledFormDataByRefs(this.compRefs)
+			return this.getFilledFormDataByRefs(compRefs)
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
-			let content = await this.validFormFields(this.compRefs);
+			let content = await this.validFormFields(compRefs);
 			console.log(content)
 			return content;
 		},

src/views/business/comps/template/dialog/ImportExcelDialog.vue

@@ -3,7 +3,7 @@
         <!-- 导入excel模板 -->
         <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="title" :visible.sync="open"
             width="400px" @close="close" append-to-body>
-            
+
             <el-button style="margin-bottom:10px" v-if="downloadArr && downloadArr.length>0" type="primary" @click="downloadExcelTemplate">{{$t('template.common.downloadTemplate') }}</el-button>
 
             <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :disabled="upload.isUploading" action=""
@@ -65,7 +65,6 @@ export default {
         // 文件上传中处理
         handleFileUploadProgress(event, file, fileList) {
             this.upload.isUploading = true
-            console.log('.....')
         },
         // 文件上传成功处理
         handleFileSuccess(response, file, fileList) {
@@ -94,6 +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)
                 } catch (error) {
                     console.error('解析失败：', error)
                     this.$modal.msgError('文件解析失败，请检查格式', error)

src/views/business/comps/template/dialog/SelectMixReagentDialog.vue

@@ -28,7 +28,6 @@ import SelectDept from "@/views/business/comps/select/SelectDept";
 import { public_sjList, public_gyzjList, public_gspList, public_xbList,public_jcbList,public_qxFormFillList } from '@/api/business/public/public';
 import { getSjSearchForm, getSjColumns, getGyzjSearchForm, getGyzjColumns, getGspSearchForm, getGspColumns, getXbSearchForm, getXbColumns,getJcbSearchForm,getJcbColumns,getQxbdSearchForm,getQxbdColumns } from '@/views/business/comps/template/formConfig/formConfig.js';
 import { EventBus } from "@/utils/eventBus";
-console.log(this,"this")
 const typeMap = {
     '1': {
         searchForm: getSjSearchForm(),
@@ -99,6 +98,7 @@ export default {
             mixType: false,//是否是混合试剂
             title:"选择试剂",
             currentType: '1',//当前选择的类型
+            qxbdType:"",//前序表单类型
         }
     },
     computed: {
@@ -119,6 +119,7 @@ export default {
             this.currentType = type;
             if(type==15){
                 this.selectedCode = 'id'
+                this.qxbdType = data.qxbdType || '';
             }
             this.mixType = mixType;
             this.sourceFrom = sourceFrom;
@@ -173,6 +174,10 @@ export default {
                 ndz: (row.nd||"")+(row.nddw||""),
                 type: Number(this.selectType),
             }
+            if(this.qxbdType && row.templateSn !== this.qxbdType){
+                this.$message.error(`请选择正确前序表单`);
+                return
+            }
             this.$emit('submit', selectedValue, row);
             // 触发eventBus事件
             EventBus.$emit("onMixReagentSubmit", { selectInfo, uuid: this.uuid, selectedId: selectedValue, row,selectType:this.selectType });

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

@@ -632,6 +632,7 @@ export const getPCR005Config = ($this) => {
       fillType: 'preFill',
       headerSelectKey: 'sjypxytjUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
+      copyFrom: 'ysypxytj', //复制哪个字段
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
@@ -666,6 +667,7 @@ export const getPCR005Config = ($this) => {
       fillType: 'preFill',
       headerSelectKey: 'sjxsyxytjUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
+      copyFrom: 'ysxsyxytj', //复制哪个字段
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
@@ -692,4 +694,66 @@ export const getPCR005Config = ($this) => {
       bodySubPlaceholder: 'template.common.xswsPlaceholder',
     },
   ]
+}
+
+
+// PCR007
+export const getPCR007Config = ($this) => {
+  return [
+    {
+      label: 'template.pcr.pcr007.ypmc',
+      prop: 'ypmc',
+      width: 280,
+      bodyType: 'input',
+      fillType: 'preFill',
+      otherCode: 'bhOther',
+      bodyFillType: 'preFill',
+    },
+    {
+      label: 'template.pcr.pcr007.cyqypgsjyjtjtj',
+      prop: 'cyqypgsjyjtjtj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'cyqypgsjyjtjtjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'preFill',
+      bodyMaxlength: 10,
+    },
+    {
+      label: 'template.pcr.pcr007.cyqypgsjsjtjtj',
+      prop: 'cyqypgsjsjtjtj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'cyqypgsjsjtjtjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      copyFrom: 'cyqypgsjyjtjtj', //复制哪个字段
+      bodyMaxlength: 10,
+    },
+    {
+      label: 'template.pcr.pcr007.cygzl',
+      prop: 'cygzl',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'cygzlUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      bodySubType: 'button',
+      bodySubButtonName: 'form.hqz',
+      bodyMaxlength: 10,
+      bodySubKey: 'targetDiluentVolumePrecision',
+      bodyPrecisionKey: 'targetDiluentVolumePrecision',
+      bodySubFillType: 'actFill',
+      subPrecision: 0,
+      showBodySub: $this.fillType === 'actFill',
+      bodyMaxlength: 10,
+      bodySubPlaceholder: 'template.common.xswsPlaceholder',
+    }
+  ]
 }

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: {

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"
                 },
             }
         },

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

@@ -62,6 +62,7 @@ export default {
 						studySn,
 						templateMc,
 						templateMcEn,
+						templateId,
 						templateSn,
 						startDate,
 						bdmc,
@@ -109,7 +110,8 @@ export default {
 							studySn,
 							templateMc,
 							templateMcEn,
-							templateSn,
+						    templateId,
+						  	templateSn,
 							startDate,
 							bdmc,
 							endDate,
@@ -123,6 +125,7 @@ export default {
 							studySn,
 							templateMc,
 							templateMcEn,
+						    templateId,
 							templateSn,
 							startDate,
 							bdmc,

src/views/business/study/comp/tbbd/Bj.vue

@@ -80,7 +80,7 @@
         </div>
         <div class="content" v-if="showIndex == 2">
           <TemplateTable emitName="onFillCallback" @onFillCallback="onFillCallback" ref="templateTable"
-            :sn="form.templateSn" :templateData="templateData" fillType="actFill" />
+            :sn="templateData.templateSn" :templateData="templateData" fillType="actFill" />
         </div>
       </div>
     </div>
@@ -588,12 +588,7 @@ export default {
         if (params) {
           this.reset()
           if (params.formId && params.formId != '') {
-            if (params.fromYt) {
-              this.showIndex = 1
-              this.bdmbTitle = this.$t('page.business.study.studyFormFill.ytbd')
-            } else {
-              this.showIndex = 2
-            }
+
             this.$modal.loading()
             studyFormFill_info({ id: params.formId }).then(response => {
               this.form = response.data
@@ -601,6 +596,12 @@ export default {
               this.templateData = deepClone(this.form)
               const obj = Object.assign({}, this.$route, { title: this.form.bdmc })
               this.$tab.updatePage(obj);
+              if (params.fromYt) {
+                this.showIndex = 1
+                this.bdmbTitle = this.$t('page.business.study.studyFormFill.ytbd')
+              } else {
+                this.showIndex = 2
+              }
               this.saveSimpleLog({ jcmc: '填报表单编辑', jcmcEn: 'Record Edit', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
               this.$modal.closeLoading()
             })