Merge branch 'master' into zhangteng

src/components/Template/BaseInfoFormPackage.vue

@@ -10,8 +10,7 @@
                             <div class="form-title">{{ $t(sItem.label) }}</div>
                             <HandleFormItem :field-item-label="fieldItemLabel" @blur="onBlur(key, $event)" :item="sItem"
                                 v-model="formFields[key]" :field-key="prefixKey + '_' + key" @copy="onCopy(sItem, key)"
-                                :error="errors[key]" @update:error="errors[key] = false"
-                                :type="sItem.type"
+                                :error="errors[key]" @update:error="errors[key] = false" :type="sItem.type"
                                 :orange-bg="orangeBgFields[key]" />
                         </template>
                     </div>
@@ -33,7 +32,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"
@@ -73,17 +72,18 @@
                             <div class="form-title" v-if="sItem.label">{{ $t(sItem.label) }}</div>
                             <div v-if="sItem.type === 'dateTime' || sItem.type === 'datePicker'" class="flex1">
                                 <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                    :type="sItem.type" :item="sItem" v-model="formFields[key]" @copy="onCopy(sItem, key)"
-                                    :error="errors[key]" @update:error="errors[key] = false"
+                                    :type="sItem.type" :item="sItem" v-model="formFields[key]"
+                                    @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
                                     :orange-bg="orangeBgFields[key]" />
                             </div>
-                            <div v-else-if="sItem.type === 'select'" class = "flex flex1">
+                            <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 ml-10">
-                                    <div class="other-title" v-if="isShowOtherLabel(sItem)">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
+                                    <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"
@@ -95,16 +95,19 @@
                                     </div>
                                 </div>
                             </div>
-                            <div v-else-if="sItem.type === 'input'||sItem.type === 'textarea' || sItem.type === 'inputNumber'" class="item-center">
+                            <div v-else-if="sItem.type === 'input' || sItem.type === 'textarea' || sItem.type === 'inputNumber'"
+                                class="item-center">
                                 <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                     @blur="onBlur(key, $event)" :item="sItem" v-model="formFields[key]"
-                                    :type="sItem.type"
-                                    @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
-                                    :ref="key" :orange-bg="orangeBgFields[key]" />
+                                    :type="sItem.type" @copy="onCopy(sItem, key)" :error="errors[key]"
+                                    @update:error="errors[key] = false" :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)" />
+                                    @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data, sItem.subKey)" />
+                                <HandleFormItem class="ml-10" v-else-if="sItem.thirdType === 'button'" type="button"
+                                    :item="getThirdButtonItem(sItem)" :value="formFields[sItem.thirdKey]"
+                                    @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data, sItem.thirdKey)" />
 
                             </div>
                             <div v-else-if="sItem.type === 'clickable'" class="flex1">
@@ -124,8 +127,7 @@
                             </div>
                             <!-- 勾选某些选项时，出现其他输入框 -->
                             <div v-else-if="sItem.type === 'radioAndOther'" class="item-center"
-                            :class="{'form-error-border': errors[key]}"
-                            >
+                                :class="{ 'form-error-border': errors[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"
@@ -155,12 +157,14 @@
             </template>
             <div class="flex flex-wrap" v-else-if="item.type === 'explainItem'">
                 <div v-for="(sItem, key) in item.config" :key="key" class="explain-item">
-                    <div v-if="sItem.type === 'input' || sItem.type === 'textarea' || sItem.type === 'inputNumber'" class="m-r-10">
+                    <div v-if="sItem.type === 'input' || sItem.type === 'textarea' || sItem.type === 'inputNumber'"
+                        class="m-r-10">
                         <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                        :type="sItem.type" :item="sItem" style="width: auto;flex:1" :style = "{'width': sItem.formWidth ? sItem.formWidth + 'px' : 'auto'}" 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]" />
+                            :type="sItem.type" :item="sItem" style="width: auto;flex:1"
+                            :style="{ 'width': sItem.formWidth ? sItem.formWidth + 'px' : 'auto' }"
+                            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>
                     <span v-else-if="sItem.type === 'span'" class="explain-title">{{ $t(sItem.label) }}</span>
                 </div>
@@ -174,26 +178,31 @@
                             :style="{ 'width': sItem.labelWidth ? sItem.labelWidth + 'px' : '150px' }"
                             v-if="sItem.label">
                             {{ $t(sItem.label) }}</div>
+                        <div v-if="sItem.type === 'span'" class="flex1">
+                            {{ formFields[key] }}
+                        </div>
                         <div v-if="sItem.type === 'dateTime'" class="flex1">
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                 type="dateTime" :item="sItem" v-model="formFields[key]" @copy="onCopy(sItem, key)"
                                 :error="errors[key]" @update:error="errors[key] = false"
                                 :orange-bg="orangeBgFields[key]" />
                         </div>
-                        <div v-else-if="sItem.type === 'select' ||sItem.type === 'radio'" class="flex flex1">
+                        <div v-else-if="sItem.type === 'select' || sItem.type === 'radio'" class="flex flex1">
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                 :type="sItem.type" :item="sItem" style="width: auto;flex:1" 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]) || isShowRadioSelect(formFields[key])" class="flex flex1 ml-10">
-                                <div class="other-title" v-if="isShowOtherLabel(sItem) && isShowOther(formFields[key])">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
-                                    $t("template.common.other") }}</div>
+                                @remoteMethod="(query) => remoteMethod(query, sItem, key)" :error="errors[key]"
+                                @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" />
+                            <div v-show="isShowOther(formFields[key]) || isShowRadioSelect(formFields[key])"
+                                class="flex flex1 ml-10">
+                                <div class="other-title" v-if="isShowOtherLabel(sItem) && isShowOther(formFields[key])">
+                                    {{ sItem.otherLabel ? $t(sItem.otherLabel) :
+                                        $t("template.common.other") }}</div>
                                 <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]"
-                                        :type = "isShowOther(formFields[key]) ? 'input' : 'select'"
+                                        :type="isShowOther(formFields[key]) ? 'input' : 'select'"
                                         @copy="onCopy(sItem, key)" :error="errors[sItem.otherCode]"
                                         @update:error="errors[sItem.otherCode] = false"
                                         :orange-bg="orangeBgFields[sItem.otherCode]" />
@@ -202,46 +211,57 @@
                         </div>
                         <div v-else-if="sItem.type === 'input' || sItem.type === 'inputNumber'" class="flex flex1">
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                :type="sItem.type"
-                                @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)"
-                                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"
-                                :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)"
-                                v-model="formFields[sItem.subKey]" @copy="onCopy(sItem, key)"
-                                :error="errors[sItem.subKey]" @blur="onBlur(sItem.subKey, $event)"
-                                @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>
-                            <span v-else-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 :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"
-                                :item="getRegentItem(sItem, 'subType')" sourceFrom="baseInfoFormPackage"
-                                @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, sItem.subKey)"
-                                @onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, sItem.subKey, sItem)"
-                                :error="errors[sItem.subKey]" @update:error="errors[sItem.subKey] = false"
-                                :value="formFields[sItem.subKey]" />
+                                :type="sItem.type" @blur="onBlur(key, $event)" class="flex1" :item="sItem"
+                                v-model="formFields[key]" @copy="onCopy(sItem, key)" :error="errors[key]" :ref="key"
+                                @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" />
+                            <template v-if="isShowSub(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"
+                                    :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)"
+                                    v-model="formFields[sItem.subKey]" @copy="onCopy(sItem, key)"
+                                    :error="errors[sItem.subKey]" @blur="onBlur(sItem.subKey, $event)"
+                                    :ref="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>
+                                <span v-else-if="sItem.subType === 'text'" class="sub-text">{{ $t(sItem.subText)
+                                    }}</span>
+                                <div v-else-if="sItem.subType === 'button'">
+                                    <HandleFormItem class="ml-10" type="button" :item="getButtonItem(sItem)"
+                                        :value="formFields[sItem.subKey]"
+                                        @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data, sItem.subKey)" />
+                                </div>
+
+                                <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"
+                                    :item="getRegentItem(sItem, 'subType')" sourceFrom="baseInfoFormPackage"
+                                    @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, sItem.subKey)"
+                                    @onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, sItem.subKey, sItem)"
+                                    :error="errors[sItem.subKey]" @update:error="errors[sItem.subKey] = false"
+                                    :value="formFields[sItem.subKey]" />
+                            </template>
+                            <div v-if="isShowSub(sItem,'thirdType')">
+                                <HandleFormItem class="ml-10" v-if="sItem.thirdType === 'button'" type="button"
+                                    :item="getThirdButtonItem(sItem)" :value="formFields[sItem.thirdKey]"
+                                    @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data, sItem.thirdKey)" />
+                            </div>
                             <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) :
+                                <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"
@@ -252,44 +272,9 @@
                                         :orange-bg="orangeBgFields[sItem.otherCode]" />
                                 </div>
                             </div>
-                            <!-- <div class="clickable" :class="getFillType(sItem.subFillType)" v-else-if = "sItem.subType ==='clickable'" @click="handleClickable(sItem,$event)">
-                                <span v-if="formFields[sItem.subKey]">{{ formFields[sItem.subKey] }}</span>
-                                <span v-else class="default-placeholder-text">请选择</span>
-                            </div> -->
+
                         </div>
-                        <!-- <div v-else-if="sItem.type === 'inputNumber'" class="flex flex1">
-                            <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                type="inputNumber" @blur="onBlur(key, $event)" class="flex1" :item="sItem"
-                                @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)"
-                                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"
-                                :orange-bg="orangeBgFields[sItem.subKey]" />
-                            <div class="ml-10 item-span" v-else-if="sItem.subType === 'span'">{{
-                                formFields[sItem.subKey] }}</div>
-                            <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 :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"
-                                :error="errors[sItem.subKey]" :type="sItem.subType"
-                                @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, sItem.subKey)"
-                                @onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, sItem.subKey, sItem)"
-                                :item="getRegentItem(sItem, 'subType')" :value="formFields[sItem.subKey]" />
-                        </div> -->
+
                         <div v-else-if="sItem.type === 'clickable'" class="flex flex1">
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                 type="clickable" @clickable="handleClickable(sItem, key)" :error="errors[key]"
@@ -306,47 +291,47 @@
                             <span v-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 === 'input' || sItem.subType === 'inputNumber' || sItem.subType === 'select'" :type="sItem.subType" :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"
+                                v-else-if="sItem.subType === 'input' || sItem.subType === 'inputNumber' || sItem.subType === 'select'"
+                                :type="sItem.subType" :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"
                                 :orange-bg="orangeBgFields[sItem.subKey]" />
                             <HandleFormItem :field-item-label="fieldItemLabel"
                                 :field-key="prefixKey + '_' + sItem.thirdKey" class="ml-10"
-                                v-if="sItem.thirdType === 'select' || sItem.thirdType === 'input'" :type="sItem.thirdType" :item="getThirdItem(sItem)"
-                                v-model="formFields[sItem.thirdKey]" @copy="onCopy(sItem, key)"
-                                :error="errors[sItem.thirdKey]" @blur="onBlur(sItem.thirdKey, $event)"
-                                @update:error="errors[sItem.thirdKey] = false"
+                                v-if="sItem.thirdType === 'select' || sItem.thirdType === 'input'"
+                                :type="sItem.thirdType" :item="getThirdItem(sItem)" v-model="formFields[sItem.thirdKey]"
+                                @copy="onCopy(sItem, key)" :error="errors[sItem.thirdKey]"
+                                @blur="onBlur(sItem.thirdKey, $event)" @update:error="errors[sItem.thirdKey] = false"
                                 :orange-bg="orangeBgFields[sItem.thirdKey]" />
                             <HandleFormItem class="ml-10" v-if="sItem.fourthType === 'button'" type="button"
-                                    :item="getFourthButtonItem(sItem)" :value="formFields[sItem.fourthKey]"
-                                    @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data)" />
-                            
+                                :item="getFourthButtonItem(sItem)" :value="formFields[sItem.fourthKey]"
+                                @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data, sItem.fourthKey)" />
+
                         </div>
                     </div>
                 </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" :class="sItem.span == 1 ? 'full-row' : ''">
                             <div class="form-title mr-20 checkboxList-title">{{ $t(sItem.label) }}</div>
                             <div class="flex flex1">
-                                <HandleFormItem 
-                                    v-if="sItem.type === 'checkboxTree'"
-                                    :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                    :type="sItem.type" :item="sItem" :value="formFields[key]"
-                                     @change="(e) => onAttachmentChange(key, e)"
+                                <HandleFormItem v-if="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]" />
-                                <HandleFormItem v-else-if="sItem.type === 'textarea'" :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                    @blur="onBlur(key, $event)" type="textarea" :item="sItem" v-model="formFields[key]"
-                                    @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
+                                <HandleFormItem v-else-if="sItem.type === 'textarea'" :field-item-label="fieldItemLabel"
+                                    :field-key="prefixKey + '_' + key" @blur="onBlur(key, $event)" type="textarea"
+                                    :item="sItem" v-model="formFields[key]" @copy="onCopy(sItem, key)"
+                                    :error="errors[key]" @update:error="errors[key] = false"
                                     :orange-bg="orangeBgFields[key]" />
-                                <HandleFormItem v-else-if="sItem.type === 'input'" :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                    @blur="onBlur(key, $event)" type="input" :item="sItem" v-model="formFields[key]"
-                                    @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
+                                <HandleFormItem v-else-if="sItem.type === 'input'" :field-item-label="fieldItemLabel"
+                                    :field-key="prefixKey + '_' + key" @blur="onBlur(key, $event)" type="input"
+                                    :item="sItem" v-model="formFields[key]" @copy="onCopy(sItem, key)"
+                                    :error="errors[key]" @update:error="errors[key] = false"
                                     :orange-bg="orangeBgFields[key]" />
                             </div>
                         </div>
@@ -410,34 +395,63 @@ export default {
         };
     },
     methods: {
+        isShowSub(item,type){
+            if(type === 'thirdType'){
+                if (item.hasOwnProperty("showThird")) {
+                    return item.showThird
+                }
+                return item.thirdType && item.thirdKey;
+            }
+            if (item.hasOwnProperty("showSub")) {
+				return item.showSub
+			} else if (item.subType === 'text') {//如果是span没有值的话就隐藏
+				return true;
+			}
+			return item.subType && item.subKey;
+        },
+        remoteMethod(query, sItem, key) {
+            this.$emit('remoteMethod', { query, sItem, key, formFields: this.formFields })
+        },
         //是否显示radio后的select
-        isShowRadioSelect(value){
-            const arr = ["动物种属","细胞系"];
+        isShowRadioSelect(value) {
+            const arr = ["动物种属", "细胞系"];
             return arr.includes(value)
         },
         onBeforeReagentSubmit(data, callback, key) {
             this.$emit('beforeReagentSubmit', { selectData: data, callback, key, formFields: this.formFields })
         },
         // 点击按钮
-        handleClickButton(e, item, val, data) {
-            if(!item.isClearForm){
-                this.formFields[item.subKey] = val;
-            }                
-            this.$emit("clickButton", item, data)
+        handleClickButton(e, item, val, data, key) {
+            if (!item.isClearForm) {
+                this.formFields[key] = val;
+            }
+            this.$emit("clickButton", item, data, key, this.formFields)
         },
         // 获取按钮项
         getButtonItem(sItem) {
             return {
                 ...sItem,
                 key: sItem.subKey,
-                fillType: sItem.fourthFillType || sItem.fillType
+                disabled: sItem.subDisabled,
+                fillType: sItem.subFillType || sItem.fillType
+            }
+        },
+        // 获取按钮项
+        getThirdButtonItem(sItem) {
+            return {
+                ...sItem,
+                key: sItem.thirdKey,
+                disabled: sItem.thirdDisabled,
+                buttonName: sItem.thirdButtonName,
+                fillType: sItem.thirdFillType || sItem.fillType
             }
         },
         getFourthButtonItem(sItem) {
             return {
                 ...sItem,
                 key: sItem.fourthKey,
-                buttonName:sItem.fourthButtonName,
+                buttonName: sItem.fourthButtonName,
+                disabled: sItem.fourthDisabled,
                 fillType: sItem.fourthFillType || sItem.fillType
             }
         },
@@ -447,7 +461,7 @@ export default {
             this.formFields[key] = e;
         },
         //是否显示其他输入框的标题
-        isShowOtherLabel(sItem){
+        isShowOtherLabel(sItem) {
             if (sItem.hasOwnProperty("showOtherLabel")) {
                 return sItem.showOtherLabel
             }
@@ -539,22 +553,26 @@ export default {
 .p-r-20 {
     padding-right: 20px;
 }
-.explain-title{
+
+.explain-title {
     font-size: 14px;
     font-weight: normal;
     color: #606266;
     padding-right: 10px;
 
 }
-.explain-item{
+
+.explain-item {
     display: flex;
     align-items: center;
     padding: 10px 0;
 }
-.flex-wrap{
+
+.flex-wrap {
     flex-wrap: wrap;
 }
-.m-r-10{
+
+.m-r-10 {
     margin-right: 10px;
 }
 
@@ -640,7 +658,8 @@ export default {
     border-radius: 4px;
     border: 1px solid #ff5d5d;
 }
-.checkboxList-title{
+
+.checkboxList-title {
     width: 120px;
     text-align: center;
 }

src/components/Template/CustomTable.vue

@@ -93,7 +93,7 @@
 								<template
 									v-if="col.bodyType === 'input' || col.bodyType === 'inputNumber' || col.bodyType === 'select' || col.bodyType === 'dateTimeRange' || col.bodyType === 'radio'">
 									<div class="flex flex1">
-										<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+										<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + row.id"
 											:fieldItemLabel="fieldItemLabel" :type="col.bodyType"
 											@blur="onBlur(rowIndex, col.prop, $event)" @copy="onCopy(rowIndex, col)"
 											class="body-input" :item="getBodyItem(col, rowIndex)"
@@ -120,7 +120,7 @@
 											:class="{ 'full-row': row[col.prop] && row[col.prop].length == 1 }"
 											v-for="(opItem, itemIndex) in row[col.prop]" :key="itemIndex">
 											<HandleFormItem
-												:fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex + '_' + itemIndex"
+												:fieldKey="prefixKey + '_' + col.prop + '_' + row.id + '_' + itemIndex"
 												:fieldItemLabel="fieldItemLabel" type="input"
 												@blur="onOperableInputBlur(opItem, $event)" class="body-input"
 												:item="getBodyItem(col, rowIndex)" :value="opItem.value"
@@ -140,7 +140,7 @@
 								</div>
 
 								<div class="flex flex1" v-else-if="col.bodyType === 'clickable'">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + row.id"
 										:fieldItemLabel="fieldItemLabel" type="clickable" class="body-clickable"
 										:item="getBodyItem(col, rowIndex)" :value="row[col.prop]"
 										:error="hasError(rowIndex, colIndex, col.prop)"
@@ -150,7 +150,7 @@
 										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
 								</div>
 								<div class="flex flex1" v-else-if="isRegent(col, 'bodyType')">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + row.id"
 										:fieldItemLabel="fieldItemLabel" :type="col.bodyType" class="body-clickable"
 										sourceFrom="customTable" :item="getBodyItem(col, rowIndex)"
 										:value="row[col.prop]" :error="hasError(rowIndex, colIndex, col.prop)"
@@ -167,7 +167,7 @@
 								<template v-else-if="col.bodyType === 'checkboxTag'">
 									<div class="flex flex-wrap"
 										:class="{ 'row-error-border': hasError(rowIndex, colIndex, col.prop) }">
-										<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+										<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + row.id"
 											:fieldItemLabel="fieldItemLabel" type="checkboxTag" :value="row[col.prop]"
 											:item="getBodyItem(col, rowIndex)"
 											@change="onCheckboxTagChange(rowIndex, colIndex, col, $event)"
@@ -177,7 +177,7 @@
 									</div>
 								</template>
 								<template v-else-if="col.bodyType === 'checkbox'">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + row.id"
 										:fieldItemLabel="fieldItemLabel" type="checkbox" v-model="row[col.prop]"
 										:item="getBodyItem(col, rowIndex)"
 										@change="onCheckboxChange(rowIndex, colIndex, col, $event)"
@@ -204,7 +204,7 @@
 								v-if="isShowBodySub(col, row)">
 								<template
 									v-if="col.bodySubType === 'inputNumber' || col.bodySubType === 'input' || col.bodySubType === 'select'">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + rowIndex"
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + row.id"
 										:fieldItemLabel="fieldItemLabel" :type="col.bodySubType"
 										@blur="onSubBlur(rowIndex, col.bodySubKey, $event)"
 										@copy="onCopy(rowIndex, col)" :item="getBodySubItem(col)"
@@ -225,7 +225,7 @@
 										@clickButton="(e, data) => handleClickButton(e, data, col.bodySubKey, rowIndex, colIndex)" />
 								</template>
 								<div class="flex flex1" v-else-if="isRegent(col, 'bodySubType')">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + rowIndex"
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + row.id"
 										:fieldItemLabel="fieldItemLabel" :type="col.bodySubType" class="body-clickable"
 										sourceFrom="customTable" :item="getBodySubItem(col, rowIndex)"
 										:value="row[col.bodySubKey]"
@@ -1012,6 +1012,12 @@ export default {
 			this.checkCompareToOnDataLoad();
 			justUpdateFilledFormData();
 		},
+		pushDataSource(data=[]) {
+			this.localDataSource.push(...data);
+			this.localDataSource = [...this.localDataSource];
+			this.checkCompareToOnDataLoad();
+			justUpdateFilledFormData();
+		},
 		// 比较newData和oldData的值是否相等，只要有一对不相等就返回false
 		compareOldAndCurrentFormFields(newData, oldData) {
 			for (const key in newData) {
@@ -1062,6 +1068,7 @@ export default {
 				actSolutionConcentrationPrecision: 3,//小数点精度默认为3
 				targetDiluentVolumePrecision: 3,//小数点精度默认为3
 				targetStartSolutionVolumePrecision: 3,//小数点精度默认为3
+				id:getuuid(),
 			});
 			justUpdateFilledFormData()
 		},

src/components/Template/DecimalInput.vue

@@ -38,6 +38,7 @@ export default {
       internalValue: this.value !== null && this.value !== undefined ? String(this.value) : '',
       oldValue: null,
       oldPattern: null,
+      isNA: this.value !== null && this.value !== undefined ? /^NA$/i.test(String(this.value).toUpperCase()) : false,
       patternRules: [
         { name: 'NA', pattern: /^NA$/i, inputPattern: /^N?A?$/i },
         { name: 'FRACTION', pattern: /^\d+(\/\d+)*$/, inputPattern: /^(\d+\/?)*$/ }
@@ -51,9 +52,11 @@ export default {
           this.internalValue = '';
           this.oldValue = null;
           this.oldPattern = null;
+          this.isNA = false;
         } else {
           const strVal = String(newVal);
           this.internalValue = strVal;
+          this.isNA = /^NA$/i.test(strVal.toUpperCase());
           this.updateOldValue(strVal);
         }
       },
@@ -84,123 +87,118 @@ export default {
     handleInput(val) {
       if (val === '') {
         this.internalValue = '';
+        this.isNA = false;
         this.$emit('input', '');
         return;
       }
 
+      // 检查是否已经输入了完整的NA
+      if (this.isNA) {
+        // 如果已经输入了NA，无论输入什么，都保持NA不变
+        this.internalValue = 'NA';
+        this.$emit('input', 'NA');
+        return;
+      }
+
       const upperVal = val.toUpperCase();
       let cleaned = val;
       let matchedRule = null;
-      if (this.oldPattern) {
-        // 检查是否是旧模式的延续（以oldValue开头）
-        if (val.startsWith(this.oldValue)) {
-          // 是旧模式的延续，检查是否符合inputPattern
-          if (this.oldPattern.inputPattern.test(val)) {
-            matchedRule = this.oldPattern;
-            cleaned = val;
-          } else {
-            // 不符合，但如果是FRACTION类型，尝试特殊处理
-            if (this.oldPattern.name === 'FRACTION') {
-              cleaned = val.replace(/[^\d/]/g, '');
-              const parts = cleaned.split('/');
-              const validParts = [];
-              for (let i = 0; i < parts.length; i++) {
-                if (parts[i] !== '') {
-                  validParts.push(parts[i]);
-                }
-              }
-              cleaned = validParts.join('/');
-              matchedRule = this.oldPattern;
-            } else {
-              cleaned = this.oldValue || '';
-              this.internalValue = cleaned;
-              return;
-            }
-          }
-        } else if (this.oldPattern.inputPattern.test(val)) {
-          // 不是延续，但符合inputPattern（可能是清空后重新输入）
-          matchedRule = this.oldPattern;
-          cleaned = val;
-        } else {
-          // 尝试匹配新规则
-          matchedRule = this.getMatchingRule(val);
-          if (!matchedRule) {
-            cleaned = this.oldValue || '';
-            this.internalValue = cleaned;
-            return;
-          }
-        }
+      
+      // 检查是否匹配特殊模式（NA或FRACTION）
+      // 优先检查完整的NA模式
+      if (/^NA$/i.test(upperVal)) {
+        matchedRule = { name: 'NA', pattern: /^NA$/i, inputPattern: /^N?A?$/i };
+        cleaned = upperVal;
+        this.isNA = true;
+      } else if (upperVal === 'N' || upperVal === 'A') {
+        // 部分匹配NA模式
+        matchedRule = { name: 'NA', pattern: /^NA$/i, inputPattern: /^N?A?$/i };
+        cleaned = upperVal;
       } else {
+        // 检查FRACTION模式
         matchedRule = this.getMatchingRule(val);
-        
-        if (matchedRule) {
-          if (matchedRule.name === 'FRACTION') {
-            cleaned = val.replace(/[^\d/]/g, '');
-            const parts = cleaned.split('/');
-            const validParts = [];
-            for (let i = 0; i < parts.length; i++) {
-              if (parts[i] !== '') {
-                validParts.push(parts[i]);
-              }
+      }
+      
+      if (matchedRule) {
+        if (matchedRule.name === 'FRACTION') {
+          cleaned = val.replace(/[^\d/]/g, '');
+          const parts = cleaned.split('/');
+          const validParts = [];
+          for (let i = 0; i < parts.length; i++) {
+            if (parts[i] !== '' || i === parts.length - 1) {
+              validParts.push(parts[i]);
             }
-            cleaned = validParts.join('/');
-          } else {
-            cleaned = upperVal;
           }
+          cleaned = validParts.join('/');
         } else {
-          cleaned = val
-            .replace(/[^\d.-]/g, '')
-            .replace(/^(-)\1+/, '$1');
+          cleaned = upperVal;
+        }
+      } else {
+        // 处理数字和小数点输入
+        cleaned = val
+          .replace(/[^\d.-]/g, '')
+          .replace(/^(-)\1+/, '$1');
 
-          const firstDotIndex = cleaned.indexOf('.');
-          if (firstDotIndex !== -1) {
-            const before = cleaned.slice(0, firstDotIndex);
-            const after = cleaned.slice(firstDotIndex + 1).replace(/\./g, '');
-            cleaned = before + '.' + after;
-          }
+        // 确保只有一个小数点
+        const firstDotIndex = cleaned.indexOf('.');
+        if (firstDotIndex !== -1) {
+          const before = cleaned.slice(0, firstDotIndex);
+          const after = cleaned.slice(firstDotIndex + 1).replace(/\./g, '');
+          cleaned = before + '.' + after;
+        }
 
-          if (this.decimalDigits > 0 && cleaned.includes('.')) {
-            const [intPart, decPart = ''] = cleaned.split('.');
-            cleaned = intPart + '.' + decPart.slice(0, this.decimalDigits);
-          } else if (this.decimalDigits === 0) {
-            cleaned = cleaned.split('.')[0];
-          }
+        // 处理小数点位数限制
+        if (this.decimalDigits > 0 && cleaned.includes('.')) {
+          const [intPart, decPart = ''] = cleaned.split('.');
+          cleaned = intPart + '.' + decPart.slice(0, this.decimalDigits);
+        } else if (this.decimalDigits === 0) {
+          cleaned = cleaned.split('.')[0];
+        }
 
-          if (cleaned === '.') cleaned = '0.';
-          else if (cleaned === '-.') cleaned = '-0.';
-          else if (cleaned.startsWith('.')) cleaned = '0' + cleaned;
-          else if (cleaned.startsWith('-.')) cleaned = '-0.' + cleaned.slice(2);
+        // 处理以小数点开头的情况
+        if (cleaned === '.') cleaned = '0.';
+        else if (cleaned === '-.') cleaned = '-0.';
+        else if (cleaned.startsWith('.')) cleaned = '0' + cleaned;
+        else if (cleaned.startsWith('-.')) cleaned = '-0.' + cleaned.slice(2);
 
-          if (cleaned.includes('.')) {
-            const [int, dec] = cleaned.split('.');
-            let newInt = int;
-            if (/^-?0+\d/.test(int)) {
-              newInt = int.replace(/^-?0+(\d)/, '$1');
-            } else if (int === '' || int === '-') {
-              newInt = int + '0';
-            } else if (int === '00' || /^-00+$/.test(int)) {
-              newInt = int.startsWith('-') ? '-0' : '0';
-            }
-            cleaned = newInt + '.' + dec;
-          } else {
-            if (/^-?0+\d/.test(cleaned)) {
-              cleaned = cleaned.replace(/^-?0+(\d)/, '$1');
-            } else if (cleaned === '00' || /^-00+$/.test(cleaned)) {
-              cleaned = cleaned.startsWith('-') ? '-0' : '0';
-            }
+        // 处理整数部分的前导零
+        if (cleaned.includes('.')) {
+          const [int, dec] = cleaned.split('.');
+          let newInt = int;
+          if (/^-?0+\d/.test(int)) {
+            newInt = int.replace(/^-?0+(\d)/, '$1');
+          } else if (int === '' || int === '-') {
+            newInt = int + '0';
+          } else if (int === '00' || /^-00+$/.test(int)) {
+            newInt = int.startsWith('-') ? '-0' : '0';
+          }
+          cleaned = newInt + '.' + dec;
+        } else {
+          if (/^-?0+\d/.test(cleaned)) {
+            cleaned = cleaned.replace(/^-?0+(\d)/, '$1');
+          } else if (cleaned === '00' || /^-00+$/.test(cleaned)) {
+            cleaned = cleaned.startsWith('-') ? '-0' : '0';
           }
         }
       }
 
       this.internalValue = cleaned;
 
+      // 处理emit值
       if (cleaned === '' || cleaned === '-') {
         this.$emit('input', cleaned === '-' ? '-' : '');
       } else if (matchedRule && matchedRule.name !== 'FRACTION') {
         this.$emit('input', cleaned);
       } else if (cleaned.includes('/')) {
         this.$emit('input', cleaned);
+      } else if (cleaned.includes('.')) {
+        // 对于包含小数点的情况，先emit字符串以保持小数点
+        this.$emit('input', cleaned);
+      } else if (matchedRule && matchedRule.name === 'FRACTION') {
+        // 对于FRACTION模式的整数，保持字符串形式以支持后续输入斜杠
+        this.$emit('input', cleaned);
       } else {
+        // 对于纯数字，转换为数字
         const num = parseFloat(cleaned);
         this.$emit('input', isNaN(num) ? '' : num);
       }
@@ -238,6 +236,7 @@ export default {
       if (val === '') {
         this.oldValue = null;
         this.oldPattern = null;
+        this.isNA = false;
         this.$emit('input', '');
         this.$emit('blur', '');
         return;
@@ -245,17 +244,20 @@ export default {
 
       const upperVal = val.toUpperCase();
       
+      // 检查是否匹配特殊模式
       for (const rule of this.patternRules) {
         if (rule.pattern.test(upperVal)) {
           this.oldValue = upperVal;
           this.oldPattern = rule;
           this.internalValue = upperVal;
+          this.isNA = /^NA$/i.test(upperVal);
           this.$emit('input', upperVal);
           this.$emit('blur', upperVal);
           return;
         }
       }
 
+      // 处理分数
       if (val.includes('/')) {
         const parts = val.split('/');
         const validParts = parts.filter(part => part !== '');
@@ -292,20 +294,12 @@ export default {
         return;
       }
 
-      if (this.oldValue && this.oldPattern) {
-        const partialMatch = this.oldPattern.inputPattern && this.oldPattern.inputPattern.test(val);
-        if (!partialMatch) {
-          this.internalValue = this.oldValue;
-          this.$emit('input', this.oldValue);
-          this.$emit('blur', this.oldValue);
-          return;
-        }
-      }
-
+      // 处理数字
       let formatted = this.handleDecimalDigits(val);
       this.internalValue = formatted;
-      this.$emit('input', parseFloat(formatted));
-      this.$emit('blur', parseFloat(formatted));
+      const num = parseFloat(formatted);
+      this.$emit('input', isNaN(num) ? '' : num);
+      this.$emit('blur', isNaN(num) ? '' : num);
     }
   }
 };

src/components/Template/HandleFormItem.vue

@@ -19,6 +19,8 @@
             <el-select v-else-if="type === 'select'" class="flex1" :multiple="item.multiple"
                 :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')" v-model="inputValue"
                 :disabled="getDisabled()" :placeholder="getPlaceholder()" @remove-tag="onRemoveTag"
+                :remote = "true"
+                :remote-method="remoteMethod"
                 @visible-change="onSelectBlur" @change="onInputChange" filterable>
                 <el-option v-for="op in item.options" :key="op.value" :label="op.label" :value="op.value">
                 </el-option>
@@ -401,6 +403,10 @@ export default {
         EventBus.$off("onMixReagentSubmit", this.onMixReagentSubmit)
     },
     methods: {
+        remoteMethod(query) {
+            console.log(query,"qqq")
+            this.$emit('remoteMethod', query);
+        },
         handleFalse() {
             return false;
         },

src/lang/en/template/dl.js

@@ -78,7 +78,7 @@ export default {
     pykssj: 'Cultivation Start Time',
     pyjssj: 'Cultivation End Time',
     jsButton: 'End',
-    yqsyxxEmpty: 'Please add instrument usage information first'
+    yqsyxxEmpty: 'Instrument usage information has not been filled in, please fill in before submitting'
   },
   dl008: {
     ...common,
@@ -89,8 +89,8 @@ export default {
     jzbh2: 'Strain Number',
     jzbh3: 'Strain Number',
     jzbh4: 'Strain Number',
-    yqsyxxEmpty: 'Instrument usage information cannot be empty',
-    cxqkEmpty: 'Imaging status cannot be empty'
+    yqsyxxEmpty: 'Instrument usage information has not been filled in, please fill in before submitting',
+    cxqkEmpty: 'Imaging status has not been filled in, please fill in before submitting'
   },
   dl009: {
     ...common,
@@ -107,8 +107,8 @@ export default {
     czqkDesc: 'Precipitation codes: "P-" = "None"; "P+" = "Slight"; "P++" = "Moderate"; "P+++" = "Severe".',
     bjjtDesc: 'Background lawn codes: "N" = "Normal"; "R1" = "Weak, lawn covers 70%-90% of plate area"; "R2" = "Medium, lawn covers 40%-70% of plate area"; "R3" = "Strong, lawn covers 10%-40% of plate area"; "A" = "Absent, no lawn on plate"; "O" = "Precipitation present, affecting lawn assessment";',
     jlsDesc: 'Colony count special case: "*" indicates pinpoint colonies visible on plate;',
-    yqsyxxEmpty: 'Instrument usage information cannot be empty',
-    jgxxEmpty: 'Result information cannot be empty'
+    yqsyxxEmpty: 'Instrument usage information has not been filled in, please fill in before submitting',
+    jgxxEmpty: 'Result information has not been filled in, please fill in before submitting'
   },
   dl010: {
     ...common,
@@ -194,7 +194,9 @@ export default {
     zxg: 'Lower Left Grid (cells)',
     yxg: 'Lower Right Grid (cells)',
     cdxxTime: 'Time {index}',
-    addCdxx: 'Add'
+    addCdxx: 'Add',
+    yqsyxxEmpty: 'Instrument usage information has not been filled in, please fill in before submitting',
+    cdxxEmpty: 'Measurement information has not been filled in, please fill in before submitting'
   },
   dl014: {
     ...common,
@@ -221,7 +223,8 @@ export default {
     sjgspjrl: 'Actual Test Article Volume',
     gyhzqk: 'Post-dose Status',
     qrButton: 'Confirm',
-    wcButton: 'Complete'
+    wcButton: 'Complete',
+    yqsyxxEmpty: 'Instrument usage information has not been filled in, please fill in before submitting'
   },
   dl015: {
     ...common,

src/lang/zh/template/dl.js

@@ -81,7 +81,7 @@ export default {
     pykssj: '培养开始时间',
     pyjssj: '培养结束时间',
     jsButton: '结束',
-    yqsyxxEmpty: '请先添加仪器使用信息'
+    yqsyxxEmpty: '仪器使用信息还未填写，请填写后再提交'
   },
   dl008: {
     ...common,
@@ -92,8 +92,8 @@ export default {
     jzbh2: '菌种编号',
     jzbh3: '菌种编号',
     jzbh4: '菌种编号',
-    yqsyxxEmpty: '仪器使用信息不能为空',
-    cxqkEmpty: '成像情况不能为空'
+    yqsyxxEmpty: '仪器使用信息还未填写，请填写后再提交',
+    cxqkEmpty: '成像情况还未填写，请填写后再提交'
   },
   dl009: {
     ...common,
@@ -110,8 +110,8 @@ export default {
     czqkDesc: '沉淀量以代码填入："P-" 代表 "无沉淀"；"P+" 代表 "少量"；"P++" 代表 "中等"；"P+++" 代表 "严重"。',
     bjjtDesc: '背景菌苔以代码填入："N" 代表 "正常"；"R1" 代表 "弱，菌苔约占平皿面积 70%-90%"；"R2" 代表 "中，菌苔约占平皿面积 40%-70%"；"R3" 代表 "强，菌苔约占平皿面积 10%-40%"；"A" 代表 "消失，平皿上无菌苔"；"O" 代表 "产生沉淀，影响背景菌苔判断"；',
     jlsDesc: '菌落数特殊情况："*" 该平皿可见针尖样菌落；',
-    yqsyxxEmpty: '仪器使用信息不能为空',
-    jgxxEmpty: '结果信息不能为空'
+    yqsyxxEmpty: '仪器使用信息还未填写，请填写后再提交',
+    jgxxEmpty: '结果信息还未填写，请填写后再提交'
   },
   dl010: {
     ...common,
@@ -198,8 +198,8 @@ export default {
     yxg: '右下格(个)',
     cdxxTime: '第{index}次',
     addCdxx: '新增',
-    yqsyxxEmpty: '仪器使用信息不能为空，请添加后再提交',
-    cdxxEmpty: '测定信息不能为空，请添加后再提交'
+    yqsyxxEmpty: '仪器使用信息还未填写，请填写后再提交',
+    cdxxEmpty: '测定信息还未填写，请填写后再提交'
   },
   dl014: {
     ...common,
@@ -227,7 +227,7 @@ export default {
     gyhzqk: '给药后状态情况',
     qrButton: '确认',
     wcButton: '完成',
-    yqsyxxEmpty: '仪器使用信息不能为空，请添加后再提交'
+    yqsyxxEmpty: '仪器使用信息还未填写，请填写后再提交'
   },
   dl015: {
     ...common,

src/utils/conConverter.js

@@ -43,7 +43,8 @@ class ConcentrationConverter {
    unitCategories = {
     'mass': ['mg/mL', 'μg/mL', 'ug/mL', 'ng/mL', 'pg/mL', 'fg/mL', 'g/L', 'mg/L', 'μg/L'],
     'mole': ['mol/mL', 'mol/L', 'mmol/L', 'μmol/L', 'umol/L', 'nmol/L', 'pmol/L', 'mmol/mL', 'μmol/mL'],
-    'activity': ['U/mL', 'IU/mL', 'U/L', 'IU/L']
+    'activity': ['U/mL', 'IU/mL', 'U/L', 'IU/L'],
+    'percent': ['%']
   };
 
   /**
@@ -100,12 +101,12 @@ class ConcentrationConverter {
     let inputValue, inputUnit;
     
     if (typeof value === 'string') {
-      const match = value.toString().trim().match(/^([\d.]+(?:[eE][+-]?\d+)?)\s*([a-zA-Zμ/]+)$/);
+      const match = value.toString().trim().match(/^([\d.]+(?:[eE][+-]?\d+)?)(?:\s*([a-zA-Zμ/%]+))?$/);
       if (!match) {
         throw new Error(`输入格式错误: ${value}`);
       }
       inputValue = parseFloat(match[1]);
-      inputUnit = this.normalizeUnit(match[2]);
+      inputUnit = match[2] ? this.normalizeUnit(match[2]) : '';
     } else if (typeof value === 'number') {
       inputValue = value;
       inputUnit = ''; // 无量纲
@@ -124,12 +125,18 @@ class ConcentrationConverter {
       return inputValue; // 相同单位，直接返回
     }
     
-    // 3. 验证单位类别
+    // 3. 检查是否为%单位
+    if (inputUnit === '%' || normalizedTargetUnit === '%') {
+      // %单位是单独的系列，不进行转换
+      throw new Error(`单位类别不匹配: ${inputUnit} 不能转换为 ${targetUnit}`);
+    }
+    
+    // 4. 验证单位类别
     if (!this.isSameCategory(inputUnit, normalizedTargetUnit)) {
       throw new Error(`单位类别不匹配: ${inputUnit} 不能转换为 ${targetUnit}`);
     }
     
-    // 4. 执行转换
+    // 5. 执行转换
     return this._convertValue(inputValue, inputUnit, normalizedTargetUnit);
   }
 

src/utils/conTools.js

@@ -10,6 +10,11 @@ export const isCommonUnit = (startUnit, units) => {
     return false;
   }
 
+  // 检查是否为%单位
+  const isPercentUnit = (unit) => {
+    return unit.trim() === '%';
+  };
+
   // 提取单位分子部分（斜杠前的部分）
   const extractNumerator = (unit) => {
     const normalizedUnit = unit
@@ -48,6 +53,26 @@ export const isCommonUnit = (startUnit, units) => {
     return 'other';
   };
 
+  // 检查基准单位是否为%单位
+  if (isPercentUnit(startUnit)) {
+    // 所有单位都必须是%
+    for (const unit of units) {
+      if (!isPercentUnit(unit)) {
+        console.log(`单位 ${unit} 不是%单位，与基准单位不同`);
+        return false;
+      }
+    }
+    return true;
+  }
+
+  // 检查所有单位是否有%单位
+  for (const unit of units) {
+    if (isPercentUnit(unit)) {
+      console.log(`单位 ${unit} 是%单位，与基准单位 ${startUnit} 不同`);
+      return false;
+    }
+  }
+
   // 获取基准单位的分子类别
   const startNumerator = extractNumerator(startUnit);
   if (!startNumerator) {

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

@@ -43,6 +43,7 @@ import GSP004 from "./comps/gsp/GSP004.vue";
 import GSP005 from "./comps/gsp/GSP005.vue";
 import GSP009 from "./comps/gsp/GSP009.vue";
 import GSP010 from "./comps/gsp/GSP010.vue";
+import GSP015 from "./comps/gsp/GSP015.vue";
 
 //试验物质配制计划表/麻精药领取申请单/毒麻药品配制记录表
 import SYWZPZJHB from "./comps/gsp/SYWZPZJHB.vue";
@@ -77,7 +78,9 @@ import LBA008 from "./comps/lba/LBA008.vue";
 // ADA002-使用LBA002
 // ADA003-使用LBA003
 // ADA004-使用LBA004
+// ADA005-使用LBA005
 // ADA006-使用LBA006
+// ADA007-使用LBA007
 
 //样品
 // YP001-使用SP001
@@ -133,7 +136,7 @@ export default {
     //试验物质配制计划表/麻精药领取申请单/毒麻药品配制记录表
     MJYLQSQD, SYWZPZJHB, DMYPPZJLB,
     //供试品
-    GSP001,GSP002, GSP003,GSP004,GSP005,GSP009, GSP010,
+    GSP001,GSP002, GSP003,GSP004,GSP005,GSP009, GSP010,GSP015,
     //色谱
     SP001, SP003, SP00456,SP007, SP008, SP009,SP0019,SP0020,SP0021,
     // PCR
@@ -253,9 +256,11 @@ export default {
           'GSP004': 'GSP004',
           'GSP005': 'GSP005',
           'GSP006': 'GSP002',
+          'GSP007': 'SP00456',
           'GSP008': 'GSP002',
           'GSP009': 'GSP009',
           'GSP010': 'GSP010',
+          'GSP015': 'GSP015',
           'GSP011': 'GSP009',
           'GSP012': 'GSP002',
           'GSP013': 'GSP002',
@@ -266,9 +271,9 @@ export default {
           'DMYPPZJLB': 'DMYPPZJLB',
           //PCR
           'PCR001': 'SP001',
-          'PCR002': 'PCR002',
-          'PCR003': 'PCR003',
-          'PCR004': 'PCR004',
+          'PCR002': 'SP00456',
+          'PCR003': 'SP00456',
+          'PCR004': 'SP00456',
           'PCR005': 'PCR005',
           'PCR006': 'SP0020',
           'PCR007': 'PCR007',
@@ -292,7 +297,9 @@ export default {
           'ADA002': 'LBA002',
           'ADA003': 'LBA003',
           'ADA004': 'LBA004',
+          'ADA005': 'SP00456',
           'ADA006': 'LBA006',
+          'ADA007': 'SP00456',
           //样品
           'YP001': 'SP001',
           'YP002': 'YP002',

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

@@ -142,7 +142,8 @@ export default {
               type: 'select',
               options: this.getDictOptions('business_sydd'),
               fillType: 'actFill',
-              otherCode: 'syddOther'
+              otherCode: 'syddOther',
+              otherMaxlength: 50
             }
           }
         },
@@ -223,8 +224,9 @@ export default {
               label: 'template.dl.dl007.pyjssj',
               type: 'input',
               fillType: 'actFill',
-              maxlength: 200,
               subType: 'button',
+              disabled: true,
+              subDisabled: this.fillType !== 'actFill',
               subKey: 'pyjssjButton',
               buttonName: 'template.dl.dl007.jsButton'
             }
@@ -263,13 +265,15 @@ export default {
     },
     // 只做校验
     async validFields() {
-      // 1. 校验仪器使用信息表格是否为空
-      const yqsyTableRef = this.$refs[refConf.yqsy]
-      const yqsyTableData = yqsyTableRef?.getDataSource() || []
+      // 1. 校验仪器使用信息表格是否为空（只在 actFill 时校验）
+      if (this.fillType === 'actFill') {
+        const yqsyTableRef = this.$refs[refConf.yqsy]
+        const yqsyTableData = yqsyTableRef?.getDataSource() || []
 
-      if (yqsyTableData.length === 0) {
-        this.$message.warning(this.$t('template.dl.dl007.yqsyxxEmpty'))
-        return Promise.reject(this.$t('template.dl.dl007.yqsyxxEmpty'))
+        if (yqsyTableData.length === 0) {
+          this.$message.warning(this.$t('template.dl.dl007.yqsyxxEmpty'))
+          return Promise.reject(this.$t('template.dl.dl007.yqsyxxEmpty'))
+        }
       }
 
       // 2. 执行其他表单字段校验

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

@@ -47,18 +47,20 @@
               @onRegentSubmit="onRegentSubmit"
             >
             </BaseInfoFormPackage>
-            <CustomTable
-              :columns="cxqkColumns"
-              :ref="refConf.cxqk"
-              @onRegentSubmit="(e) => onRegentSubmit(e)"
-              :showOperation="false"
-              :showAddRow="false"
-              :formData="cxqkFormData"
-              :prefixKey="`cxqkTable`"
-              :isBorder="true"
-              :showSort="false"
-            >
-            </CustomTable>
+            <template v-if="dynamicCxqkColumns.length > 0">
+              <CustomTable
+                :columns="cxqkColumns"
+                :ref="refConf.cxqk"
+                @onRegentSubmit="(e) => onRegentSubmit(e)"
+                :showOperation="false"
+                :showAddRow="false"
+                :formData="cxqkFormData"
+                :prefixKey="`cxqkTable`"
+                :isBorder="true"
+                :showSort="false"
+              >
+              </CustomTable>
+            </template>
             <BaseInfoFormPackage
               :ref="refConf.cxqkwrqk"
               :formConfig="cxqkwrqkConfig"
@@ -151,10 +153,10 @@ export default {
               // 注意：这里选项为污染时需要填写信息，与别的选择中 '其他' 选项不一样
               label: 'template.dl.dl008.wrqk',
               type: 'select',
-              span: 1,
               options: this.getDictOptions('business_dl_ameswrqk'),
               fillType: 'actFill',
               otherCode: 'cxqkwrqkOther',
+              otherMaxlength: 200,
               showOtherLabel: false
             }
           }
@@ -307,14 +309,20 @@ export default {
         const headerSelectFields = this.formData.headerSelectFields || {}
 
         // 如果没有数据或已经加载过，不处理
-        if (!stepTableFormData_1 || stepTableFormData_1.length === 0 || this.isDataLoaded) {
+        if (
+          !stepTableFormData_1 ||
+          stepTableFormData_1.length === 0 ||
+          this.isDataLoaded
+        ) {
           return
         }
 
         // 从第一行数据中提取列信息（查找 jzbh 开头的 Label 字段）
         const firstRow = stepTableFormData_1[0]
-        const labelKeys = Object.keys(firstRow).filter(key => key.match(/^jzbh\d+Label$/))
-        
+        const labelKeys = Object.keys(firstRow).filter((key) =>
+          key.match(/^jzbh\d+Label$/)
+        )
+
         if (labelKeys.length === 0) {
           return
         }
@@ -335,7 +343,7 @@ export default {
         // 从 headerSelectFields 生成表头
         labelKeys.sort().forEach((labelKey, index) => {
           const colIndex = index + 1
-          
+
           // 收集该列的所有 headerSelectFields 值（如 1_1, 1_2, 1_3）
           const headerValues = []
           let rowIndex = 1
@@ -343,10 +351,12 @@ export default {
             headerValues.push(headerSelectFields[`${colIndex}_${rowIndex}`])
             rowIndex++
           }
-          
-          // 将多个值用空格拼接，如果没有则使用默认值
-          const headerLabel = headerValues.length > 0 ? headerValues.join(' ') : `菌种${colIndex}`
-          
+
+          // 将多个值拼接为 "值1（值2值3）" 格式
+          const headerLabel = headerValues.length > 1
+            ? `${headerValues[0]}（${headerValues.slice(1).join('')}）`
+            : headerValues[0] || `菌种${colIndex}`
+
           dynamicColumns.push({
             label: headerLabel,
             prop: `jzbh${colIndex}`,
@@ -382,19 +392,19 @@ export default {
     //获取已填写的表单数据
     getFilledFormData() {
       const baseData = this.getFilledFormDataByRefs(refNames)
-      
+
       // 从成像情况表格中获取最新数据
       const cxqkTableRef = this.$refs[refConf.cxqk]
       if (cxqkTableRef) {
         const cxqkData = cxqkTableRef.getFilledFormData()
         baseData.stepTableFormData_1 = cxqkData.stepTableFormData || []
       }
-      
+
       // 确保 headerSelectFields 被包含在返回的数据中
       if (this.formData.headerSelectFields) {
         baseData.headerSelectFields = this.formData.headerSelectFields
       }
-      
+
       return baseData
     },
     //获取填写完成的表单数据
@@ -404,22 +414,25 @@ export default {
     },
     //只做校验
     async validFields() {
-      // 1. 校验仪器使用信息表格是否为空
-      const yqsyTableRef = this.$refs[refConf.yqsy]
-      const yqsyTableData = yqsyTableRef?.getDataSource() || []
-      
-      if (yqsyTableData.length === 0) {
-        this.$message.warning(this.$t('template.dl.dl008.yqsyxxEmpty'))
-        return Promise.reject(this.$t('template.dl.dl008.yqsyxxEmpty'))
-      }
+      // 只在 actFill 时校验表格是否为空
+      if (this.fillType === 'actFill') {
+        // 1. 校验仪器使用信息表格是否为空
+        const yqsyTableRef = this.$refs[refConf.yqsy]
+        const yqsyTableData = yqsyTableRef?.getDataSource() || []
 
-      // 2. 校验成像情况表格是否为空
-      const cxqkTableRef = this.$refs[refConf.cxqk]
-      const cxqkTableData = cxqkTableRef?.getDataSource() || []
-      
-      if (cxqkTableData.length === 0) {
-        this.$message.warning(this.$t('template.dl.dl008.cxqkEmpty'))
-        return Promise.reject(this.$t('template.dl.dl008.cxqkEmpty'))
+        if (yqsyTableData.length === 0) {
+          this.$message.warning(this.$t('template.dl.dl008.yqsyxxEmpty'))
+          return Promise.reject(this.$t('template.dl.dl008.yqsyxxEmpty'))
+        }
+
+        // 2. 校验成像情况表格是否为空
+        const cxqkTableRef = this.$refs[refConf.cxqk]
+        const cxqkTableData = cxqkTableRef?.getDataSource() || []
+
+        if (cxqkTableData.length === 0) {
+          this.$message.warning(this.$t('template.dl.dl008.cxqkEmpty'))
+          return Promise.reject(this.$t('template.dl.dl008.cxqkEmpty'))
+        }
       }
 
       // 3. 执行其他表单字段校验
@@ -455,7 +468,7 @@ export default {
         this.handleCxqkQxbdSelect(row)
       }
     },
-    
+
     // 处理仪器编号选择
     handleYqbhSelect(row, rowIndex) {
       const params = {
@@ -465,15 +478,15 @@ export default {
       }
       this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
     },
-    
+
     // 处理成像情况前序表单选择
     handleCxqkQxbdSelect(row) {
       // 重置加载标记，允许重新加载数据
       this.isDataLoaded = false
-      
+
       try {
         const bdnr = JSON.parse(row.bdnr)
-        
+
         const headerFields = bdnr.headerFields || {}
         const stepTableFormData_1 = bdnr.stepTableFormData_1 || []
 
@@ -491,7 +504,10 @@ export default {
         }
 
         // 2. 生成表格数据
-        const tableData = this.generateTableData(stepTableFormData_1, dynamicColumns.columnKeys)
+        const tableData = this.generateTableData(
+          stepTableFormData_1,
+          dynamicColumns.columnKeys
+        )
         if (tableData.length === 0) {
           this.clearCxqkTable()
           return
@@ -499,18 +515,17 @@ export default {
 
         // 3. 更新表格
         this.updateCxqkTable(dynamicColumns.columns, tableData, headerFields)
-        
       } catch (error) {
         console.error('解析前序表单数据失败:', error)
         this.clearCxqkTable()
       }
     },
-    
+
     // 生成动态列配置
     generateDynamicColumns(headerFields) {
       // 获取所有以 _1 结尾的 key，这些代表列的索引
       const columnKeys = Object.keys(headerFields)
-        .filter(key => key.endsWith('_1'))
+        .filter((key) => key.endsWith('_1'))
         .sort((a, b) => parseInt(a.split('_')[0]) - parseInt(b.split('_')[0]))
 
       if (columnKeys.length === 0) {
@@ -525,14 +540,16 @@ export default {
           bodyFillType: 'actFill',
           bodyDisabled: true,
           disabled: true,
-          width: 100
+          width: 180,
+					showWidth: 90,
+
         }
       ]
 
       columnKeys.forEach((key, index) => {
         const colIndex = index + 1
         const baseColIndex = key.split('_')[0] // 获取列索引，如 "1_1" -> "1"
-        
+
         // 收集该列的所有 headerFields 值（如 1_1, 1_2, 1_3）
         const headerValues = []
         let rowIndex = 1
@@ -540,58 +557,59 @@ export default {
           headerValues.push(headerFields[`${baseColIndex}_${rowIndex}`])
           rowIndex++
         }
-        
-        // 将多个值用空格拼接
-        const headerLabel = headerValues.join(' ')
-        
+
+        // 将多个值拼接为 "值1（值2值3）" 格式
+        const headerLabel = headerValues.length > 1
+          ? `${headerValues[0]}（${headerValues.slice(1).join('')}）`
+          : headerValues[0] || `菌种${colIndex}`
+
         columns.push({
           label: headerLabel,
           prop: `jzbh${colIndex}`,
           bodyType: 'checkbox',
           bodyFillType: 'actFill',
           checkboxLabel: '',
-          width: 150
         })
       })
 
       return { columns, columnKeys }
     },
-    
+
     // 生成表格数据
     generateTableData(stepTableFormData_1, columnKeys) {
       const tableData = []
-      
+
       stepTableFormData_1.forEach((item) => {
         const rowData = { jlzb: item.jlzb || '' }
-        
+
         columnKeys.forEach((_key, index) => {
           const colIndex = index + 1
           const valueKey = `jzbh${colIndex}`
-          
+
           // 从 DL006 生成的数据中获取 label 值
           // DL006 使用的字段名格式是 czrxm_${index}Label
           const labelValue = item[`czrxm_${index}Label`] || ''
-          
+
           rowData[`${valueKey}Label`] = labelValue
           rowData[valueKey] = '' // 空字符串表示初始未填写，不会触发修改确认框
         })
-        
+
         tableData.push(rowData)
       })
 
       return tableData
     },
-    
+
     // 更新成像情况表格
     updateCxqkTable(columns, tableData, headerFields) {
       // 更新动态列配置
       this.dynamicCxqkColumns = columns
-      
+
       // 保存 headerFields 到 formData，用于数据回显
       if (!this.formData.headerSelectFields) {
         this.$set(this.formData, 'headerSelectFields', {})
       }
-      Object.keys(headerFields).forEach(key => {
+      Object.keys(headerFields).forEach((key) => {
         this.$set(this.formData.headerSelectFields, key, headerFields[key])
       })
 
@@ -600,19 +618,21 @@ export default {
         if (tableRef) {
           // 更新表格数据
           tableRef.updateDataSource(tableData)
-          
+
           // 将 oldLocalDataSource 设置为当前数据的副本
           // 这样初始加载时不会触发修改确认框，但后续修改会正常触发
           this.$nextTick(() => {
-            tableRef.oldLocalDataSource = JSON.parse(JSON.stringify(tableRef.localDataSource))
+            tableRef.oldLocalDataSource = JSON.parse(
+              JSON.stringify(tableRef.localDataSource)
+            )
           })
         }
-        
+
         this.$set(this.formData, 'stepTableFormData_1', tableData)
         this.isDataLoaded = true
       })
     },
-    
+
     // 清空成像情况表格
     clearCxqkTable() {
       this.dynamicCxqkColumns = []

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

@@ -57,6 +57,7 @@
               <p>{{ $t('template.dl.dl009.jlsDesc') }}</p>
             </div>
             <CustomTable
+              v-if="dynamicJgxxColumns.length > 0"
               :columns="jgxxColumns"
               :ref="refConf.jgxx"
               :showOperation="false"
@@ -339,20 +340,24 @@ export default {
         const headerSelectFields = this.formData.headerSelectFields || {}
 
         // 如果没有数据或已经加载过，不处理
-        if (!stepTableFormData_1 || stepTableFormData_1.length === 0 || this.isDataLoaded) {
+        if (
+          !stepTableFormData_1 ||
+          stepTableFormData_1.length === 0 ||
+          this.isDataLoaded
+        ) {
           return
         }
 
         // 从第一行数据中提取列信息（查找 jzbh 开头的字段，不包括 Label）
         const firstRow = stepTableFormData_1[0]
         const jzbhKeys = Object.keys(firstRow)
-          .filter(key => key.match(/^jzbh\d+$/) && !key.endsWith('Label'))
+          .filter((key) => key.match(/^jzbh\d+$/) && !key.endsWith('Label'))
           .sort((a, b) => {
             const numA = parseInt(a.replace('jzbh', ''))
             const numB = parseInt(b.replace('jzbh', ''))
             return numA - numB
           })
-        
+
         if (jzbhKeys.length === 0) {
           return
         }
@@ -373,10 +378,11 @@ export default {
         // 从 headerSelectFields 生成表头
         jzbhKeys.forEach((_jzbhKey, index) => {
           const colIndex = index + 1
-          
+
           // 只获取第一个 headerSelectFields 值作为菌种编号（如 T-A02）
-          const jzbhLabel = headerSelectFields[`${colIndex}_1`] || `菌种${colIndex}`
-          
+          const jzbhLabel =
+            headerSelectFields[`${colIndex}_1`] || `菌种${colIndex}`
+
           // 为每个菌种编号添加四列：菌种编号、沉淀情况、背景菌苔、菌落数
           dynamicColumns.push({
             label: jzbhLabel,
@@ -418,15 +424,19 @@ export default {
 
         // 更新动态列配置
         this.dynamicJgxxColumns = dynamicColumns
-        
+
         // 保存 headerSelectFields 到 formData.headerSelectFields（确保数据一致）
         if (!this.formData.headerSelectFields) {
           this.$set(this.formData, 'headerSelectFields', {})
         }
         Object.keys(headerSelectFields).forEach((key) => {
-          this.$set(this.formData.headerSelectFields, key, headerSelectFields[key])
+          this.$set(
+            this.formData.headerSelectFields,
+            key,
+            headerSelectFields[key]
+          )
         })
-        
+
         this.isDataLoaded = true
 
         // 等待列配置更新后，更新表格数据
@@ -434,11 +444,13 @@ export default {
           const tableRef = this.$refs[refConf.jgxx]
           if (tableRef) {
             tableRef.updateDataSource(stepTableFormData_1)
-            
+
             // 将 oldLocalDataSource 设置为当前数据的副本
             // 这样初始加载时不会触发修改确认框，但后续修改会正常触发
             this.$nextTick(() => {
-              tableRef.oldLocalDataSource = JSON.parse(JSON.stringify(tableRef.localDataSource))
+              tableRef.oldLocalDataSource = JSON.parse(
+                JSON.stringify(tableRef.localDataSource)
+              )
             })
           }
         })
@@ -450,7 +462,7 @@ export default {
     initializeYqsyTableFromFormData() {
       try {
         const stepTableFormData = this.formData.stepTableFormData
-        
+
         if (!stepTableFormData || stepTableFormData.length === 0) {
           return
         }
@@ -459,10 +471,12 @@ export default {
           const tableRef = this.$refs[refConf.yqsy]
           if (tableRef) {
             tableRef.updateDataSource(stepTableFormData)
-            
+
             // 将 oldLocalDataSource 设置为当前数据的副本
             this.$nextTick(() => {
-              tableRef.oldLocalDataSource = JSON.parse(JSON.stringify(tableRef.localDataSource))
+              tableRef.oldLocalDataSource = JSON.parse(
+                JSON.stringify(tableRef.localDataSource)
+              )
             })
           }
         })
@@ -473,7 +487,7 @@ export default {
     // 获取已填写的表单数据
     getFilledFormData() {
       const baseData = this.getFilledFormDataByRefs(refNames)
-      
+
       // 从仪器使用信息表格中获取最新数据
       const yqsyTableRef = this.$refs[refConf.yqsy]
       if (yqsyTableRef) {
@@ -481,7 +495,7 @@ export default {
         // 仪器使用信息保存到 stepTableFormData（与后端保存的字段名一致）
         baseData.stepTableFormData = yqsyData.stepTableFormData || []
       }
-      
+
       // 从结果信息表格中获取最新数据
       const jgxxTableRef = this.$refs[refConf.jgxx]
       if (jgxxTableRef) {
@@ -489,44 +503,47 @@ export default {
         // 结果信息保存到 stepTableFormData_1（与后端保存的字段名一致）
         baseData.stepTableFormData_1 = jgxxData.stepTableFormData || []
       }
-      
+
       // 确保 headerSelectFields 被包含在返回的数据中
       if (this.formData.headerSelectFields) {
         baseData.headerSelectFields = this.formData.headerSelectFields
       }
-      
+
       return baseData
     },
     // 获取填写完成的表单数据
     async getFormData() {
       // 先执行自定义校验（包括表格非空校验）
       const validResult = await this.validFields()
-      
+
       // 如果校验通过，返回完整的表单数据（包括 headerSelectFields）
       if (validResult) {
         return this.getFilledFormData()
       }
-      
+
       return validResult
     },
     // 只做校验
     async validFields() {
-      // 1. 校验仪器使用信息表格是否为空
-      const yqsyTableRef = this.$refs[refConf.yqsy]
-      const yqsyTableData = yqsyTableRef?.getDataSource() || []
-      
-      if (yqsyTableData.length === 0) {
-        this.$message.warning(this.$t('template.dl.dl009.yqsyxxEmpty'))
-        return Promise.reject(this.$t('template.dl.dl009.yqsyxxEmpty'))
-      }
+      // 表格是否为空只在 actFill 时校验
+      if (this.fillType === 'actFill') {
+        // 1. 校验仪器使用信息表格是否为空
+        const yqsyTableRef = this.$refs[refConf.yqsy]
+        const yqsyTableData = yqsyTableRef?.getDataSource() || []
+
+        if (yqsyTableData.length === 0) {
+          this.$message.warning(this.$t('template.dl.dl009.yqsyxxEmpty'))
+          return Promise.reject(this.$t('template.dl.dl009.yqsyxxEmpty'))
+        }
 
-      // 2. 校验结果信息表格是否为空
-      const jgxxTableRef = this.$refs[refConf.jgxx]
-      const jgxxTableData = jgxxTableRef?.getDataSource() || []
-      
-      if (jgxxTableData.length === 0) {
-        this.$message.warning(this.$t('template.dl.dl009.jgxxEmpty'))
-        return Promise.reject(this.$t('template.dl.dl009.jgxxEmpty'))
+        // 2. 校验结果信息表格是否为空
+        const jgxxTableRef = this.$refs[refConf.jgxx]
+        const jgxxTableData = jgxxTableRef?.getDataSource() || []
+
+        if (jgxxTableData.length === 0) {
+          this.$message.warning(this.$t('template.dl.dl009.jgxxEmpty'))
+          return Promise.reject(this.$t('template.dl.dl009.jgxxEmpty'))
+        }
       }
 
       // 3. 执行其他表单字段校验
@@ -563,37 +580,22 @@ export default {
 
       // 处理结果信息前序表单选择
       if (key === 'jgxxQxbd') {
-        // 在处理前序表单之前，先保存当前的仪器使用信息和表头数据
-        const currentYqsyData = this.formData.stepTableFormData ? JSON.parse(JSON.stringify(this.formData.stepTableFormData)) : []
-        const currentHeaderFields = this.formData.headerSelectFields ? JSON.parse(JSON.stringify(this.formData.headerSelectFields)) : {}
-        
-        // 使用 $nextTick 确保在下一个 tick 中恢复数据
-        this.$nextTick(() => {
-          this.handleJgxxQxbdSelect(row)
-          
-          // 再次使用 $nextTick 确保在 handleJgxxQxbdSelect 完成后恢复数据
-          this.$nextTick(() => {
-            if (currentYqsyData.length > 0 && (!this.formData.stepTableFormData || this.formData.stepTableFormData.length === 0)) {
-              this.$set(this.formData, 'stepTableFormData', currentYqsyData)
-              
-              // 同时更新表格显示
-              const yqsyTableRef = this.$refs[refConf.yqsy]
-              if (yqsyTableRef) {
-                yqsyTableRef.updateDataSource(currentYqsyData)
-              }
-            }
-            
-            // 如果当前表头数据为空，恢复之前的表头数据
-            if (Object.keys(currentHeaderFields).length > 0 && (!this.formData.headerSelectFields || Object.keys(this.formData.headerSelectFields).length === 0)) {
-              this.$set(this.formData, 'headerSelectFields', currentHeaderFields)
-            }
-          })
-        })
+        // 直接从表格ref获取当前仪器使用信息数据（而非formData）
+        const yqsyTableRef = this.$refs[refConf.yqsy]
+        const savedYqsyData = JSON.parse(JSON.stringify(yqsyTableRef?.getDataSource() || []))
+        console.log('[DL009] 选择前序表单前，保存仪器数据:', savedYqsyData.length, '条')
+
+        // 先将仪器数据写入formData，防止watch触发时读到空数组
+        if (savedYqsyData.length > 0) {
+          this.$set(this.formData, 'stepTableFormData', savedYqsyData)
+        }
+
+        this.handleJgxxQxbdSelect(row, savedYqsyData)
       }
     },
 
     // 处理结果信息前序表单选择
-    handleJgxxQxbdSelect(row) {
+    handleJgxxQxbdSelect(row, savedYqsyData) {
       // 重置加载标记，允许重新加载数据
       this.isDataLoaded = false
 
@@ -632,7 +634,7 @@ export default {
         }
 
         // 3. 更新表格
-        this.updateJgxxTable(dynamicColumns.columns, tableData, headerFields)
+        this.updateJgxxTable(dynamicColumns.columns, tableData, headerFields, savedYqsyData)
       } catch (error) {
         console.error('解析前序表单数据失败:', error)
         this.clearJgxxTable()
@@ -743,7 +745,7 @@ export default {
     },
 
     // 更新结果信息表格
-    updateJgxxTable(columns, tableData, headerFields) {
+    updateJgxxTable(columns, tableData, headerFields, savedYqsyData) {
       // 更新动态列配置
       this.dynamicJgxxColumns = columns
 
@@ -772,6 +774,22 @@ export default {
 
         this.$set(this.formData, 'stepTableFormData_1', tableData)
         this.isDataLoaded = true
+
+        // 恢复仪器使用信息数据
+        const yqsyTableRef = this.$refs[refConf.yqsy]
+        const currentData = yqsyTableRef?.getDataSource() || []
+        console.log('[DL009] updateJgxxTable $nextTick - 当前仪器数据:', currentData.length, '条')
+        console.log('[DL009] updateJgxxTable $nextTick - 保存的仪器数据:', savedYqsyData?.length, '条')
+        
+        if (savedYqsyData && savedYqsyData.length > 0 && currentData.length === 0) {
+          console.log('[DL009] 恢复仪器数据')
+          // 先写入formData再更新表格
+          this.$set(this.formData, 'stepTableFormData', savedYqsyData)
+          this.$nextTick(() => {
+            yqsyTableRef?.updateDataSource(savedYqsyData)
+            console.log('[DL009] 恢复后仪器数据:', yqsyTableRef?.getDataSource()?.length, '条')
+          })
+        }
       })
     },
 
@@ -789,9 +807,9 @@ export default {
       if (this.dynamicJgxxColumns.length === 0) {
         return
       }
-      
+
       // 遍历动态列配置，更新 select 类型的 bodyOptions
-      this.dynamicJgxxColumns.forEach(col => {
+      this.dynamicJgxxColumns.forEach((col) => {
         if (col.bodyType === 'select') {
           if (col.prop.startsWith('czqk')) {
             col.bodyOptions = this.getDictOptions('business_dl_amescdqk')

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

@@ -67,8 +67,8 @@
                 ></TableOpertaionDelete>
               </template>
             </CustomTable>
-            <Step :ref="refConf.sjxxStep" :formData="formData.stepData" />
           </div>
+            <Step :ref="refConf.sjxxStep" :formData="formData.stepData" />
 
           <BaseInfoFormPackage
             fieldItemLabel="template.dl.dl007.bz"
@@ -173,6 +173,7 @@ export default {
               type: 'select',
               options: this.getDictOptions('business_dwzs'),
               fillType: 'preFill',
+              otherMaxlength: 50,
               otherCode: 'dwzsOther'
             }
           }
@@ -210,6 +211,7 @@ export default {
               type: 'select',
               options: this.getDictOptions('business_cjbw'),
               fillType: 'preFill',
+              otherMaxlength: 50,
               otherCode: 'cjbwOther'
             }
           }
@@ -240,7 +242,8 @@ export default {
           prop: 'dwbh',
           bodyType: 'input',
           bodyMaxlength: 50,
-          bodyFillType: 'preFill'
+          bodyFillType: 'preFill',
+          width: 180
         },
         {
           label: 'template.dl.dl010.yslhnzsjyjrl',
@@ -251,7 +254,8 @@ export default {
           bodyType: 'inputNumber',
           bodyMaxlength: 10,
           fillType: 'preFill',
-          bodyFillType: 'preFill'
+          bodyFillType: 'preFill',
+          width: 260
         },
         {
           label: 'template.dl.dl010.sjlhnzsjyjrl',
@@ -263,7 +267,8 @@ export default {
           copyFrom: 'yslhnzsjyjrl',
           bodyType: 'inputNumber',
           bodyFillType: 'actFill',
-          fillType: 'preFill'
+          fillType: 'preFill',
+          width: 260
         },
         {
           label: 'template.dl.dl010.sjgs',
@@ -271,6 +276,7 @@ export default {
           bodyType: 'checkbox',
           checkboxLabel: '',
           bodyFillType: 'actFill',
+          span: 3,
           headerColumns: [
             { type: 'span', label: 'template.dl.dl010.sj' },
             {
@@ -280,14 +286,16 @@ export default {
               key: 'gs'
             },
             { type: 'span', label: 'template.dl.dl010.gusui' }
-          ]
+          ],
+          width: 260
         },
         {
           label: 'template.dl.dl010.lx',
           prop: 'lx',
           bodyType: 'checkbox',
           checkboxLabel: '',
-          bodyFillType: 'actFill'
+          bodyFillType: 'actFill',
+          width: 100
         },
         {
           label: 'template.dl.dl010.ysjrxq',
@@ -298,7 +306,8 @@ export default {
           fillType: 'preFill',
           headerSelectKey: 'ysjrxqUnit',
           headerSelectTo: 'sjjrxqUnit',
-          headerOptions: this.getDictOptions('business_tjdw')
+          headerOptions: this.getDictOptions('business_tjdw'),
+          width: 180
         },
         {
           label: 'template.dl.dl010.sjjrxq',
@@ -310,7 +319,8 @@ export default {
           compareTo: 'ysjrxq',
           copyFrom: 'ysjrxq',
           headerSelectKey: 'sjjrxqUnit',
-          headerOptions: this.getDictOptions('business_tjdw')
+          headerOptions: this.getDictOptions('business_tjdw'),
+          width: 180
         }
       ]
     }
@@ -479,16 +489,16 @@ export default {
       // 使用的试剂、仪器
       this.resourceTmp = sjxxStepResource.sjResource || []
       this.yqResourceTmp = sjxxStepResource.yqResource || []
-      
+
       // 获取采集信息表格数据
       const sjxxTableData = this.$refs.sjxxTableRef?.getFilledFormData()
       const sjxxList = sjxxTableData?.stepTableFormData || []
       const headerSelectFields = sjxxTableData?.headerSelectFields || {}
-      
+
       // 提取实际0.9%氯化钠注射液加入量和实际加入血清的数据
       // 转换为标准资源格式
       const sjxxResource = []
-      
+
       sjxxList.forEach((item) => {
         // 实际0.9%氯化钠注射液加入量
         if (item.sjlhnzsjyjrl) {
@@ -510,7 +520,7 @@ export default {
             yxzqdw: null // 有效期单位
           })
         }
-        
+
         // 实际加入血清
         if (item.sjjrxq) {
           sjxxResource.push({
@@ -532,7 +542,7 @@ export default {
           })
         }
       })
-      
+
       // 将采集信息数据添加到资源列表中
       return [...this.resourceTmp, ...sjxxResource]
     },

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

@@ -198,6 +198,8 @@ export default {
               fillType: 'actFill',
               subType: 'button',
               subKey: 'pykssjButton',
+              subDisabled: this.fillType !== 'actFill',
+              disabled: true,
               buttonName: 'template.dl.dl011.pykssjButton'
             }
           }
@@ -214,7 +216,8 @@ export default {
               type: 'select',
               options: this.getDictOptions('business_dl_xbmc'),
               fillType: 'preFill',
-              otherCode: 'xbmcOther'
+              otherCode: 'xbmcOther',
+              otherMaxlength: 50
             },
             xbdcbh: {
               label: 'template.dl.dl011.xbdcbh',
@@ -248,8 +251,7 @@ export default {
               copyFrom: 'fshxbyjtj',
               compareTo: 'fshxbyjtj',
               subOptions: this.getDictOptions('business_nddw'),
-              maxlength: 10,
-              copyFrom: 'fshxbyjtj' //复制哪个字段
+              maxlength: 10
             }
           }
         }
@@ -257,12 +259,35 @@ export default {
     }
   },
   mounted() {
+    // 获取数据检查 pytjText 是否已有值
+    const pyxxData = this.getFilledFormDataByRefs([refConf.pyxx])
+    const { pytjText } = pyxxData || {}
+
+    // 只有在 pytjText 无值时才设置，避免重复设置
+    if (!pytjText) {
+      this.$nextTick(() => {
+        this.$refs[refConf.pyxx]?.updateFormData(
+          'pytjText',
+          '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
+          { isUpdateRecord: false, signData: null }
+        )
+      })
+    }
+
+    // 只在实际填报模式下生成编号
+    if (this.fillType !== 'actFill') return
+
+    const data = this.getFilledFormDataByRefs([refConf.xbxx])
+    const { fshxbbhCodeSn } = data || {}
+
+    // 如果已经有 fshxbbhCodeSn 值，说明是回显数据，不需要重新生成
+    if (fshxbbhCodeSn) return
+
     this.$nextTick(() => {
-      this.$refs[refConf.pyxx]?.updateFormData(
-        'pytjText',
-        '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
-        { isUpdateRecord: false, signData: null }
-      )
+      const updateData = {}
+      const formattedDate = moment().format('YYMMDD')
+      updateData['fshxbbhCodeSn'] = formattedDate + '-' + '0001'
+      this.$refs[refConf.xbxx].batchUpdateFormData(updateData)
     })
   },
   data() {
@@ -301,28 +326,30 @@ export default {
       // 使用的试剂、仪器（来自复苏步骤）
       this.resourceTmp = stepResource.sjResource || []
       this.yqResourceTmp = [...(stepResource.yqResource || [])]
-      
+
       // 获取细胞信息
       const xbxxData = this.$refs.xbxxRef?.getFilledFormData() || {}
-      
+
       // 如果选择了细胞冻存编号，添加到细胞细菌信息中
       if (xbxxData.xbdcbh) {
         const xbInfo = xbxxData.selectInfo_xbdcbh || {}
         // 细胞信息格式：不包含 type 字段（参考 StepFormPackage 中 xb 类型的处理）
-        this.xbxjTmp = [{
-          value: xbxxData.xbdcbh,
-          bh: xbInfo.bh || xbxxData.xbdcbh,
-          mc: xbInfo.mc || '',
-          xh: xbInfo.xh || '',
-          jzrq: xbInfo.jzrq || ''
-        }]
+        this.xbxjTmp = [
+          {
+            value: xbxxData.xbdcbh,
+            bh: xbInfo.bh || xbxxData.xbdcbh,
+            mc: xbInfo.mc || '',
+            xh: xbInfo.xh || '',
+            jzrq: xbInfo.jzrq || ''
+          }
+        ]
       } else {
         this.xbxjTmp = []
       }
-      
+
       // 获取培养信息
       const pyxxData = this.$refs.pyxxRef?.getFilledFormData() || {}
-      
+
       // 如果选择了培养箱编号，添加到仪器信息中
       if (pyxxData.pyxbh) {
         const pyxInfo = pyxxData.selectInfo_pyxbh || {}
@@ -336,7 +363,7 @@ export default {
           jzrq: pyxInfo.jzrq || ''
         })
       }
-      
+
       return this.resourceTmp
     },
     onRegentSubmit(e) {

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

@@ -194,13 +194,15 @@ export default {
               fillType: 'actFill',
               subType: 'button',
               subKey: 'pykssjButton',
+              disabled: true,
+              subDisabled: this.fillType !== 'actFill',
               buttonName: 'template.dl.dl012.pykssjButton'
             }
           }
         }
       ]
     },
-    // 细胞信息配置
+    // 细胞信息配置 - 根据 formData 中已有的 zbhxbbh_ 字段动态渲染
     xbxxConfig() {
       const config = {
         xbmc: {
@@ -221,8 +223,19 @@ export default {
           fillType: 'preFill'
         }
       }
-      for (let index = 1; index <= this.zbxbs; index++) {
-        config['zbhxbbh_' + index] = {
+      // 从 formData 中扫描已有的 zbhxbbh_ 字段来生成对应表单项
+      const zbhxbbhKeys = Object.keys(this.formData)
+        .filter(key => /^zbhxbbh_\d+$/.test(key))
+        .sort((a, b) => {
+          return parseInt(a.split('_')[1]) - parseInt(b.split('_')[1])
+        })
+      // 至少保留一个 zbhxbbh_1（preFill 时供用户输入编号）
+      if (zbhxbbhKeys.length === 0) {
+        zbhxbbhKeys.push('zbhxbbh_1')
+      }
+      zbhxbbhKeys.forEach(key => {
+        const index = key.split('_')[1]
+        config[key] = {
           label: 'template.dl.dl012.zbhxbbh',
           type: 'input',
           subType: 'span',
@@ -230,20 +243,12 @@ export default {
           subKey: 'zbhxbbhCodeSn_' + index,
           fillType: 'preFill'
         }
-      }
+      })
       return [
         {
           type: 'step',
           config: {
             ...config,
-            // zbhxbbh: {
-            //   label: 'template.dl.dl012.zbhxbbh',
-            //   type: 'input',
-            //   subType: 'span',
-            //   maxlength: 20,
-            //   subKey: 'zbhxbbhCodeSn',
-            //   fillType: 'preFill'
-            // },
             zbhxbyjtj: {
               label: 'template.dl.dl012.zbhxbyjtj',
               type: 'inputNumber',
@@ -252,7 +257,7 @@ export default {
               fillType: 'preFill',
               subOptions: this.getDictOptions('business_nddw'),
               maxlength: 10,
-              selectTo: 'zbhxbsjtjUnit' //下拉选择后，赋值到对应字段
+              selectTo: 'zbhxbsjtjUnit'
             },
             zbhxbsjtj: {
               label: 'template.dl.dl012.zbhxbsjtj',
@@ -271,39 +276,66 @@ export default {
     }
   },
   mounted() {
-    this.$nextTick(() => {
-      this.$refs[refConf.pyxx]?.updateFormData(
-        'pytjText',
-        '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
-        { isUpdateRecord: false, signData: null }
-      )
-    })
-    const data = this.getFilledFormDataByRefs([refConf.xbxx, refConf.base])
-    console.log(data)
-    const { zbxbs, zbhxbbh_1, startDate } = data || {}
-    if (!zbxbs) return
-    try {
-      this.zbxbs = Number(zbxbs)
-    } catch (error) {
-      this.zbxbs = 1
+    console.log(this.fillType, '===>fillType')
+
+    // 获取数据检查 pytjText 是否已有值
+    const pyxxData = this.getFilledFormDataByRefs([refConf.pyxx])
+    const { pytjText } = pyxxData || {}
+
+    // 只有在 pytjText 无值时才设置，避免重复设置
+    if (!pytjText) {
+      this.$nextTick(() => {
+        this.$refs[refConf.pyxx]?.updateFormData(
+          'pytjText',
+          '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
+          { isUpdateRecord: false, signData: null }
+        )
+      })
     }
-    this.$nextTick(() => {
+
+    // 仅在 actFill 时，根据 zbxbs 生成 zbhxbbh_1/2/3... 写入 formData
+    if (this.fillType === 'actFill') {
+      const data = this.getFilledFormDataByRefs([refConf.xbxx])
+      const { zbxbs, zbhxbbh_1 } = data || {}
+      if (!zbxbs) return
+
+      let count = 1
+      try {
+        count = Number(zbxbs)
+      } catch (error) {
+        count = 1
+      }
+
+      // 先写入 this.formData，让 xbxxConfig computed 感知到新字段并生成对应表单项
       const updateData = {}
-      // Convert startDate from "2026-03-07 14:02:15" to "260307" (YYMMDD)
-      const formattedDate = startDate ? moment(startDate).format('YYMMDD') : ''
-      for (let index = 1; index <= this.zbxbs; index++) {
-        updateData['zbhxbbh_' + index] = zbhxbbh_1
-        updateData['zbhxbbhCodeSn_' + index] =
-          formattedDate + '-' + `${index}`.padStart(2, '0')
+      const formattedDate = moment().format('YYMMDD')
+      for (let index = 1; index <= count; index++) {
+        const zbhxbbhKey = 'zbhxbbh_' + index
+        const codeSnKey = 'zbhxbbhCodeSn_' + index
+
+        if (!data[zbhxbbhKey]) {
+          this.$set(this.formData, zbhxbbhKey, zbhxbbh_1)
+          updateData[zbhxbbhKey] = zbhxbbh_1
+        }
+        if (!data[codeSnKey]) {
+          const codeSnVal = formattedDate + '-' + `${index}`.padStart(4, '0')
+          this.$set(this.formData, codeSnKey, codeSnVal)
+          updateData[codeSnKey] = codeSnVal
+        }
+      }
+
+      // 等配置更新后，同步到子组件的 formFields
+      if (Object.keys(updateData).length > 0) {
+        this.$nextTick(() => {
+          this.$refs[refConf.xbxx].batchUpdateFormData(updateData)
+        })
       }
-      this.$refs[refConf.xbxx].batchUpdateFormData(updateData)
-    })
+    }
   },
   data() {
     return {
       formData: {},
-      refConf,
-      zbxbs: 1
+      refConf
     }
   },
   methods: {
@@ -339,28 +371,30 @@ export default {
       // 使用的试剂、仪器（来自制备步骤）
       this.resourceTmp = stepResource.sjResource || []
       this.yqResourceTmp = [...(stepResource.yqResource || [])]
-      
+
       // 获取细胞信息
       const xbxxData = this.$refs.xbxxRef?.getFilledFormData() || {}
-      
+
       // 如果选择了细胞制备前编号，添加到细胞细菌信息中
       if (xbxxData.xbzbqbh) {
         const xbInfo = xbxxData.selectInfo_xbzbqbh || {}
         // 细胞信息格式：不包含 type 字段
-        this.xbxjTmp = [{
-          value: xbxxData.xbzbqbh,
-          bh: xbInfo.bh || xbxxData.xbzbqbh,
-          mc: xbInfo.mc || '',
-          xh: xbInfo.xh || '',
-          jzrq: xbInfo.jzrq || ''
-        }]
+        this.xbxjTmp = [
+          {
+            value: xbxxData.xbzbqbh,
+            bh: xbInfo.bh || xbxxData.xbzbqbh,
+            mc: xbInfo.mc || '',
+            xh: xbInfo.xh || '',
+            jzrq: xbInfo.jzrq || ''
+          }
+        ]
       } else {
         this.xbxjTmp = []
       }
-      
+
       // 获取培养信息
       const pyxxData = this.$refs.pyxxRef?.getFilledFormData() || {}
-      
+
       // 如果选择了培养箱编号，添加到仪器信息中
       if (pyxxData.pyxbh) {
         const pyxInfo = pyxxData.selectInfo_pyxbh || {}
@@ -374,7 +408,7 @@ export default {
           jzrq: pyxInfo.jzrq || ''
         })
       }
-      
+
       return this.resourceTmp
     },
     onRegentSubmit(e) {

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

@@ -254,7 +254,9 @@ export default {
               type: 'select',
               options: this.getDictOptions('business_dl_xbmc'),
               fillType: 'actFill',
-              otherCode: 'xbmcOther'
+              otherCode: 'xbmcOther',
+              otherMaxlength: 50
+
             },
             xbbh: {
               label: 'template.dl.dl013.xbbh',
@@ -450,13 +452,28 @@ export default {
     },
     // 新增测定信息
     handleCdxxAdd() {
+      // 记录新增前的仪器使用信息
+      const yqsyTableRef = this.$refs[refConf.yqsy]
+      const beforeData = yqsyTableRef?.getDataSource() || []
+      
+      // 保存当前的仪器使用信息数据
+      const currentYqsyData = yqsyTableRef?.getFilledFormData() || {}
+      
+      // 确保formData中保留了仪器使用信息的数据
+      if (currentYqsyData.stepTableFormData && currentYqsyData.stepTableFormData.length > 0) {
+        // 使用$set确保响应式更新，但保留原有数据
+        this.$set(this.formData, 'yqsyTablestepTableFormData', currentYqsyData.stepTableFormData)
+        this.$set(this.formData, 'yqsyTableheaderSelectFields', currentYqsyData.headerSelectFields || {})
+        this.$set(this.formData, 'yqsyTableheaderFields', currentYqsyData.headerFields || {})
+      }
+      
       // 初始化测定信息配置列表
       if (!this.formData.cdxxConfigs) {
         this.$set(this.formData, 'cdxxConfigs', [])
       }
       
-      // 添加新的测定信息配置
-      this.formData.cdxxConfigs.push({
+      // 创建新的测定信息配置对象
+      const newCdxxItem = {
         id: getuuid(),
         xsbs: null,
         xbmd: null,
@@ -464,7 +481,10 @@ export default {
         ysg: null,
         zxg: null,
         yxg: null
-      })
+      }
+      
+      // 添加新的测定信息配置
+      this.formData.cdxxConfigs.push(newCdxxItem)
       
       // 更新测定次数
       this.$refs[refConf.cdxx]?.updateFormData(
@@ -476,13 +496,24 @@ export default {
         }
       )
       
+      // 检查新增后仪器使用信息是否还在
       this.$nextTick(() => {
-        // 通知后端保存数据
-        EventBus.$emit('onModifyRecord', {
-          type: 'fieldChanged',
-          newRecord: null,
-          resourceList: null
-        })
+        const afterData = yqsyTableRef?.getDataSource() || []
+        
+        // 如果数据被清空了，手动恢复
+        if (afterData.length === 0 && beforeData.length > 0) {
+          yqsyTableRef?.updateDataSource(beforeData)
+        }
+        
+        // 触发事件通知父组件数据已更新
+        setTimeout(() => {
+          EventBus.$emit('onModifyRecord', {
+            type: 'fieldChanged',
+            newRecord: null,
+            resourceList: null,
+            source: 'cdxxAdd'
+          })
+        }, 100)
       })
     },
     // 删除表格行
@@ -522,13 +553,15 @@ export default {
     },
     // 获取填写完成的表单数据
     async getFormData() {
-      // 1. 校验仪器使用信息表格是否为空
-      const yqsyTableRef = this.$refs[refConf.yqsy]
-      const yqsyTableData = yqsyTableRef?.getDataSource() || []
-      
-      if (yqsyTableData.length === 0) {
-        this.$message.warning(this.$t('template.dl.dl013.yqsyxxEmpty'))
-        return Promise.reject(this.$t('template.dl.dl013.yqsyxxEmpty'))
+      // 1. 校验仪器使用信息表格是否为空（只在 actFill 时校验）
+      if (this.fillType === 'actFill') {
+        const yqsyTableRef = this.$refs[refConf.yqsy]
+        const yqsyTableData = yqsyTableRef?.getDataSource() || []
+        
+        if (yqsyTableData.length === 0) {
+          this.$message.warning(this.$t('template.dl.dl013.yqsyxxEmpty'))
+          return Promise.reject(this.$t('template.dl.dl013.yqsyxxEmpty'))
+        }
       }
 
       // 2. 校验测定信息是否为空

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

@@ -298,14 +298,16 @@ export default {
               type: 'select',
               options: this.getDictOptions('business_dl_qsxjbltj'),
               fillType: 'preFill',
-              otherCode: 'bltjOther'
+              otherCode: 'bltjOther',
+              otherMaxlength: 50
             },
             xbmc: {
               label: 'template.dl.dl014.xbmc',
               type: 'select',
               options: this.getDictOptions('business_dl_xbmc'),
               fillType: 'preFill',
-              otherCode: 'xbmcOther'
+              otherCode: 'xbmcOther',
+              otherMaxlength: 50
             }
           }
         }
@@ -317,7 +319,8 @@ export default {
         pxpb: {
           label: 'template.dl.dl014.pxpb',
           type: 'inputNumber',
-          fillType: 'preFill'
+          fillType: 'preFill',
+          maxlength: 2
         },
         sftjs9: {
           label: 'template.dl.dl014.sftjs9',
@@ -343,7 +346,8 @@ export default {
       const jlzzsConfig = {
         label: 'template.dl.dl014.jlzzs',
         type: 'inputNumber',
-        fillType: 'preFill'
+        fillType: 'preFill',
+        maxlength: 2
       }
 
       // 只在 preFill 模式下显示确认按钮
@@ -369,7 +373,8 @@ export default {
           label: 'template.dl.dl014.jlzzmc',
           prop: 'jlzzmc',
           bodyType: 'input',
-          bodyFillType: 'preFill'
+          bodyFillType: 'preFill',
+          bodyMaxlength: 20
         }
       ]
     },
@@ -399,11 +404,14 @@ export default {
           label: 'template.dl.dl014.jlzb',
           prop: 'jlzb',
           bodyType: 'input',
-          bodyFillType: 'preFill'
+          width: 180,
+          bodyFillType: 'preFill',
+          bodyMaxlength: 10
         },
         {
           label: 'template.dl.dl014.xybh',
           prop: 'xybh',
+          width: 180,
           bodyType: 'sj',
           bodyFillType: 'actFill'
         },
@@ -411,6 +419,7 @@ export default {
           label: 'template.dl.dl014.gysqgc',
           prop: 'gysqgc',
           bodyType: 'select',
+          width: 180,
           bodyFillType: 'actFill',
           bodyOptions: [
             { label: '良好', value: '良好' },
@@ -426,6 +435,7 @@ export default {
           bodyMaxlength: 10,
           headerSelectKey: 'ysplyjrlUnit',
           headerOptions: this.getDictOptions('business_tjdw'),
+          width: 180,
           fillType: 'preFill'
         },
         {
@@ -438,6 +448,7 @@ export default {
           headerOptions: this.getDictOptions('business_tjdw'),
           copyFrom: 'ysplyjrl',
           compareTo: 'ysplyjrl',
+          width: 180,
           fillType: 'preFill'
         }
       ]
@@ -453,6 +464,7 @@ export default {
             bodyMaxlength: 10,
             headerSelectKey: 'yss9hhyjrlUnit',
             headerOptions: this.getDictOptions('business_tjdw'),
+            width: 180,
             fillType: 'preFill'
           },
           {
@@ -465,6 +477,7 @@ export default {
             headerOptions: this.getDictOptions('business_tjdw'),
             copyFrom: 'yss9hhyjrl',
             compareTo: 'yss9hhyjrl',
+            width: 180,
             fillType: 'preFill'
           }
         )
@@ -478,8 +491,9 @@ export default {
           bodyType: 'input',
           bodyFillType: 'preFill',
           bodyMaxlength: 20,
-          bodySubType: 'gsp',
-          bodySubKey: 'gspbh',
+          bodySubType: 'gyzj',
+          bodySubKey: 'gyzjbh',
+          width: 240,
           bodySubFillType: 'actFill'
         },
         {
@@ -490,6 +504,7 @@ export default {
           bodyMaxlength: 10,
           headerSelectKey: 'ysgspjrlUnit',
           headerOptions: this.getDictOptions('business_tjdw'),
+          width: 180,
           fillType: 'preFill'
         },
         {
@@ -501,6 +516,7 @@ export default {
           headerSelectKey: 'ysgspjrlUnit',
           headerOptions: this.getDictOptions('business_tjdw'),
           copyFrom: 'ysgspjrl',
+          width: 180,
           compareTo: 'ysgspjrl',
           fillType: 'preFill'
         },
@@ -509,6 +525,7 @@ export default {
           prop: 'gyhzqk',
           bodyType: 'select',
           bodyFillType: 'actFill',
+          width: 180,
           bodyOptions: [
             { label: '严重', value: '严重' },
             { label: '中等', value: '中等' },
@@ -580,13 +597,15 @@ export default {
     },
     // 获取填写完成的表单数据
     async getFormData() {
-      // 1. 校验仪器使用信息表格是否为空
-      const yqsyTableRef = this.$refs[refConf.yqsy]
-      const yqsyTableData = yqsyTableRef?.getDataSource() || []
-      
-      if (yqsyTableData.length === 0) {
-        this.$message.warning(this.$t('template.dl.dl014.yqsyxxEmpty'))
-        return Promise.reject(this.$t('template.dl.dl014.yqsyxxEmpty'))
+      // 1. 校验仪器使用信息表格是否为空（只在 actFill 时校验）
+      if (this.fillType === 'actFill') {
+        const yqsyTableRef = this.$refs[refConf.yqsy]
+        const yqsyTableData = yqsyTableRef?.getDataSource() || []
+
+        if (yqsyTableData.length === 0) {
+          this.$message.warning(this.$t('template.dl.dl014.yqsyxxEmpty'))
+          return Promise.reject(this.$t('template.dl.dl014.yqsyxxEmpty'))
+        }
       }
 
       // 2. 执行其他表单字段校验
@@ -890,6 +909,11 @@ export default {
         return
       }
 
+      // 保存当前的剂量组名称表格数据，防止被清空
+      if (jlzmcList.length > 0) {
+        this.$set(this.formData, 'jlzmcTableData', jlzmcList)
+      }
+
       // 生成剂量组列表数据
       const newRows = []
 
@@ -918,6 +942,17 @@ export default {
       // 直接修改 formData，CustomTable 会自动响应
       this.$set(this.formData, 'jlzTableData', newRows)
 
+      // 检查剂量组名称表格数据是否被清空
+      this.$nextTick(() => {
+        const jlzmcTableRef = this.$refs[refConf.jlzmcTable]
+        const currentJlzmcData = jlzmcTableRef?.getDataSource() || []
+
+        // 如果数据被清空了，手动恢复
+        if (currentJlzmcData.length === 0 && jlzmcList.length > 0) {
+          jlzmcTableRef?.updateDataSource(jlzmcList)
+        }
+      })
+
       this.$message.success(`已生成 ${newRows.length} 行剂量组数据`)
     },
     // 保存

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

@@ -16,8 +16,16 @@
             :formData="formData"
           />
 
-          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
-          <TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+          <TableList
+            label="template.common.reagentInfo"
+            :columns="sysjColumns"
+            :dataSource="resourceSj"
+          />
+          <TableList
+            label="template.common.instrumentInfo"
+            :columns="yqColumns"
+            :dataSource="yqResource"
+          />
 
           <LineLabel label="template.dl.dl015.xbxx" />
           <BaseInfoFormPackage
@@ -185,7 +193,7 @@ export default {
             qxbd: {
               label: 'template.dl.dl015.qxbd',
               type: 'qxbd',
-              qxbdType:'DL014',
+              qxbdType: 'DL014',
               fillType: 'actFill',
               filledCodes: ['bdmc', 'bdbh']
             },
@@ -194,7 +202,8 @@ export default {
               type: 'select',
               options: this.getDictOptions('business_dl_qsxjbltj'),
               fillType: 'preFill',
-              otherCode: 'bltjOther'
+              otherCode: 'bltjOther',
+              otherMaxlength: 50
             }
           }
         }
@@ -209,6 +218,7 @@ export default {
           bodyType: 'input',
           bodyFillType: 'actFill',
           bodyDisabled: true,
+          width: 180,
           disabled: true
         },
         {
@@ -217,12 +227,14 @@ export default {
           bodyType: 'input',
           bodyFillType: 'actFill',
           bodyDisabled: true,
+          width: 180,
           disabled: true
         },
         {
           label: 'template.dl.dl015.hyqszqk',
           prop: 'hyqszqk',
           bodyType: 'select',
+          width: 180,
           bodyFillType: 'actFill',
           bodyOptions: [
             { label: '良好', value: '良好' },
@@ -234,6 +246,7 @@ export default {
           label: 'template.dl.dl015.hyqcdjqk',
           prop: 'hyqcdjqk',
           bodyType: 'select',
+          width: 180,
           bodyFillType: 'actFill',
           bodyOptions: [
             { label: '严重', value: '严重' },
@@ -246,6 +259,7 @@ export default {
           label: 'template.dl.dl015.hyqqtqk',
           prop: 'hyqqtqk',
           bodyType: 'select',
+          width: 180,
           bodyFillType: 'actFill',
           bodyOptions: [
             { label: '大量贴壁细胞变圆', value: '大量贴壁细胞变圆' },
@@ -255,6 +269,7 @@ export default {
         {
           label: 'template.dl.dl015.qqpyy',
           prop: 'qqpyy',
+          width: 100,
           bodyType: 'checkbox',
           bodyFillType: 'actFill',
           checkboxLabel: ''
@@ -262,12 +277,14 @@ export default {
         {
           label: 'template.dl.dl015.pbsxd',
           prop: 'pbsxd',
+          width: 100,
           bodyType: 'checkbox',
           bodyFillType: 'actFill',
           checkboxLabel: ''
         },
         {
           label: 'template.dl.dl015.pyybrl',
+          width: 180,
           prop: 'pyybrl',
           bodyType: 'inputNumber',
           bodyFillType: 'actFill',
@@ -290,14 +307,14 @@ export default {
     // 获取已填写的表单数据
     getFilledFormData() {
       const baseData = this.getFilledFormDataByRefs(refNames)
-      
+
       // 确保换液情况数据被正确保存到 stepTableFormData
       const hyqkData = this.$refs[refConf.hyqk]?.getFilledFormData()
       if (hyqkData) {
         baseData.stepTableFormData = hyqkData.stepTableFormData || []
         baseData.headerSelectFields = hyqkData.headerSelectFields || {}
       }
-      
+
       return baseData
     },
     // 获取填写完成的表单数据
@@ -312,16 +329,16 @@ export default {
       const stepResource = this.$refs.stepRef.getStepResource()
       const hyqkData = this.$refs.hyqkTableRef?.getFilledFormData()
       const hyqkList = hyqkData?.stepTableFormData || []
-      
+
       // 从操作步骤中提取试剂和仪器资源
       this.resourceTmp = stepResource.sjResource || []
       this.yqResourceTmp = stepResource.yqResource || []
-      
+
       // 从换液情况表格中提取悬液编号作为试剂资源
       // 用于去重的Set
       const xybhSet = new Set()
       const sjResourceFromHyqk = []
-      
+
       hyqkList.forEach((item) => {
         if (item.xybh && !xybhSet.has(item.xybh)) {
           xybhSet.add(item.xybh)
@@ -344,9 +361,9 @@ export default {
           })
         }
       })
-      
+
       this.resourceTmp = [...this.resourceTmp, ...sjResourceFromHyqk]
-      
+
       return this.resourceTmp
     },
     onRegentSubmit(e) {
@@ -370,7 +387,7 @@ export default {
           }
 
           // 从剂量组数据中提取剂量组别和悬液编号
-          const hyqkData = jlzTableData.map(item => ({
+          const hyqkData = jlzTableData.map((item) => ({
             jlzb: item.jlzb || '', // 剂量组别
             xybh: item.xybh || '', // 悬液编号
             hyqszqk: '', // 换液前生长情况
@@ -384,7 +401,9 @@ export default {
           // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
           this.$set(this.formData, 'stepTableFormData', hyqkData)
 
-          this.$message.success(`已从前序表单加载 ${hyqkData.length} 条剂量组数据`)
+          this.$message.success(
+            `已从前序表单加载 ${hyqkData.length} 条剂量组数据`
+          )
         } catch (error) {
           console.error('解析前序表单数据失败:', error)
           // 解析失败时也清空当前的换液情况列表数据

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

@@ -11,23 +11,20 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
-					<BaseInfoFormPackage fieldItemLabel="template.dl.dl018.xbxx" label="template.dl.dl018.xbxx"
-						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
-						@onRegentSubmit="onRegentSubmit" />
+          <BaseInfoFormPackage fieldItemLabel="template.dl.dl018.xbxx" label="template.dl.dl018.xbxx"
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData" @onRegentSubmit="onRegentSubmit"
+						/>
 
-					<LineLabel label="template.dl.dl018.xbczqk" />
-					<CustomTable @headerSelectChange="onHeaderSelectChange"
-						fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
-						@beforeSaveRecord="beforeSaveRecord" :showAddRow="false" :showOperation="false"
-						@clickButton="clickButton"
-						ref="stepTableRef" :columns="stepColumns" :formData="tableFormData">
-						<!-- <template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion @startConfig="startConfig" @configComplete="configComplete"
-									@printTag="printTag" @subPackageSubmit="subPackageSubmit" :fillType="fillType"
-									:row="row" :rowIndex="rowIndex" :columns="columns" @deleteRow="deleteRow">
-								</TableOpertaion>
-							</template> -->
-					</CustomTable>
+          <LineLabel label="template.dl.dl018.xbczqk" />
+					<CustomTable
+							fieldItemLabel="template.common.operationSteps"
+              @clickButton="handleClickButton"
+							:showAddRow="false" :showOperation="false"
+							ref="stepTableRef" :prefixKey = "`tableSecond`" :columns="stepColumns" :formData="tableFormData">
+							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+									<TableOpertaionDelete  :row="row" :rowIndex="rowIndex" :columns="columns"  @deleteRow="deleteRow(rowIndex,'secondTable')" ></TableOpertaionDelete>
+								</template>
+						</CustomTable>
 
 					<LineLabel label="template.dl.dl018.czbz" />
 					<Step ref="stepRef" :formData="formData.stepData"></Step>
@@ -52,13 +49,14 @@ import { EventBus } from "@/utils/eventBus";
 import { uniqeResource } from "@/utils/calUnitTools";
 import { debounce } from 'lodash-es'
 import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
+import moment from 'moment'
 
 export default {
 	name: "DL018",
-	dicts: [
-		'business_dl_qsxjbltj', 'business_tjdw'
-	],
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaionDelete },
+  dicts: [
+        'business_dl_qsxjbltj','business_tjdw'
+    ],
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -67,13 +65,13 @@ export default {
 		},
 	},
 	computed: {
-		// 表格数据
-		tableFormData() {
-			return {
-				stepTableFormData: [{}],
-				headerSelectFields: {}
-			}
-		},
+    // 表格数据
+    tableFormData() {
+      return {
+        stepTableFormData: this.formData.stepTableFormData || [],
+        headerSelectFields: {}
+      }
+    },
 		// 备注表单配置
 		remarkConig() {
 			return [
@@ -138,7 +136,7 @@ export default {
 				}
 			]
 		},
-		// 细胞信息
+    // 细胞信息
 		swypyjInfoFormConfig() {
 			return [
 				{
@@ -149,16 +147,16 @@ export default {
 							label: 'template.dl.dl018.qxbd',
 							type: 'qxbd',
 							fillType: 'actFill',
-							qxbdType: 'DL014',
-							filledCodes: ['bdmc', 'bdbh'],
+              qxbdType:'DL014',
+							filledCodes:['bdmc','bdbh'],
 						},
-						bltj: {
+            bltj: {
 							label: 'template.dl.dl018.bltj',
 							type: 'select',
 							fillType: 'preFill',
 							options: this.getDictOptions('business_dl_qsxjbltj'),
 							otherCode: 'bltjOther',
-							showOtherLabel: false
+              showOtherLabel:false
 						},
 					}
 				}
@@ -173,7 +171,7 @@ export default {
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
-					disabled: true,
+          disabled: true,
 					bodyDisabled: true,
 				},
 				{
@@ -182,38 +180,34 @@ export default {
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
-					disabled: true,
+          disabled: true,
 					bodyDisabled: true,
 				},
 				{
 					label: "template.dl.dl018.rsks",
 					prop: "rsks",
-					width: 180,
 					bodyType: "input",
-					bodyFillType: "actFill",
-					// disabled: true,
-					// showOtherLabel: false,
-
-					bodySubType: 'button',
-					bodySubFillType: 'actFill',
-					bodySubKey: 'rsks',
+          bodySubType: 'button',
 					bodySubButtonName: 'template.dl.dl018.ksButton',
-					showBodySub: this.fillType === "actFill",
+					bodySubKey: 'rsks1',
+					bodySubFillType: 'actFill',
+					bodyFillType: 'actFill',
+					bodyDisabled: true,
+					width: 280,
+					bodyMaxlength: 50,
 				},
 				{
 					label: "template.dl.dl018.rsjs",
 					prop: "rsjs",
-					width: 180,
 					bodyType: "input",
-					bodyFillType: "actFill",
-					// disabled: true,
-					// showOtherLabel: false,
-
-					bodySubType: 'button',
+          bodySubType: 'button',
+          bodySubButtonName: 'template.dl.dl018.jsButton',
+					bodySubKey: 'rsjs1',
 					bodySubFillType: 'actFill',
-					bodySubKey: 'rsjs',
-					bodySubButtonName: 'template.dl.dl018.jsButton',
-					showBodySub: this.fillType === "actFill",
+					bodyFillType: 'actFill',
+					bodyDisabled: true,
+					width: 280,
+					bodyMaxlength: 50,
 				},
 				{
 					label: "template.dl.dl018.zs",
@@ -261,115 +255,98 @@ export default {
 	mounted() {
 	},
 	methods: {
-		clickButton(e,rowIndex) {
-			console.log(e,rowIndex)
+    //开始介绍按钮回调
+		handleClickButton(e, rowIndex) {
+			const arrStr = typeof e === 'string' ? e.slice(0, -1) : '';
+			const updateData = { [arrStr]: moment().format('YYYY/MM/DD HH:mm') };
+			this.$refs.stepTableRef?.updateDataSourceByRowIndex(rowIndex, updateData);
+			// console.log(this.getFilledFormData())
 		},
-		onRegentSubmit(e) {
-			const { selectInfo, key, rowIndex } = e
-			const { row } = selectInfo
-			if (key === 'qxbd') {
-				try {
-					// 解析前序表单的内容
-					const bdnr = JSON.parse(row.bdnr)
-					// 获取剂量组列表数据
-					const stepTableFormData = bdnr.jlzTableData || []
+    onRegentSubmit(e) {
+      const { selectInfo, key, rowIndex } = e
+      const { row } = selectInfo
+      if (key === 'qxbd') {
+        try {
+          // 解析前序表单的内容
+          const bdnr = JSON.parse(row.bdnr)
+          // 获取剂量组列表数据
+          const stepTableFormData = bdnr.jlzTableData || []
 
-					if (stepTableFormData.length === 0) {
-						// 清空当前的换液情况列表数据
-						this.$set(this.formData, 'stepTableFormData', [])
-						this.$message.warning('前序表单中没有剂量组数据')
-						return
-					}
+          if (stepTableFormData.length === 0) {
+            // 清空当前的换液情况列表数据
+            this.$set(this.formData, 'stepTableFormData', [])
+            this.$message.warning('前序表单中没有剂量组数据')
+            return
+          }
 
-					// 从剂量组数据中提取剂量组别和悬液编号
-					const itemData = stepTableFormData.map(item => ({
-						jlzb: item.jlzb || '', // 剂量组别
-						xybh: item.xybh || '', // 悬液编号
-						rsks: '', //
-						rsjs: '', //
-						zs: '', //
-						ys: '', //
-						zy: '', //
-						yx: '', //
-						tj: '', //
-					}))
-					// 使用 $set 更新 formData，触发 CustomTable 的响应式更新
-					this.$set(this.formData, 'stepTableFormData', itemData)
+          // 从剂量组数据中提取剂量组别和悬液编号
+          const itemData = stepTableFormData.map(item => ({
+            jlzb: item.jlzb || '', // 剂量组别
+            xybh: item.xybh || '', // 悬液编号
+            rsks: '', //
+            rsjs: '', //
+            zs: '', //
+            ys: '', //
+            zy: '', //
+            yx: '', //
+            tj: '', //
+          }))
+          // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
+          this.$set(this.formData, 'stepTableFormData', itemData)
 
-					this.$message.success(`已从前序表单加载 ${itemData.length} 条剂量组数据`)
-				} catch (error) {
-					this.$set(this.formData, 'stepTableFormData', [])
-					console.error('解析前序表单数据失败:', error)
-					this.$message.error('解析前序表单数据失败')
-				}
-			}
-		},
-		//选择table header下拉框也要更新体积
-		onHeaderSelectChange(data) {
-			const { key, headerSelectFields, dataSource = [] } = data;
+          this.$message.success(`已从前序表单加载 ${itemData.length} 条剂量组数据`)
+        } catch (error) {
+          this.$set(this.formData, 'stepTableFormData', [])
+          console.error('解析前序表单数据失败:', error)
+          this.$message.error('解析前序表单数据失败')
+        }
+      }
+    },
+    //选择table header下拉框也要更新体积
+		onHeaderSelectChange(data){
+			const {key, headerSelectFields,dataSource=[]} = data;
 			const keys = [
 				'targetStartSolutionVolumeUnit',
 				'targetDiluentVolumeUnit',
 				'targetSolutionConcentrationUnit',
 				'targetSolutionVolumeUnit',
 			]
-			if (keys.includes(key)) {
-				const { targetStartSolution, subTargetStartSolution } = this.$refs.swypyjInfoRef?.getFilledFormData();
+			if(keys.includes(key)){
+				const {targetStartSolution,subTargetStartSolution} = this.$refs.swypyjInfoRef?.getFilledFormData();
 				const params = {
 					subTargetStartSolution,
 					headerSelectFields
 				}
-				this.batchUpdateTargetStartSolutionVolume(dataSource, targetStartSolution, params)
-			}
-		},
-		beforeSaveRecord(data) {
-			const formFields = this.$refs.swypyjInfoRef?.getFilledFormData();
-			this.onCommonVerifyNdException(formFields, data);
-		},
-		configComplete(val) {
-			const { rowData, headerSelectFields } = val;
-			//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
-			const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
-			let postData = {
-				mc: null,
-				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
-				nd: rowData.actSolutionConcentration,//实际目标溶液浓度
-				nddw: headerSelectFields.actSolutionConcentrationUnit,
-				studySubjectId: this.formData.studySubjectId,
-				studyFormId: this.formData.id,
-				studyId: this.formData.studyId,
-				kc: total,
-				kcdw: unit,
+				this.batchUpdateTargetStartSolutionVolume(dataSource,targetStartSolution,params)
 			}
-			this.configCompleteRequest(postData);
 		},
 
 		//获取已填写的表单数据
 		getFilledFormData() {
-			return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "stepTableRef", "stepRef", "remarkRef"])
+			return this.getFilledFormDataByRefs(["baseInfoRef",  "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"])
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
-			let content = await this.validFormFields(["baseInfoRef", "swypyjInfoRef", "stepTableRef", "stepRef", "remarkRef"]);
+			let content = await this.validFormFields(["baseInfoRef",  "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"]);
 			return content;
 		},
 		getResource() {
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
-			const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
+      const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
 
 			// 从操作步骤中提取试剂和仪器资源
 			this.resourceTmp = stepResource.sjResource || []
 			this.yqResourceTmp = stepResource.yqResource || []
 
-			const tableFromHyqk = tableList
-				.filter(item => item.xybh)
-				.map(item => ({
-					bh: item.xybh,
-					type: 'cell'
-				}))
+      const tableFromHyqk = tableList
+        .filter(item => item.xybh)
+        .map(item => ({
+          bh: item.xybh,
+          type: 'cell'
+        }))
 
-			this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
+      this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
 			return this.resourceTmp;
 		},
 		//保存
@@ -387,4 +364,5 @@ export default {
 	}
 };
 </script>
-<style rel="stylesheet/scss" lang="scss"></style>
+<style rel="stylesheet/scss" lang="scss">
+</style>

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

@@ -271,48 +271,7 @@ export default {
 			const formFields = this.$refs.swypyjInfoRef?.getFilledFormData();
 			this.onCommonVerifyNdException(formFields, data);
 		},
-		configComplete(val) {
-			const { rowData, headerSelectFields } = val;
-			//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
-			const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
-			let postData = {
-				mc: null,
-				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
-				nd: rowData.actSolutionConcentration,//实际目标溶液浓度
-				nddw: headerSelectFields.actSolutionConcentrationUnit,
-				studySubjectId: this.formData.studySubjectId,
-				studyFormId: this.formData.id,
-				studyId: this.formData.studyId,
-				kc: total,
-				kcdw: unit,
-			}
-			this.configCompleteRequest(postData);
-		},
-		//分装回调
-		subPackageSubmit(data) {
-			const { fzsj, rowData, headerSelectFields } = data;
-			const { fzList = [], dw = "", mybh } = fzsj;
-			if (fzList && fzList.length > 0) {
-				const list = fzList.map((item) => {
-					return {
-						bh: mybh + item.preCode + item.subCode,
-						kc: item.num,
-						kcdw: dw,
-					}
-				})
-				let postData = {
-					studyId: this.formData.studyId,
-					studyFormId: this.formData.id,
-					bh: mybh,
-					nd: rowData.actSolutionConcentration || 0,
-					nddw: headerSelectFields.actSolutionConcentrationUnit,
-					studySubjectId: this.formData.studySubjectId,
-					studyFormId: this.formData.id,
-					list: list
-				}
-				this.subPackageRequest(postData);
-			}
-		},
+
 		//获取已填写的表单数据
 		getFilledFormData() {
 			return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "remarkRef", "tableRef"])

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

@@ -22,7 +22,7 @@
 					<LineLabel label="template.dl.dl023.czjl" />
 					<!-- 操作记录 -->
 					<BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.common.operationSteps"
-						@select="onSelect" :formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" />
+						@select="onSelect" @clickButton="handleClickButton" :formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
 						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
@@ -43,6 +43,7 @@ import { EventBus } from "@/utils/eventBus";
 import { uniqeResource } from "@/utils/calUnitTools";
 import { debounce } from 'lodash-es'
 import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
+import moment from 'moment'
 
 export default {
 	name: "dl023",
@@ -210,6 +211,13 @@ export default {
 	mounted() {
 	},
 	methods: {
+    //开始介绍按钮回调
+    handleClickButton(item,signData) {
+			const arrStr = item.subKey;
+      const value = moment().format('YYYY/MM/DD HH:mm');
+      this.$refs.swypyjInfoRef.updateFormData(arrStr, value,{isUpdateRecord:true,signData});
+			// console.log(this.getFilledFormData())
+		},
 		onSelect(e) {
 			const { key, value } = e
 			if (key === "dwzshxbx") {//动物种属或细胞系

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

@@ -15,12 +15,15 @@
           <!-- 操作记录 -->
           <div class="template-form-item">
           <BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.common.operationSteps"
-            :formConfig="stepFormConfig" @blur="onHandleBlur" @onRegentSubmit="onRegentSubmit"
+            :formConfig="stepFormConfig"
+             @blur="onHandleBlur"
+              @clickButton="handleClickButton"
+               @onRegentSubmit="onRegentSubmit"
             :formData="formData" />
             <CustomTable
               :ref="`tableRef`"
               :columns="tableColumns"
-              :formData="formData"
+              :formData="tableFormData"
               operationWidth = "80px"
               :prefixKey = "`table`"
               fieldItemLabel = "template.dl.dl024.gcqk"
@@ -52,6 +55,7 @@ import { EventBus } from "@/utils/eventBus";
 import { uniqeResource } from "@/utils/calUnitTools";
 import { debounce } from 'lodash-es'
 import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
+import moment from 'moment'
 
 export default {
 	name: "dl024",
@@ -183,7 +187,7 @@ export default {
           bodyType: 'input',
           bodyFillType: 'actFill',
           width: 100,
-          bodyMaxlength: 50,
+          bodyDisabled: true,
         }
 			]
 		},
@@ -196,6 +200,13 @@ export default {
 	mounted() {
 	},
 	methods: {
+    //开始介绍按钮回调
+    handleClickButton(item,signData) {
+			const arrStr = item.subKey;
+      const value = moment().format('YYYY/MM/DD HH:mm');
+      this.$refs.swypyjInfoRef.updateFormData(arrStr, value,{isUpdateRecord:true,signData});
+			// console.log(this.getFilledFormData())
+		},
     // 选择前置表单预留
     onRegentSubmit(e) {
       const { selectInfo, key, rowIndex } = e
@@ -205,7 +216,7 @@ export default {
           // 解析前序表单的内容
           const bdnr = JSON.parse(row.bdnr)
           // 获取剂量组列表数据
-          const stepTableFormData = bdnr.jlzTableData || []
+          const stepTableFormData = bdnr.stepTableFormData || []
 
           if (stepTableFormData.length === 0) {
             // 清空当前的换液情况列表数据
@@ -213,12 +224,13 @@ export default {
             this.$message.warning('前序表单中没有细胞编号数据')
             return
           }
-
+          console.log('选择仪器编号预留=2==',stepTableFormData)
           // 从剂量组数据中提取细胞编号
           const itemData = stepTableFormData.map(item => ({
-            xbbh: item.jlzb || '', // 细胞编号
+            xbbh: item.jzlybh || '', // 细胞编号
           }))
           // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
+          console.log('选择仪器编号预留=3==',itemData)
           this.$set(this.formData, 'stepTableFormData', itemData)
 
           this.$message.success(`已从前序表单加载 ${itemData.length} 条细胞编号数据`)
@@ -249,19 +261,14 @@ export default {
 			return content;
 		},
 		getResource() {
-			//使用的试剂、仪器
-			const stepResource = this.$refs.stepRef.getStepResource()
       const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
       // 从操作步骤中提取试剂和仪器资源
-			this.resourceTmp = stepResource.sjResource || []
-			const tableFromHyqk = tableList
+			this.resourceTmp = tableList
         .filter(item => item.xybh)
         .map(item => ({
           bh: item.xybh,
           type: 'cell'
         }))
-
-      this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
 			return this.resourceTmp;
 		},
 		//保存

src/views/business/comps/template/comps/gsp/GSP015.vue

@@ -0,0 +1,416 @@
+<!-- 供试品部给药制剂取样/前处理记录表 -->
+<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="refConfig.baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+					<TableList label="template.common.gyzjInfo" :columns="gyzjColumns" :dataSource="resourceGyzj" />
+					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+					<LineLabel label="取样进样信息" />
+					<el-button class="mt-20" v-if="fillType === 'preFill'" type="primary"
+						@click="onAdd('ybsmDataList')">新增</el-button>
+					<el-button class="mt-20" v-if="fillType === 'actFill'" type="primary"
+						@click="onExport">导出</el-button>
+					<div v-for="(item, index) in formData.ybsmDataList" :key="item.id" class="template-form-item">
+						<div class="config-header">
+							<div></div>
+							<el-popconfirm title="确认删除当前数据？" @confirm="deleteConfig(item, 'ybsmDataList')">
+								<el-button slot="reference" v-if="fillType === 'preFill'" type="text"
+									icon="el-icon-delete">{{
+										$t('template.common.deleteBtn')
+									}}</el-button>
+							</el-popconfirm>
+						</div>
+						<BaseInfoFormPackage fieldItemLabel="取样进样信息" :ref="`ybsmFormPackageRef${index}`"
+							@clickButton="(e,d,key,formFields) => handleClickButton(e,d,key,formFields,index)"
+							:formConfig="ybsmFormConfig" :formData="item" />
+						<CustomTable :ref="`ybsmTableRef${index}`" :columns="ybsmColumns" prefix="qy"
+							:showOperation="fillType === 'actFill' || fillType === 'preFill'"
+							:showAddRow="fillType === 'preFill'" @onAddRow="() => addTableRow(index)"
+							fieldItemLabel="取样进样信息" :formData="item">
+							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+								<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="columns"
+									@deleteRow="() => deleteTableRow(rowIndex, index)">
+								</TableOpertaionDelete>
+							</template>
+						</CustomTable>
+						<CustomTable :ref="`jyTableRef${index}`" :columns="yjColumns" prefix="jy"
+							fieldItemLabel="取样进样信息" @blur="(e) => onHandleTableBlur(e, index, 'jyTableRef')"
+							:showOperation="fillType === 'actFill'" :showAddRow="false"
+							:formData="{ stepTableFormData: item.jyStepTableFormData || [], headerSelectFields: item.jyHeaderSelectFields || {} }">
+							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+								<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="columns"
+									@deleteRow="() => deleteTableRow(rowIndex, index)">
+								</TableOpertaionDelete>
+							</template>
+						</CustomTable>
+					</div>
+					<LineLabel label="二次稀释信息" />
+					<el-button class="mt-20" v-if="fillType === 'preFill'" type="primary"
+						@click="onAdd('ecDataList')">新增</el-button>
+					<el-button class="mt-20" v-if="fillType === 'actFill'" type="primary"
+						@click="onExport('ec')">导出</el-button>
+					<div v-for="(item, index) in formData.ecDataList" :key="item.id" class="template-form-item">
+						<div class="config-header">
+							<div></div>
+							<el-popconfirm title="确认删除当前数据？" @confirm="deleteConfig(item, 'ecDataList')">
+								<el-button slot="reference" v-if="fillType === 'preFill'" type="text"
+									icon="el-icon-delete">{{
+										$t('template.common.deleteBtn')
+									}}</el-button>
+							</el-popconfirm>
+						</div>
+						<BaseInfoFormPackage fieldItemLabel="二次稀释信息" :ref="`ecFormPackageRef${index}`"
+							:formConfig="ecFormConfig" :formData="item" />
+						<CustomTable :ref="`ecTableRef${index}`" :columns="yjColumns" prefix="ec"
+							fieldItemLabel="二次稀释信息" @blur="(e) => onHandleTableBlur(e, index, 'ecTableRef')"
+							:showOperation="fillType === 'preFill' || fillType === 'actFill'"
+							@onAddRow="() => addEcTableRow(index, 'ecTableRef')" :formData="item">
+							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+								<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="columns"
+									@deleteRow="() => deleteTableRow(rowIndex, index)">
+								</TableOpertaionDelete>
+							</template>
+						</CustomTable>
+					</div>
+					<Step :ref="`stepRef`" :formData="formData.stepData || []"></Step>
+
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+						:ref="refConfig.remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete";
+
+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 { uniqeResource } from "@/utils/calUnitTools";
+import { getuuid, justUpdateFilledFormData } from "@/utils/index";
+import { isCommonUnit } from "@/utils/conTools";
+import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
+import { volumeConverter } from "@/utils/volConverter";//体积单位转换
+import moment from "moment";//时间处理
+import { getBaseInfoFormConfig, getRemarkFormConfig, getYbsmFormConfig, getQyTableColumns, getJyTableColumns, getEcFormConfig } from "../../formConfig/gsp/gsp015";
+const refConfig = {
+	baseInfoRef: "baseInfoRef",
+	remarkRef: "remarkRef",
+	stepRef: "stepRef",
+}
+const compRefs = Object.values(refConfig);
+export default {
+	name: "SP0021",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaionDelete },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+		sn: {
+			type: String,
+			default: '',
+		},
+	},
+	computed: {
+		// 备注表单配置
+		remarkConig() {
+			return getRemarkFormConfig(this)
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return getBaseInfoFormConfig(this)
+		},
+		// 样本说明
+		ybsmFormConfig() {
+			return getYbsmFormConfig(this)
+		},
+		// 样本说明表格列
+		ybsmColumns() {
+			return getQyTableColumns(this)
+		},
+		//进样表格列
+		yjColumns() {
+			return getJyTableColumns(this)
+		},
+		// 二次稀释表单配置
+		ecFormConfig() {
+			return getEcFormConfig(this)
+		},
+	},
+	data() {
+		return {
+			refConfig,
+			currentIndex: -1,
+		};
+	},
+	mounted() {
+
+	},
+	methods: {
+		handleClickButton(item,signData,key,formFields,index){
+			const {} = item;
+			const ref = this.$refs[`ybsmFormPackageRef${index}`][0];
+			if(key === "startButton"){
+				ref.updateFormData("qysj",moment().format("YYYY/MM/DD HH:mm:ss"),{ isUpdateRecord: true, signData })
+			}else if(key === "endButton"){
+				const qysj = formFields.qysj;
+				if(!qysj){
+					this.$message.error("请先记录开始时间");
+					return;
+				}
+				const subQysj = qysj.substr(0,19)
+				const endTime = moment().format("YYYY/MM/DD HH:mm:ss");
+				ref.updateFormData("qysj",`${subQysj} ~ ${endTime}`,{ isUpdateRecord: true, signData })
+			}
+		},
+		onHandleTableBlur(e, index, refName) {
+			if (this.fillType === 'preFill') {
+				return
+			}
+			const { colKey, headerSelectFields, item } = e;
+			//[标定体积，取样体积，进样体积，取样浓度]
+			const keys = ["bdtj", "qytj", "jytj", "qynd"];
+			if (keys.includes(colKey)) {
+				const { bdtj, qytj, jytj, qynd, xsbsxsd, sjjyndsd, ztjxsd, xsbs } = item;
+				const { bdtjdw, qytjdw, jytjdw, qynddw, ztjdw, sjjynddw } = headerSelectFields || {};
+
+				//将标定体积的单位转换成和终体积单位一致再计算；
+			
+
+				if (!!bdtj && !!qytj) {
+					const transBdtj = volumeConverter.convert(bdtj + bdtjdw, ztjdw);//转换后的标定体积
+					const transQytj = volumeConverter.convert(qytj + qytjdw, ztjdw);//转换后的取样体积
+					//稀释倍数：标定体积 除以 取样体积
+					const bs = parseFloat((transBdtj / transQytj).toFixed(xsbsxsd));
+					item.xsbs = bs;
+
+				}
+				if (!!bdtj && !!jytj) {
+					const transBdtj = volumeConverter.convert(bdtj + bdtjdw, ztjdw);//转换后的标定体积
+					const transJytj = volumeConverter.convert(jytj + jytjdw, ztjdw);//转换后的进样体积
+					//终体积：标定体积 - 进样体积
+					const ztj = parseFloat((transBdtj - transJytj).toFixed(ztjxsd));
+					item.ztj = ztj;
+				}
+				if (!!qynd && !!xsbs) {
+					const transQynd = convertConcentration.convert(qynd + qynddw, sjjynddw);//转换后的取样浓度
+					//实际进样浓度：取样浓度 除以 稀释倍数	
+					const sjjynd = parseFloat((transQynd / xsbs).toFixed(sjjyndsd));
+					item.sjjynd = sjjynd;
+				}
+
+			}
+		},
+		addEcTableRow(index, refName = "ecTableRef") {
+			this.$refs[`${refName + index}`][0].addRow({
+				xsbsxsd: 3,
+				ztjxsd: 3,
+				sjjyndsd: 3,
+				id: getuuid(),
+			})
+			this.justUpdateFilledFormData();
+		},
+		//新增样本说明表格行
+		addTableRow(index) {
+			this.$refs[`ybsmTableRef${index}`][0].addRow({
+				id: getuuid(),
+			})
+			this.addEcTableRow(index, "jyTableRef");
+
+		},
+		onExport() {
+
+		},
+		//删除样本说明
+		deleteConfig(item, type = "ybsmDataList") {
+			if (this.formData[type].length > 1) {
+				const configIndex = this.formData[type].findIndex(config => config.id === item.id);
+				if (configIndex > -1) {
+					const newList = [...this.formData[type]]
+					newList.splice(configIndex, 1);
+					this.$set(this.formData, type, newList);
+					this.$nextTick(() => {
+						//通知后端保存数据
+						justUpdateFilledFormData();
+					})
+				}
+			} else {
+				this.$message.warning('至少保留一条数据');
+			}
+
+		},
+		//新增样本说明
+		onAdd(type = "ybsmDataList") {
+			if (!this.formData[type]) {
+				this.$set(this.formData, type, []);
+			}
+			let defaultInfo = {
+				id: getuuid(),
+			}
+			this.formData = { ...this.formData, ...this.getFilledFormData() };
+			// 添加新的平行配制配置
+			this.formData[type].push(defaultInfo);
+			this.justUpdateFilledFormData();
+		},
+
+		// 删除表格行
+		deleteTableRow(rowIndex, index) {
+			this.$refs[`ybsmTableRef${index}`][0].deleteRow(rowIndex)
+			this.$refs[`jyTableRef${index}`][0].deleteRow(rowIndex)
+		},
+		//获取已填写的表单数据
+		getFilledFormData() {
+			// 基础表单数据
+			const baseData = this.getFilledFormDataByRefs(compRefs);
+			const { ybsmDataList = [], ecDataList = [] } = this.formData
+			const yData = ybsmDataList.map((item, index) => {
+				const ybsmFormData = this.$refs[`ybsmFormPackageRef${index}`][0]?.getFilledFormData() || {};
+				const ybsmTableData = this.$refs[`ybsmTableRef${index}`][0]?.getFilledFormData() || [];
+				const jyTableData = this.$refs[`jyTableRef${index}`][0]?.getFilledFormData() || [];
+				return {
+					...ybsmFormData,
+					...ybsmTableData,
+					jyStepTableFormData: jyTableData.stepTableFormData,
+					jyHeaderSelectFields: jyTableData.headerSelectFields,
+				};
+			});
+			const eData = ecDataList.map((item, index) => {
+				const ecFormData = this.$refs[`ecFormPackageRef${index}`][0]?.getFilledFormData() || {};
+				const ecTableData = this.$refs[`ecTableRef${index}`][0]?.getFilledFormData() || [];
+				return {
+					...ecFormData,
+					...ecTableData,
+				};
+			});
+			return {
+				...baseData,
+				ybsmDataList: yData,
+				ecDataList: eData
+			};
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+
+			const refs = [];
+			const { ecDataList = [], ybsmDataList = [] } = this.getFilledFormData();
+
+			// 验证多个样本说明项
+			for (let index = 0; index < ybsmDataList.length; index++) {
+				// 验证样本说明表单
+				refs.push(`ybsmFormPackageRef${index}`)
+				refs.push(`ybsmTableRef${index}`)
+				refs.push(`jyTableRef${index}`)
+			}
+			for (let index = 0; index < ecDataList.length; index++) {
+				// 验证样本说明表单
+				refs.push(`ecFormPackageRef${index}`)
+				refs.push(`ecTableRef${index}`)
+			}
+			// 基础表单验证
+			let content = await this.validFormFields([...compRefs, ...refs]);
+			if (!content) return false;
+			if (!ybsmDataList.length) {
+				this.$message.error('请添加取样进样信息');
+				return false;
+			} else if (!ecDataList.length) {
+				this.$message.error('请添加二次稀释信息');
+				return false;
+			}
+			const diff1 = ybsmDataList.every(item => isCommonUnit(item.jyHeaderSelectFields.qynddw, [item.jyHeaderSelectFields.sjjynddw]));
+			const diff2 = ecDataList.every(item => isCommonUnit(item.headerSelectFields.qynddw, [item.headerSelectFields.sjjynddw]));
+			console.log(diff1, diff2, "dff")
+
+			if (!diff1 || !diff2) {
+				this.$message.error("取样浓度单位与实际进样浓度单位不符，请重新选择！");
+				return false;
+			}
+			// 获取所有数据
+			return this.getFilledFormData();
+		},
+		getResource() {
+			let content = this.getFilledFormData();
+			//生成resource
+			let tmpResource = []
+			if (this.fillType === "actFill") {
+				//配置的试剂
+				tmpResource.push({
+					mc: content.targetName,
+					bh: content.targetCode + content.targetCodeSn,
+					ph: '',
+					ndz: content.targetActConcentration + content.targetActConcentrationUnit,
+					nd: content.targetActConcentration,
+					nddw: content.targetActConcentrationUnit,
+					ly: 'ELN配制',
+					sxrq: content.expireDate,
+					kc: content.targetActVolume,
+					kcdw: content.targetActVolumeUnit,
+					syl: null,
+					type: null,
+					elnType: this.product,
+					syldw: content.targetActVolumeUnit,
+					yxzq: content.effectivePeriod,
+					yxzqdw: content.effectivePeriodUnit,
+				})
+			}
+			//使用的试剂、仪器
+			let allSjResource = [];
+			let allYqResource = [];
+			// 收集所有样本说明项的步骤资源
+			const stepResource = this.$refs[`stepRef`]?.getStepResource() || { sjResource: [], yqResource: [] };
+			allSjResource = [...allSjResource, ...(stepResource.sjResource || [])];
+			allYqResource = [...allYqResource, ...(stepResource.yqResource || [])];
+			this.resourceTmp = uniqeResource(tmpResource, allSjResource)
+			this.yqResourceTmp = allYqResource
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			let content = await this.getFormData();
+			console.log(content);
+
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+
+.config-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 15px;
+	font-weight: bold;
+	font-size: 16px;
+	color: #303133;
+}
+
+.config-header .el-button {
+	color: #f56c6c;
+	font-size: 14px;
+}
+
+.config-header .el-button:hover {
+	color: #f78989;
+}
+</style>

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

@@ -23,6 +23,7 @@
 						</template>
 					</CustomTable>
 					<BaseInfoFormPackage class="mt-20" fieldItemLabel="色谱柱型号" label="色谱柱型号" ref="spzxhRef"
+						@remoteMethod="remoteMethod"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="溶液" />
 					<CustomTable 
@@ -55,8 +56,9 @@ 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 { public_sjList } from '@/api/business/public/public';
 
-import { getBaseInfoFormConfig, storageFormConfig, getYqColumns,getRyColumns,getYqphFormConfig } from "../../formConfig/sp/SP0019"
+import { getBaseInfoFormConfig, getStorageFormConfig, getYqColumns,getRyColumns,getYqphFormConfig } from "../../formConfig/sp/SP0019"
 
 export default {
 	name: "SP0019",
@@ -83,7 +85,7 @@ export default {
 		},
 		// 配置条件
 		storageFormConfig() {
-			return storageFormConfig;
+			return getStorageFormConfig(this);
 		},
 		// 备注表单配置
 		remarkConig() {
@@ -111,7 +113,8 @@ export default {
 	},
 	data() {
 		return {
-			formData: {}
+			formData: {},
+			spzxhOptions: [],
 		};
 	},
 	mounted() {
@@ -119,6 +122,22 @@ export default {
 
 	},
 	methods: {
+		async remoteMethod({ query, key }) {
+			if (key === "spzxh") {
+				const res = await public_sjList({
+					pageNum: 1,
+					pageSize: 10,
+					mc: query
+				});
+				if(res.code === 200){
+					const {rows = []} = res;
+					this.spzxhOptions = rows.map(item => ({
+						label: item.bh,
+						value: item.bh,
+					}));
+				}
+			}
+		},
 		onRegentSubmit(e){
 			const {selectInfo, key, col, rowIndex, colIndex, rowData} = e;
 			const {row} = selectInfo;
@@ -130,8 +149,17 @@ export default {
 				this.$refs.ryTableRef.updateDataSourceByRowIndex(rowIndex, params);
 			}
 		},
-		onYqSubmit(data, col, rowIndex, colIndex, row){
-			console.log(data, col, rowIndex, colIndex, row,"onRegentSubmit")
+		onYqSubmit(data){
+			const {selectInfo,rowIndex,key} = data;
+			const {row} = selectInfo;
+			if(key === "bh"){//一起编号
+				const params = {
+					mc: row.mc,
+					xh: row.xh,
+					jzrq: row.jzrq,
+				}
+				this.$refs.yqInfoTableRef.updateDataSourceByRowIndex(rowIndex, params);
+			}
 		},
 		//获取已填写的表单数据
 		getFilledFormData() {

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

@@ -19,30 +19,26 @@
 						<div class="config-header">
 							<div></div>
 							<el-popconfirm title="确认删除当前样本？" @confirm="deleteConfig(item)">
-								<el-button slot="reference" v-if="fillType === 'actFill'" type="text" icon="el-icon-delete" >{{
-									$t('template.common.deleteBtn')
-								}}</el-button>
+								<el-button slot="reference" v-if="fillType === 'actFill'" type="text"
+									icon="el-icon-delete">{{
+										$t('template.common.deleteBtn')
+									}}</el-button>
 							</el-popconfirm>
 						</div>
-						<BaseInfoFormPackage fieldItemLabel="样本说明"  :ref="`ybsmFormPackageRef${index}`"
-						:formConfig="ybsmFormConfig" @blur="onHandleBlur" :formData="item" />
-						<el-button  v-if="fillType === 'actFill'" type="primary" @click="onImportAnimal">导入动物</el-button>
-						<CustomTable 
-							:ref = "`ybsmTableRef${index}`" 
-							:columns="ybsmColumns" 
-							:showOperation="fillType === 'actFill'"
-							:showAddRow="fillType === 'actFill'"
-							:formData = "item">
+						<BaseInfoFormPackage fieldItemLabel="样本说明" :ref="`ybsmFormPackageRef${index}`"
+							:formConfig="ybsmFormConfig" @blur="onHandleBlur" :formData="item" />
+						<el-button v-if="fillType === 'actFill'" type="primary"
+							@click="onImportAnimal(item, index)">导入动物</el-button>
+						<CustomTable :ref="`ybsmTableRef${index}`" :columns="ybsmColumns"
+							:showOperation="fillType === 'actFill'" :showAddRow="fillType === 'actFill'"
+							:formData="item">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaionDelete
-									:row="row"
-									:rowIndex="rowIndex"
-									:columns="columns"
-									@deleteRow="() => deleteTableRow(rowIndex, `ybsmTableRef${index}`)"
-								></TableOpertaionDelete>
+								<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="columns"
+									@deleteRow="() => deleteTableRow(rowIndex, `ybsmTableRef${index}`)">
+								</TableOpertaionDelete>
 							</template>
 						</CustomTable>
-						<Step :ref="`stepRef${index}`" :formData="item.stepData ||[]"></Step>
+						<Step :ref="`stepRef${index}`" :formData="item.stepData || []"></Step>
 					</div>
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
 						:ref="refConfig.remarkRef" :formConfig="remarkConig" :formData="formData" />
@@ -50,7 +46,8 @@
 			</div>
 		</div>
 		<!-- <button @click="onSave">保存</button> -->
-		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadExcelData" :downloadArr="['动物编号']" @downloadExcelTemplate="downloadExcelTemplate" />
+		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadExcelData" :downloadArr="['动物编号']"
+			@downloadExcelTemplate="downloadExcelTemplate" />
 	</div>
 </template>
 
@@ -65,8 +62,8 @@ import Step from "@/components/Template/Step";
 import templateMixin from "../../mixins/templateMixin";
 import CustomTable from '@/components/Template/CustomTable.vue';
 import { uniqeResource } from "@/utils/calUnitTools";
-import {getuuid,justUpdateFilledFormData} from "@/utils/index";
-import { getBaseInfoFormConfig, getStorageFormConfig, getRemarkFormConfig, getYbsmFormConfig,getTableColumns } from "../../formConfig/sp/SP0021";
+import { getuuid, justUpdateFilledFormData } from "@/utils/index";
+import { getBaseInfoFormConfig, getStorageFormConfig, getRemarkFormConfig, getYbsmFormConfig, getTableColumns } from "../../formConfig/sp/SP0021";
 const refConfig = {
 	baseInfoRef: "baseInfoRef",
 	remarkRef: "remarkRef",
@@ -78,7 +75,7 @@ const refConfig = {
 const compRefs = Object.values(refConfig);
 export default {
 	name: "SP0021",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete,ImportExcelDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaionDelete, ImportExcelDialog },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -113,23 +110,24 @@ export default {
 		},
 	},
 	data() {
-			return {
-				refConfig,
-			};
-		},
+		return {
+			refConfig,
+			currentIndex: -1,
+		};
+	},
 	mounted() {
-		if(this.fillType === 'preFill' &&!this.formData.ybsmDataList){//预填的时候默认新增一个。
+		if (this.fillType === 'preFill' && !this.formData.ybsmDataList) {//预填的时候默认新增一个。
 			this.onAdd()
 		}
 	},
 	methods: {
 		//删除样本说明
-		deleteConfig(item){
+		deleteConfig(item) {
 			// 确保 ybsmDataList 存在
 			if (this.formData.ybsmDataList.length > 1) {
 				const configIndex = this.formData.ybsmDataList.findIndex(config => config.id === item.id);
-				console.log(configIndex,"configIndex")
-				if(configIndex>-1){
+				console.log(configIndex, "configIndex")
+				if (configIndex > -1) {
 					const newList = [...this.formData.ybsmDataList]
 					newList.splice(configIndex, 1);
 					this.$set(this.formData, 'ybsmDataList', newList);
@@ -141,41 +139,50 @@ export default {
 			} else {
 				this.$message.warning('至少保留一个样本说明项');
 			}
-			
+
 		},
 		//新增样本说明
-		onAdd(){
+		onAdd() {
 			if (!this.formData.ybsmDataList) {
 				this.$set(this.formData, 'ybsmDataList', []);
 			}
-			let defaultInfo  = {
+			let defaultInfo = {
 				id: getuuid(),
 				stepData: [],
 			}
-			if(this.fillType === "actFill"){
-				const {ybsmDataList} = this.formData
+			if (this.fillType === "actFill") {
+				const { ybsmDataList } = this.formData
 				defaultInfo.stepData = ybsmDataList[0]?.stepData || []
 			}
+			this.formData = { ...this.formData, ...this.getFilledFormData() };
 			// 添加新的平行配制配置
 			this.formData.ybsmDataList.push(defaultInfo);
 		},
 		onLoadExcelData(excelData) {
 			const data = excelData.splice(1);
+			const transData = data.map((item)=>{
+				return{
+					dwbh: item[0],
+					id: getuuid(),
+				}
+			})
+			this.$refs[`ybsmTableRef${this.currentIndex}`][0].pushDataSource(transData)
 			this.$refs.ImportExcelDialog.cancel()
 			setTimeout(() => {
 				justUpdateFilledFormData();
 			}, 100);
 		},
-		downloadExcelTemplate(arr){
+		downloadExcelTemplate(arr) {
 			this.exportExcel(arr)
 		},
 		// 导入动物
-		onImportAnimal(){
+		onImportAnimal(item, index) {
+			this.currentIndex = index;
 			this.$refs.ImportExcelDialog.show()
 		},
 		// 删除表格行
 		deleteTableRow(rowIndex, refName) {
-		this.$refs[refName].deleteRow(rowIndex)
+			this.$refs[refName][0].deleteRow(rowIndex)
 		},
 		//获取已填写的表单数据
 		getFilledFormData() {
@@ -202,18 +209,18 @@ export default {
 			// 基础表单验证
 			let content = await this.validFormFields(compRefs);
 			if (!content) return null;
-			
+
 			// 验证多个样本说明项
 			for (let index = 0; index < this.formData.ybsmDataList.length; index++) {
 				// 验证样本说明表单
 				const ybsmFormValid = await this.$refs[`ybsmFormPackageRef${index}`][0]?.getFormData() || true;
 				if (!ybsmFormValid) return null;
-				
+
 				// 验证步骤数据
 				const stepValid = await this.$refs[`stepRef${index}`][0]?.getFormData() || true;
 				if (!stepValid) return null;
 			}
-			
+
 			// 获取所有数据
 			return this.getFilledFormData();
 		},
@@ -272,6 +279,7 @@ export default {
 .print-btn {
 	margin-bottom: 20px;
 }
+
 .config-header {
 	display: flex;
 	justify-content: space-between;

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

@@ -25,7 +25,7 @@
 						</CustomTable>
 					</div>
 					<LineLabel :label="getOperationStepsLabel()" />
-					<div v-if="fillType === 'preFill'" class="mt-20">
+					<div v-if="fillType === 'preFill' && !isPcr234" class="mt-20">
 						<el-button type="primary" @click="handleAddConfig('paralleConfigs')">{{
 							$t('template.common.xzpxpz')
 						}}</el-button>
@@ -41,6 +41,7 @@
 							:tableColumns="ladderStepColumns" :prefixKey="'ladder_' + ladderIndex"
 							:configType="'ladder'" :ref="`ladderRef_${ladderIndex}`"
 							:fieldItemLabel="'template.common.jtpz'"
+							:showHeader="!isPcr234"
 							@deleteConfig="deleteConfig('ladderConfigs', ladderConfig)" :fillType="fillType" />
 					</div>
 
@@ -52,9 +53,10 @@
 							:tableColumns="paralleStepColumns" :prefixKey="'paralle_' + paralleIndex"
 							:configType="'paralle'" :ref="`paralleRef_${paralleIndex}`"
 							:fieldItemLabel="'template.common.pxpz'"
+							:showHeader="!isPcr234"
 							@deleteConfig="deleteConfig('paralleConfigs', paralleConfig)" :fillType="fillType" />
 					</div>
-					<template v-if="sn === 'LBA005'">
+					<template v-if="sn === 'LBA005' || sn === 'ADA005'">
 						<LineLabel :label="$t('template.lba.lba005.zkpz')" />
 						<div v-if="fillType === 'preFill'" class="mt-20">
 							<el-button type="primary" @click="handleAddConfig('paralleConfigs_1')">{{
@@ -192,7 +194,8 @@ export default {
 		},
 	},
 	data() {
-		const labArr = ["LBA005", "LBA007"];
+		const labArr = ["LBA005", "LBA007","ADA005","ADA007"];
+		const pcr234Arr = ["PCR002", "PCR003", "PCR004"];
 		const sn = this.sn || '';
 		return {
 			subSolutionVisible: false,
@@ -206,6 +209,7 @@ export default {
 			currentRowData: {},//当前点击的行数据
 			isLba: labArr.includes(this.sn),
 			isSp: sn.includes('SP'),//是否是色谱
+			isPcr234: pcr234Arr.includes(this.sn),//是否是PCR234
 		};
 	},
 	mounted() {
@@ -215,12 +219,17 @@ export default {
 				this.handleUpdateCode(formData);
 			}, 0);
 		}
+		// 如果是PCR234，默认添加一个阶梯配置 并且不支持增删
+		if(this.isPcr234 &&!this.formData.ladderConfigs){
+			this.handleAddConfig("ladderConfigs");
+		}
 	},
 	methods: {
 		// 获取操作步骤标签
 		getOperationStepsLabel() {
 			const obj = {
 				"LBA005": "template.lba.lba005.bzqxpz",//标准曲线配制
+				"ADA005": "template.lba.lba005.bzqxpz",//标准曲线配制
 				// "LBA007": "template.lba.lba005.bzqxpz",//
 			}
 			return obj[this.sn] || 'template.common.operationSteps';//操作步骤
@@ -291,10 +300,10 @@ export default {
 			// 初始化平行配制配置列表
 			if (!this.formData[configType]) {
 				// 新增配置的时候，把最新的formdata重新赋值一份，避免选板数据丢失的bug。
-				this.formData = { ...this.formData, ...this.getFilledFormData() };
 				this.$set(this.formData, configType, []);
 				// this.formData[configType] = [];
 			}
+			this.formData = { ...this.formData, ...this.getFilledFormData() };
 			// 添加新的平行配制配置
 			this.formData[configType].push({
 				id: getuuid(),

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

@@ -1,6 +1,6 @@
 <template>
 	<div class="template-form-item">
-		<div class="config-header">
+		<div class="config-header" v-if="showHeader">
 			<div>{{ $t(fieldItemLabel) }}</div>
 			<el-popconfirm title="确认删除当前配置？" @confirm="deleteConfig">
 				<el-button slot="reference" v-if="fillType === 'preFill'" type="text" icon="el-icon-delete" >{{
@@ -53,6 +53,10 @@ export default {
 	name: "LadderConfig",
 	mixins: [templateMixin],
 	props: {
+		showHeader: {//是否显示删除按钮
+			type: Boolean,
+			default: true,
+		},
 		fillType: {
 			type: String,
 			default: '',
@@ -301,9 +305,9 @@ export default {
 			const { rowData } = val;
 			let postData = {
 				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
-				studySubjectId: this.formData.studySubjectId,
-				studyId: this.formData.studyId,
-				studyFormId: this.formData.id,
+				studySubjectId: this.currentFormData.studySubjectId,
+				studyId: this.currentFormData.studyId,
+				studyFormId: this.currentFormData.id,
 			}
 			this.startConfigRequest(postData);
 		},
@@ -317,9 +321,9 @@ export default {
 				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
 				nd: rowData.actSolutionConcentration,//实际目标溶液浓度
 				nddw: headerSelectFields.actSolutionConcentrationUnit,
-				studySubjectId: this.formData.studySubjectId,
-				studyId: this.formData.studyId,
-				studyFormId: this.formData.id,
+				studySubjectId: this.currentFormData.studySubjectId,
+				studyId: this.currentFormData.studyId,
+				studyFormId: this.currentFormData.id,
 				kc: total,
 				kcdw: unit,
 			}
@@ -338,14 +342,14 @@ export default {
 					}
 				})
 				let postData = {
-					studyId: this.formData.studyId,
-					studyFormId: this.formData.id,
+					studyId: this.currentFormData.studyId,
+					studyFormId: this.currentFormData.id,
 					bh: mybh,
 					nd: rowData.actSolutionConcentration || 0,
 					nddw: headerSelectFields.actSolutionConcentrationUnit,
-					studySubjectId: this.formData.studySubjectId,
-					studyId: this.formData.studyId,
-					studyFormId: this.formData.id,
+					studySubjectId: this.currentFormData.studySubjectId,
+					studyId: this.currentFormData.studyId,
+					studyFormId: this.currentFormData.id,
 					list: list
 				}
 				this.subPackageRequest(postData);

src/views/business/comps/template/formConfig/gsp/gsp015.js

@@ -0,0 +1,327 @@
+export const getBaseInfoFormConfig = ($this) => {
+    return [
+        {
+            type: 'cardItem',
+            config: {
+                studyMc: {
+                    label: 'template.common.testName',
+                    type: 'input',
+                    disabled: true
+                },
+                studySn: {
+                    label: 'template.common.testNumber',
+                    type: 'input',
+                    disabled: true
+                }
+            }
+        },
+        {
+            type: 'conditionItem',
+            label: 'template.common.testConfigurationConditions',
+            config: {
+                pre: {
+                    label: 'template.common.preFill',
+                    type: 'select',
+                    multiple: true,
+                    fillType: 'preFill',
+                    options: $this.getDictOptions('business_pztj'),
+                    otherCode: 'preOther'
+                },
+                act: {
+                    label: 'template.common.actualFill',
+                    type: 'select',
+                    fillType: 'actFill',
+                    otherCode: 'actOther',
+                    multiple: true,
+                    compareTo: 'pre',
+                    options: $this.getDictOptions('business_pztj')
+                }
+            }
+        },
+        {
+            type: 'cellItem',
+            label: 'template.common.configurationTime',
+            config: {
+                startDate: {
+                    label: 'template.common.startTime',
+                    type: 'input'
+                },
+                endDate: {
+                    label: 'template.common.endTime',
+                    type: 'input'
+                }
+            }
+        }
+    ]
+}
+
+//备注
+export const getRemarkFormConfig = ($this) => {
+    return [
+        {
+            type: 'cellItem',
+            config: {
+                remark: {
+                    label: '',
+                    type: 'textarea',
+                    fillType: 'actFill',
+                    span: 1,
+                    placeholder: 'template.common.remarkPlaceholder',
+                    maxlength: 1000,
+                    rows: 5
+                }
+            }
+        }
+    ]
+}
+
+export const getYbsmFormConfig = ($this) => {
+    return [
+        {
+            type: 'step',
+            config: {
+                qysj: {
+                    label: '取样时间',
+                    type: 'input',
+                    fillType: 'actFill',
+                    maxlength: 50,
+                    disabled: true,
+                    subType:"button",
+                    subKey: "startButton",
+                    buttonName:"开始",
+                    thirdType: 'button',
+                    showSub:$this.fillType === 'actFill',
+                    showThird:$this.fillType === 'actFill',
+                    thirdKey: 'endButton',
+                    thirdButtonName:"结束",
+                },
+                xsy: {
+                    label: "template.sp.sp003.xsy",
+                    type: "input",
+                    fillType: "preFill",
+                    subType: "sj",
+                    subKey: "subSolution",
+                    subFillType: "actFill",
+                    maxlength: 20,
+                }
+            }
+        }
+    ]
+}
+
+//取样table
+export const getQyTableColumns = ($this) => {
+    return [
+        {
+            label: '取样编号',
+            prop: 'qybh',
+            width: 280,
+            bodyType: 'input',
+            bodyFillType: 'preFill',
+        },
+        {
+            label: '制剂编号',
+            prop: 'zjbh',
+            width: 280,
+            bodyType: 'gsp',
+            bodyFillType: 'actFill',
+        },
+        {
+            label: '预设制剂浓度',
+            prop: 'yszjnd',
+            width: 280,
+            headerSelectKey: 'yszjnddw',
+            fillType: "preFill",
+            headerOptions: $this.getDictOptions('business_nddw'),
+            bodyType: 'inputNumber',
+            bodyFillType: 'preFill',
+            headerSelectTo: 'sjzjnddw',
+        },
+        {
+            label: '实际制剂浓度',
+            prop: 'sjzjnd',
+            width: 280,
+            headerSelectKey: 'sjzjnddw',
+            fillType: "preFill",
+            headerOptions: $this.getDictOptions('business_nddw'),
+            bodyType: 'inputNumber',
+            bodyFillType: 'actFill',
+            copyFrom: 'yszjnd',
+            compareTo: 'yszjnd',
+        },
+        {
+            label: '制剂状态',
+            prop: 'zjzt',
+            width: 180,
+            bodyType: 'input',
+            bodyFillType: 'actFill',
+        },
+        {
+            label: '预设取样位置',
+            prop: 'ysqywz',
+            width: 180,
+            bodyType: 'select',
+            bodyOptions: $this.getDictOptions('business_qywz'),
+            bodyFillType: 'actFill',
+        },
+        {
+            label: '预设取样位置',
+            prop: 'sjqywz',
+            width: 180,
+            bodyType: 'select',
+            bodyOptions: $this.getDictOptions('business_qywz'),
+            bodyFillType: 'actFill',
+            compareTo: 'ysqywz',
+        },
+        {
+            label: '预设取样量',
+            prop: 'ysqyl',
+            width: 280,
+            headerSelectKey: 'ysqyldw',
+            fillType: "preFill",
+            headerOptions: $this.getDictOptions('business_tjdw'),
+            bodyType: 'inputNumber',
+            bodyMaxlength:10,
+            bodyFillType: 'preFill',
+            headerSelectTo: 'sjqydw',
+        },
+        {
+            label: '实际取样量',
+            prop: 'sjqyl',
+            width: 280,
+            headerSelectKey: 'sjqydw',
+            fillType: "preFill",
+            headerOptions: $this.getDictOptions('business_tjdw'),
+            bodyType: 'inputNumber',
+            bodyFillType: 'actFill',
+            copyFrom: 'ysqyl',
+            compareTo: 'ysqyl',
+        },
+    ]
+}
+
+//进样table
+export const getJyTableColumns = ($this) => {
+    return [
+        {
+            label: '进样编号',
+            prop: 'jybh',
+            width: 280,
+            bodyType: 'input',
+            bodyFillType: 'preFill',
+        },
+        {
+            label: '取样编号',
+            prop: 'qybh',
+            width: 280,
+            bodyType: 'gsp',
+            bodyFillType: 'actFill',
+        },
+        {
+            label: '取样浓度',
+            prop: 'qynd',
+            width: 280,
+            headerSelectKey: 'qynddw',
+            fillType: "preFill",
+            headerOptions: $this.getDictOptions('business_nddw'),
+            bodyType: 'inputNumber',
+            bodyFillType: 'actFill',
+        },
+        {
+            label: '取样体积',
+            prop: 'qytj',
+            width: 280,
+            headerSelectKey: 'qytjdw',
+            fillType: "preFill",
+            headerOptions: $this.getDictOptions('business_tjdw'),
+            bodyType: 'inputNumber',
+            bodyFillType: 'actFill',
+        },
+        {
+            label: '标定体积',
+            prop: 'bdtj',
+            width: 280,
+            headerSelectKey: 'bdtjdw',
+            fillType: "preFill",
+            headerOptions: $this.getDictOptions('business_tjdw'),
+            bodyType: 'inputNumber',
+            bodyFillType: 'preFill',
+        },
+        {
+            label: '进样体积',
+            prop: 'jytj',
+            width: 280,
+            headerSelectKey: 'jytjdw',
+            fillType: "preFill",
+            headerOptions: $this.getDictOptions('business_tjdw'),
+            bodyType: 'inputNumber',
+            bodyFillType: 'actFill',
+        },
+        {
+            label: '稀释倍数',
+            prop: 'xsbs',
+            width: 280,
+            bodyType: 'inputNumber',
+            bodyFillType: 'actFill',
+            bodySubType: "inputNumber",
+            bodySubKey: "xsbsxsd",
+            bodySubFillType: "preFill",
+            showBodySub: $this.fillType === "preFill",
+            bodyDisabled: true,
+            bodyPrecisionKey: "xsbsxsd",
+        },
+        {
+            label: '终体积',
+            prop: 'ztj',
+            width: 280,
+            headerSelectKey: 'ztjdw',
+            fillType: "preFill",
+            headerOptions: $this.getDictOptions('business_tjdw'),
+            bodyType: 'inputNumber',
+            bodyFillType: 'actFill',
+            bodySubType: "inputNumber",
+            bodySubKey: "ztjxsd",
+            bodySubFillType: "preFill",
+            showBodySub: $this.fillType === "preFill",
+            bodyDisabled: true,
+            bodyPrecisionKey: "ztjxsd",
+        },
+        {
+            label: '实际进样浓度',
+            prop: 'sjjynd',
+            width: 280,
+            headerSelectKey: 'sjjynddw',
+            fillType: "preFill",
+            headerOptions: $this.getDictOptions('business_nddw'),
+            bodyType: 'inputNumber',
+            bodyFillType: 'actFill',
+            bodySubType: "inputNumber",
+            bodySubKey: "sjjyndsd",
+            bodySubFillType: "preFill",
+            showBodySub: $this.fillType === "preFill",
+            bodyDisabled: true,
+            bodyPrecisionKey: "sjjyndsd",
+        },
+
+    ]
+}
+
+export const getEcFormConfig = ($this) => {
+    return [
+        {
+            type: "step",
+            config: {
+                xsy: {
+                    label: 'template.sp.sp00456.xsy',
+                    labelWidth: 80,
+                    type: 'input',
+                    fillType: 'preFill',
+                    subType: 'sj',
+                    subKey: 'subXsy',
+                    subFillType: 'actFill',
+                    maxlength: 20
+                },
+            }
+        }
+    ]
+}

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

@@ -34,13 +34,32 @@ const explainConfig = {
     }
   }
 }
+
+//编号对应的数据字典code
+const optionsCode = {
+    SP004: 'business_sp_nbgzy',
+    SP005: 'business_sp_zkgzy',
+    SP006: 'business_sp_bzqxzkypzbb',
+    PCR002: 'business_pcr_gzy',
+    PCR003: 'business_pcr_fxbzqxzbb',
+    PCR004: 'business_pcr_fxzkypzbb',
+    GSP007:"",
+    PCR013:"",
+    LBA005:"",
+    LBA007:"",
+    ADA005:"",
+    ADA007:"",
+  }
+
 // 阶梯配置表格列配置
 export const getLadderColumnsConfig = ($this) => {
+  const dic = optionsCode[$this.sn] || 'business_sp_nbgzy'
   return [
     {
       label: 'template.sp.sp00456.mbrybh',
       prop: 'targetSolutionCode',
-      bodyType: 'input',
+      bodyType: 'select',
+      bodyOptions: $this.getDictOptions(dic),
       bodySubType: 'span',
       bodySubKey: 'subTargetSolutionCode',
       bodyFillType: 'preFill',
@@ -205,13 +224,7 @@ export const getLadderColumnsConfig = ($this) => {
 }
 // 平行配置表格列配置
 export const getParallelColumnsConfig = ($this) => {
-  const sn = $this.sn
-  let o = {
-    SP004: 'business_sp_nbgzy',
-    SP005: 'business_sp_zkgzy',
-    SP006: 'business_sp_bzqxzkypzbb'
-  }
-  const dic = o[sn] || 'business_sp_nbgzy'
+  const dic = optionsCode[$this.sn] || 'business_sp_nbgzy'
   return [
     {
       label: 'template.sp.sp00456.mbrybh',
@@ -510,7 +523,7 @@ export const getLadderFormConfig = ($this) => {
       }
     }
   ]
-  if (sn === 'LBA007') {
+  if (sn === 'LBA007' || sn === 'ADA007') {
     defaultConfig.unshift(explainConfig)
   }
   return defaultConfig
@@ -519,7 +532,7 @@ export const getLadderFormConfig = ($this) => {
 //试验基本信息
 export const getBaseInfoFormConfig = ($this) => {
   const sn = $this.sn
-  const labArr = ['LBA005', 'LBA007']
+  const labArr = ['LBA005', 'LBA007','ADA005','ADA007']
   const isLba = labArr.includes(sn)
   const isSp = sn.includes('SP')//是否是色谱
   return [
@@ -679,7 +692,7 @@ export const getParalleStepFormConfig = ($this) => {
     }
   ]
   const sn = $this.sn
-  if (sn === 'LBA007') {
+  if (sn === 'LBA007' || sn === 'ADA007') {
     defaultConfig.unshift(explainConfig)
   }
   return defaultConfig

src/views/business/comps/template/formConfig/sp/SP0019.js

@@ -43,19 +43,22 @@ export const getBaseInfoFormConfig = (formType) => {
     ]
 }
 
-export const storageFormConfig = [
-    {
-        type: 'step',
-        config: {
-            yqmxh: {
-                label: '色谱柱型号',
-                type: 'yq',
-                fillType: 'actFill',
-                filledCodes:['mc','bh'],
-            },
-        }
-    },
-]
+export const getStorageFormConfig = ($this)=>{
+    return[
+        {
+            type: 'step',
+            config: {
+                spzxh: {
+                    label: '色谱柱型号',
+                    type: 'select',
+                    fillType: 'actFill',
+                    options: $this.spzxhOptions,
+                    filledCodes:['mc','bh'],
+                },
+            }
+        },
+    ]
+}
 
 //仪器信息
 export const getYqColumns = ($this) => {

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

@@ -59,6 +59,7 @@ export default {
 		'business_cjdd', // 采集地点
 		'business_zpdd', // 制片地点
 		'business_cjbw', // 制片部位
+		'business_qywz', // 取样位置
 	],
 	props: {
 		templateData: {