From ce776a568d34d9e45357c17e669a9acc3529003b Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Mon, 2 Mar 2026 20:53:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?[yp003]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/BaseInfoFormPackage.vue | 111 ++++++++++++++----------
 src/components/Template/HandleFormItem.vue      |   5 +-
 2 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue
index 7692db7..bade853 100644
--- a/src/components/Template/BaseInfoFormPackage.vue
+++ b/src/components/Template/BaseInfoFormPackage.vue
@@ -84,22 +84,33 @@
                                     :error="errors[key]" @update:error="errors[key] = false"
                                     :orange-bg="orangeBgFields[key]" />
                             </div>
-                            <div v-else-if="sItem.type === 'select'">
+                            <div v-else-if="sItem.type === 'select'" class = "flex flex1">
                                 <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                     type="select" :item="sItem" v-model="formFields[key]" @copy="onCopy(sItem, key)"
                                     @change="(e, type) => onSelectChange(key, e, type)" :error="errors[key]"
                                     @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" />
+                                <div v-show="isShowOther(formFields[key])" class="flex flex1">
+                                    <div class="other-title">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
+                                        $t("template.common.other") }}</div>
+                                    <div class="flex">
+                                        <HandleFormItem :field-item-label="fieldItemLabel"
+                                            :field-key="prefixKey + '_' + 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]" />
+                                    </div>
+                                </div>
                             </div>
                             <div v-else-if="sItem.type === 'input'" class="item-center">
                                 <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                     @blur="onBlur(key, $event)" :item="sItem" v-model="formFields[key]"
                                     @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
-                                    :ref = "key"
-                                    :orange-bg="orangeBgFields[key]" />
+                                    :ref="key" :orange-bg="orangeBgFields[key]" />
                                 <span v-if="sItem.subType === 'text'" class="sub-text">{{ $t(sItem.subText) }}</span>
-                                <HandleFormItem  class="ml-10" v-else-if="sItem.subType === 'button'" type="button" :item="getButtonItem(sItem)"
-                                    :value="formFields[sItem.subKey]"
-                                    @clickButton="(e,val,data) => handleClickButton(e, sItem,val,data)" />
+                                <HandleFormItem class="ml-10" v-else-if="sItem.subType === 'button'" type="button"
+                                    :item="getButtonItem(sItem)" :value="formFields[sItem.subKey]"
+                                    @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data)" />
 
                             </div>
                             <div v-else-if="sItem.type === 'textarea'">
@@ -125,22 +136,20 @@
                             <div v-else-if="isRegent(sItem)" class="flex1">
                                 <HandleFormItem
                                     @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, key)"
-                                    :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key" :type="sItem.type"
-                                    sourceFrom="baseInfoFormPackage" :error="errors[key]"
+                                    :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
+                                    :type="sItem.type" sourceFrom="baseInfoFormPackage" :error="errors[key]"
                                     @update:error="errors[key] = false"
                                     @onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, key, sItem)"
                                     :item="sItem" :value="formFields[key]" />
                             </div>
                             <!-- 勾选某些选项时，出现其他输入框 -->
                             <div v-else-if="sItem.type === 'radioAndOther'" class="item-center">
-                                <HandleFormItem
-                                    :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key" type="radio"
-                                    :error="errors[key]"
-                                    @update:error="errors[key] = false"
-                                    @change="(e,type) => onSelectChange(key, e, type)"
-                                    :item="sItem" :value="formFields[key]" />
+                                <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
+                                    type="radio" :error="errors[key]" @update:error="errors[key] = false"
+                                    @change="(e, type) => onSelectChange(key, e, type)" :item="sItem"
+                                    :value="formFields[key]" />
                                 <div v-show="isShowOtherByRadioAndOther(formFields[key], sItem)" class="flex1 ml-10">
-                                     <HandleFormItem :field-item-label="fieldItemLabel"
+                                    <HandleFormItem :field-item-label="fieldItemLabel"
                                         :field-key="prefixKey + '_' + sItem.otherCode" @blur="onBlur(key, $event)"
                                         :item="getRadioOtherItem(sItem)" v-model="formFields[sItem.otherCode]"
                                         @copy="onCopy(sItem, key)" :error="errors[sItem.otherCode]"
@@ -148,11 +157,12 @@
                                         :orange-bg="orangeBgFields[sItem.otherCode]" />
                                 </div>
                             </div>
-                            <div v-else-if="sItem.type === 'fqyq'" class="flex1" :class="{ 'form-error-border': errors[key] }">
+                            <div v-else-if="sItem.type === 'fqyq'" class="flex1"
+                                :class="{ 'form-error-border': errors[key] }">
                                 <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                     type="fqyq" :item="sItem" :value="formFields[key]"
-                                    @change="(e) => onFqyqChange(key, e)"
-                                    :error="errors[key]" @update:error="errors[key] = false" />
+                                    @change="(e) => onFqyqChange(key, e)" :error="errors[key]"
+                                    @update:error="errors[key] = false" />
                             </div>
 
 
@@ -166,7 +176,8 @@
                     <div v-for="(sItem, key) in item.config" class="c-Item flex item-center"
                         :class="getSpanClass(sItem)" :key="key">
                         <div class="step-form-title"
-                            :style="{ 'width': sItem.labelWidth ? sItem.labelWidth + 'px' : '150px' }" v-if="sItem.label">
+                            :style="{ 'width': sItem.labelWidth ? sItem.labelWidth + 'px' : '150px' }"
+                            v-if="sItem.label">
                             {{ $t(sItem.label) }}</div>
                         <div v-if="sItem.type === 'dateTime'" class="flex1">
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
@@ -198,14 +209,16 @@
                                 @blur="onBlur(key, $event)" class="flex1" :item="sItem" v-model="formFields[key]"
                                 @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
                                 :orange-bg="orangeBgFields[key]" />
-                            <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + sItem.subKey"
-                                class="ml-10" v-if="sItem.subType === 'select'" type="select" :item="getSubItem(sItem)"
+                            <HandleFormItem :field-item-label="fieldItemLabel"
+                                :field-key="prefixKey + '_' + sItem.subKey" class="ml-10"
+                                v-if="sItem.subType === 'select'" type="select" :item="getSubItem(sItem)"
                                 v-model="formFields[sItem.subKey]" @copy="onCopy(sItem, key)"
-                                @change="(e, type) => onSelectChange(sItem.subKey, e, type)" :error="errors[sItem.subKey]"
-                                @update:error="errors[sItem.subKey] = false"
+                                @change="(e, type) => onSelectChange(sItem.subKey, e, type)"
+                                :error="errors[sItem.subKey]" @update:error="errors[sItem.subKey] = false"
                                 :orange-bg="orangeBgFields[sItem.subKey]" />
-                            <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + sItem.subKey"
-                                class="ml-10" v-if="sItem.subType === 'input'" type="input" :item="getSubItem(sItem)"
+                            <HandleFormItem :field-item-label="fieldItemLabel"
+                                :field-key="prefixKey + '_' + sItem.subKey" class="ml-10"
+                                v-if="sItem.subType === 'input'" type="input" :item="getSubItem(sItem)"
                                 v-model="formFields[sItem.subKey]" @copy="onCopy(sItem, key)"
                                 :error="errors[sItem.subKey]" @blur="onBlur(sItem.subKey, $event)"
                                 @update:error="errors[sItem.subKey] = false"
@@ -213,13 +226,15 @@
                             <div class="ml-10 item-span" v-else-if="sItem.subType === 'span'">{{
                                 formFields[sItem.subKey] }}</div>
                             <span v-else-if="sItem.subType === 'text'" class="sub-text">{{ $t(sItem.subText) }}</span>
-                            <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + sItem.subKey"
-                                class="ml-10" v-else-if="sItem.subType === 'clickable'" type="clickable"
+                            <HandleFormItem :field-item-label="fieldItemLabel"
+                                :field-key="prefixKey + '_' + sItem.subKey" class="ml-10"
+                                v-else-if="sItem.subType === 'clickable'" type="clickable"
                                 @clickable="handleClickable(sItem, sItem.subKey)" :item="getClickableItem(sItem)"
                                 :error="errors[sItem.subKey]" @update:error="errors[sItem.subKey] = false"
                                 @resetRecord="resetRecord(sItem.subKey)" :value="formFields[sItem.subKey]" />
-                            <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + sItem.subKey"
-                                class="ml-10" v-else-if="isRegent(sItem, 'subType')" :type="sItem.subType"
+                            <HandleFormItem :field-item-label="fieldItemLabel"
+                                :field-key="prefixKey + '_' + sItem.subKey" class="ml-10"
+                                v-else-if="isRegent(sItem, 'subType')" :type="sItem.subType"
                                 :item="getRegentItem(sItem, 'subType')" sourceFrom="baseInfoFormPackage"
                                 @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, sItem.subKey)"
                                 @onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, sItem.subKey, sItem)"
@@ -248,22 +263,25 @@
                                 @input="onInputNumberChange(key, $event)" :value="formFields[key]"
                                 @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
                                 :orange-bg="orangeBgFields[key]" />
-                            <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + sItem.subKey"
-                                class="ml-10" v-if="sItem.subType === 'select'" type="select" :item="getSubItem(sItem)"
+                            <HandleFormItem :field-item-label="fieldItemLabel"
+                                :field-key="prefixKey + '_' + sItem.subKey" class="ml-10"
+                                v-if="sItem.subType === 'select'" type="select" :item="getSubItem(sItem)"
                                 v-model="formFields[sItem.subKey]" @copy="onCopy(sItem, key)"
-                                @change="(e, type) => onSelectChange(sItem.subKey, e, type)" :error="errors[sItem.subKey]"
-                                @update:error="errors[sItem.subKey] = false"
+                                @change="(e, type) => onSelectChange(sItem.subKey, e, type)"
+                                :error="errors[sItem.subKey]" @update:error="errors[sItem.subKey] = false"
                                 :orange-bg="orangeBgFields[sItem.subKey]" />
                             <div class="ml-10 item-span" v-else-if="sItem.subType === 'span'">{{
                                 formFields[sItem.subKey] }}</div>
-                            <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + sItem.subKey"
-                                class="ml-10" v-else-if="sItem.subType === 'clickable'"
+                            <HandleFormItem :field-item-label="fieldItemLabel"
+                                :field-key="prefixKey + '_' + sItem.subKey" class="ml-10"
+                                v-else-if="sItem.subType === 'clickable'"
                                 @clickable="handleClickable(sItem, sItem.subKey)" :error="errors[sItem.subKey]"
                                 type="clickable" @update:error="errors[sItem.subKey] = false"
                                 @resetRecord="resetRecord(sItem.subKey)" :item="getClickableItem(sItem)"
                                 :value="formFields[sItem.subKey]" />
-                            <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + sItem.subKey"
-                                class="ml-10" v-else-if="isRegent(sItem, 'subType')" sourceFrom="baseInfoFormPackage"
+                            <HandleFormItem :field-item-label="fieldItemLabel"
+                                :field-key="prefixKey + '_' + sItem.subKey" class="ml-10"
+                                v-else-if="isRegent(sItem, 'subType')" sourceFrom="baseInfoFormPackage"
                                 :error="errors[sItem.subKey]" :type="sItem.subType"
                                 @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, sItem.subKey)"
                                 @onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, sItem.subKey, sItem)"
@@ -320,7 +338,7 @@
 <script>
 import HandleFormItem from "./HandleFormItem.vue";
 import LineLabel from "./LineLabel.vue";
-import { isShowOther,isShowOtherByRadioAndOther } from "@/utils/formPackageCommon.js";
+import { isShowOther, isShowOtherByRadioAndOther } from "@/utils/formPackageCommon.js";
 import { isRegent } from "@/utils/index.js";
 
 import formPackageMixins from '@/components/Template/mixins/formPackageMixins.js'
@@ -372,9 +390,9 @@ export default {
             this.$emit('beforeReagentSubmit', { selectData: data, callback, key, formFields: this.formFields })
         },
         // 点击按钮
-        handleClickButton(e, item,val,data) {
+        handleClickButton(e, item, val, data) {
             this.formFields[item.subKey] = val;
-            this.$emit("clickButton", item,data)
+            this.$emit("clickButton", item, data)
         },
         // 获取按钮项
         getButtonItem(sItem) {
@@ -385,8 +403,8 @@ export default {
             }
         },
         // 处理fqyq变化
-        onFqyqChange(key, e){
-            console.log(e,key,'fqyq');
+        onFqyqChange(key, e) {
+            console.log(e, key, 'fqyq');
             this.formFields[key] = e;
         }
 
@@ -551,10 +569,11 @@ export default {
 .mr-20 {
     margin-right: 20px;
 }
-.form-error-border{
+
+.form-error-border {
     box-shadow: 0 0 6px #ffc3c3;
-	padding: 8px;
-	border-radius: 4px;
-	border: 1px solid #ff5d5d;
+    padding: 8px;
+    border-radius: 4px;
+    border: 1px solid #ff5d5d;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index f24a8e9..5a49a3b 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -23,6 +23,7 @@
             <el-checkbox v-else-if="type === 'checkbox'" class="flex1" :multiple="item.multiple"
                 :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')" v-model="inputValue"
                 :disabled="getDisabled()" :placeholder="getPlaceholder()" @change="onItemCheckboxChange">
+                {{ item.checkboxLabel }}
             </el-checkbox>
             <el-radio-group v-else-if="type === 'radio'" v-model="inputValue"
                 :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')" :disabled="getDisabled()"
@@ -1066,8 +1067,8 @@ export default {
                 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.oldValue || ''}`;
+                recordValue = `${current.newValue || ''}`;
                 isModify = !!current.oldValue;
             }
             const record = {

From 54ac3b46dfa3c66872c673d5bfe793632e2c62dd Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Mon, 2 Mar 2026 22:04:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?[yp003]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/BaseInfoFormPackage.vue    |  17 ++-
 src/components/Template/HandleFormItem.vue         |  11 +-
 src/utils/formPackageCommon.js                     |   2 +-
 .../business/comps/template/TemplateTable.vue      |   4 +-
 .../business/comps/template/comps/sp/SP0020.vue    | 124 +++++++++++++++++++++
 .../comps/template/formConfig/sp/SP0020.js         |  15 +++
 6 files changed, 159 insertions(+), 14 deletions(-)
 create mode 100644 src/views/business/comps/template/comps/sp/SP0020.vue
 create mode 100644 src/views/business/comps/template/formConfig/sp/SP0020.js

diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue
index bade853..b1739d4 100644
--- a/src/components/Template/BaseInfoFormPackage.vue
+++ b/src/components/Template/BaseInfoFormPackage.vue
@@ -40,7 +40,7 @@
                         </div>
                         <div class="p-l-20">
                             <div v-show="isShowOther(formFields[key])">
-                                <div class="form-title">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
+                                <div class="form-title" >{{ sItem.otherLabel ? $t(sItem.otherLabel) :
                                     $t("template.common.other") }}</div>
                                 <div class="flex flex1">
                                     <HandleFormItem :field-item-label="fieldItemLabel"
@@ -90,7 +90,7 @@
                                     @change="(e, type) => onSelectChange(key, e, type)" :error="errors[key]"
                                     @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" />
                                 <div v-show="isShowOther(formFields[key])" class="flex flex1">
-                                    <div class="other-title">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
+                                    <div class="other-title" v-if="isShowOtherTitle(sItem)">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
                                         $t("template.common.other") }}</div>
                                     <div class="flex">
                                         <HandleFormItem :field-item-label="fieldItemLabel"
@@ -192,7 +192,7 @@
                                 :error="errors[key]" @update:error="errors[key] = false"
                                 :orange-bg="orangeBgFields[key]" />
                             <div v-show="isShowOther(formFields[key])" class="flex flex1">
-                                <div class="other-title">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
+                                <div class="other-title" v-if="isShowOtherTitle(sItem)">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
                                     $t("template.common.other") }}</div>
                                 <div class="flex">
                                     <HandleFormItem :field-item-label="fieldItemLabel"
@@ -241,7 +241,7 @@
                                 :error="errors[sItem.subKey]" @update:error="errors[sItem.subKey] = false"
                                 :value="formFields[sItem.subKey]" />
                             <div v-show="isShowOther(formFields[sItem.subKey])" class="flex flex1">
-                                <div class="other-title">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
+                                <div class="other-title" v-if="isShowOtherTitle(sItem)">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
                                     $t("template.common.other") }}</div>
                                 <div class="flex flex1">
                                     <HandleFormItem :field-item-label="fieldItemLabel"
@@ -406,7 +406,14 @@ export default {
         onFqyqChange(key, e) {
             console.log(e, key, 'fqyq');
             this.formFields[key] = e;
-        }
+        },
+        //是否显示其他输入框的标题
+        isShowOtherTitle(sItem){
+            if (sItem.hasOwnProperty("showOtherLabel")) {
+                return sItem.showOtherLabel
+            }
+            return true
+        },
 
     }
 }
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index 5a49a3b..c316990 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -309,10 +309,7 @@ export default {
     watch: {
         value(newVal) {
             if (this.type === 'checkboxList' && newVal && typeof newVal === 'object') {
-                this.checkboxListValue = {
-                    checkboxValues: newVal.checkboxValues || [],
-                    otherValues: newVal.otherValues || {}
-                };
+                this.checkboxListValue = JSON.parse(JSON.stringify(newVal));
             } else if (this.type === 'checkboxTag' && Array.isArray(newVal)) {
                 // checkboxTag类型，value是数组格式
                 this.checkboxTagList = newVal.map(tag => ({
@@ -916,7 +913,7 @@ export default {
             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:""},
+                "checkboxListOther":{oldValue:oldOtherValues[this.currentOtherCode],newValue:otherValues[this.currentOtherCode],des:"样品信息："},
             }
             return o[this.currentHandleType];
         },
@@ -1067,8 +1064,8 @@ export default {
                 isModify = !!this.oldFqyqValue.mainRadio 
             }else if(this.type === "checkboxList"){
                 const current = this.getCheckboxListInfo();
-                recordOldVlaue = `${current.oldValue || ''}`;
-                recordValue = `${current.newValue || ''}`;
+                recordOldVlaue = `${current.des+(current.oldValue || '')}`;
+                recordValue = `${current.des+(current.newValue || '')}`;
                 isModify = !!current.oldValue;
             }
             const record = {
diff --git a/src/utils/formPackageCommon.js b/src/utils/formPackageCommon.js
index 568e8d3..b431518 100644
--- a/src/utils/formPackageCommon.js
+++ b/src/utils/formPackageCommon.js
@@ -5,7 +5,7 @@ export const isShowOther = (v = [], col) => {
   }
   // 确保v是数组类型，以避免类型错误
   const arr = Array.isArray(v) ? v : [v]
-  const otherArr = ['其他', '遮光', 'CA-QC Dilution-', '拒绝', '部分接受']
+  const otherArr = ['其他', '遮光', 'CA-QC Dilution-', '拒绝', '部分接受',"污染"]
   return arr.some((item) => otherArr.includes(item))
 }
 
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index 1ed5232..eea82a2 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -31,6 +31,7 @@ import SP007 from "./comps/sp/SP007.vue";
 import SP008 from "./comps/sp/SP008.vue";
 import SP009 from "./comps/sp/SP009.vue";
 import SP0019 from "./comps/sp/SP0019.vue";
+import SP0020 from "./comps/sp/SP0020.vue";
 import Demo from "./comps/sp/Demo.vue";
 //供试品
 import GSP001 from "./comps/gsp/GSP001.vue";
@@ -111,7 +112,7 @@ export default {
     //供试品
     GSP001,GSP002, GSP003, GSP004,GSP009, GSP010,
     //色谱
-    SP001, SP003, SP00456,SP007, SP008, SP009,SP0019,
+    SP001, SP003, SP00456,SP007, SP008, SP009,SP0019,SP0020,
     // PCR
     PCR002, PCR003, PCR004, PCR005,
     //LBA
@@ -206,6 +207,7 @@ export default {
           'SP017': 'SP008',
           'SP018': 'SP008',
           'SP019': 'SP0019',
+          'SP020': 'SP0020',
           //供试品
 
           'GSP001': 'GSP001',
diff --git a/src/views/business/comps/template/comps/sp/SP0020.vue b/src/views/business/comps/template/comps/sp/SP0020.vue
new file mode 100644
index 0000000..18fbaf4
--- /dev/null
+++ b/src/views/business/comps/template/comps/sp/SP0020.vue
@@ -0,0 +1,124 @@
+<!-- 生物样品分析溶液配制表 -->
+<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" />
+					<LineLabel label="试验内容" />
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
+
+import { getBaseInfoFormConfig} from "../../formConfig/sp/SP0019";
+import { getSynrFormConfig} from "../../formConfig/sp/SP0020";
+
+
+export default {
+	name: "SP0020",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		synrFormConfig(){
+			return getSynrFormConfig(this);
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return getBaseInfoFormConfig(this);
+		},
+		
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+	
+	},
+	data() {
+		return {
+			formData: {},
+			compRefs:["baseInfoRef", "storageConditionRef", "spzxhRef","yqInfoTableRef","ryTableRef", "remarkRef"]
+		};
+	},
+	mounted() {
+	
+
+	},
+	methods: {
+		onRegentSubmit(e){
+			const {selectInfo, key, col, rowIndex, colIndex, rowData} = e;
+			const {row} = selectInfo;
+			if(key === "rymc"){
+				const params = {
+					pzrq: row.pzrq,
+					sxr: row.sxr,
+				}
+				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)
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			let content = await this.validFormFields(this.compRefs);
+			console.log(content)
+			return content;
+		},
+		//保存
+		async onSave() {
+
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/comps/template/formConfig/sp/SP0020.js b/src/views/business/comps/template/formConfig/sp/SP0020.js
new file mode 100644
index 0000000..a951969
--- /dev/null
+++ b/src/views/business/comps/template/formConfig/sp/SP0020.js
@@ -0,0 +1,15 @@
+export const getSynrFormConfig = ($this) => {
+    return [
+        {
+            type: 'step',
+            config: {
+                yqmxh: {
+                    label: '色谱柱型号',
+                    type: 'yq',
+                    fillType: 'actFill',
+                    filledCodes:['mc','bh'],
+                },
+            }
+        },
+    ]
+}
\ No newline at end of file

From 12984aef1a1836a62fc2a1b5595f5507911a15ae Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Mon, 2 Mar 2026 22:12:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?[yp003]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/BaseInfoFormPackage.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue
index b1739d4..eb28b6e 100644
--- a/src/components/Template/BaseInfoFormPackage.vue
+++ b/src/components/Template/BaseInfoFormPackage.vue
@@ -89,8 +89,8 @@
                                     type="select" :item="sItem" v-model="formFields[key]" @copy="onCopy(sItem, key)"
                                     @change="(e, type) => onSelectChange(key, e, type)" :error="errors[key]"
                                     @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" />
-                                <div v-show="isShowOther(formFields[key])" class="flex flex1">
-                                    <div class="other-title" v-if="isShowOtherTitle(sItem)">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
+                                <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">
                                         <HandleFormItem :field-item-label="fieldItemLabel"
@@ -191,8 +191,8 @@
                                 @copy="onCopy(sItem, key)" @change="(e, type) => onSelectChange(key, e, type)"
                                 :error="errors[key]" @update:error="errors[key] = false"
                                 :orange-bg="orangeBgFields[key]" />
-                            <div v-show="isShowOther(formFields[key])" class="flex flex1">
-                                <div class="other-title" v-if="isShowOtherTitle(sItem)">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
+                            <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">
                                     <HandleFormItem :field-item-label="fieldItemLabel"
@@ -240,8 +240,8 @@
                                 @onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, sItem.subKey, sItem)"
                                 :error="errors[sItem.subKey]" @update:error="errors[sItem.subKey] = false"
                                 :value="formFields[sItem.subKey]" />
-                            <div v-show="isShowOther(formFields[sItem.subKey])" class="flex flex1">
-                                <div class="other-title" v-if="isShowOtherTitle(sItem)">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
+                            <div v-show="isShowOther(formFields[sItem.subKey])" 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 flex1">
                                     <HandleFormItem :field-item-label="fieldItemLabel"
@@ -408,7 +408,7 @@ export default {
             this.formFields[key] = e;
         },
         //是否显示其他输入框的标题
-        isShowOtherTitle(sItem){
+        isShowOtherLabel(sItem){
             if (sItem.hasOwnProperty("showOtherLabel")) {
                 return sItem.showOtherLabel
             }