From 241201e6729db4b8aa21bf138d8080bb778fa0a9 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 1 Aug 2024 13:34:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue       | 1031 ++++++++--------
 src/views/qms/inspectionRecord/addForm.vue    | 1044 +++++++++--------
 .../qms/inspectionRecordFirst/addForm.vue     |  671 ++++++-----
 3 files changed, 1470 insertions(+), 1276 deletions(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 05f6ff589..9d381fc02 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -35,7 +35,7 @@
             />
           </div>
         </div>
-        
+
         <el-tabs
           v-model="editableTabsValue"
           class="demo-tabs"
@@ -71,421 +71,470 @@
               </span>
             </template>
             <div class="tabs-box">
-            <div class="small-title">检验工序</div>
-            <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码" prop="processCode">
-                    <el-input
-                      v-model="item.processCode"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="检验特性编号">
-                    <el-input
-                      v-model="item.inspectionFeatureCode"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="描述" prop="processDescribe">
-                    <el-input v-model="item.processDescribe" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="顺序号" prop="sequenceCode">
-                    <el-input v-model="item.sequenceCode" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div class="small-title">检验特性</div>
-            <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-            <div>
-                <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码">
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="描述"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.description"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="检验方法"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName"
-                        disabled
-                        placeholder="请选择检验方法"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="采样过程编码"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName"
-                        disabled
-                        placeholder="请选择采样过程编码"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="样品份数"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                        disabled
-                        placeholder="请输入样品份数"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
+              <el-collapse accordion>
+                <el-collapse-item name="1">
+                  <template #title>
+                    <div class="small-title">检验工序</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
+                    <el-row :gutter="20">
+                      <el-col :span="12">
+                        <el-form-item label="编码" prop="processCode">
+                          <el-input
+                            v-model="item.processCode"
+                            placeholder="根据系统生成"
+                            :disabled="true"
+                          />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="检验特性编号">
+                          <el-input
+                            v-model="item.inspectionFeatureCode"
+                            placeholder="根据系统生成"
+                            :disabled="true"
+                          />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="描述" prop="processDescribe">
+                          <el-input v-model="item.processDescribe" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="顺序号" prop="sequenceCode">
+                          <el-input v-model="item.sequenceCode" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                    </el-row>
+                  </el-form>
+                </el-collapse-item>
+                <el-collapse-item name="2">
+                  <template #title>
+                    <div class="small-title">检验特性</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+                    <div>
+                      <el-row :gutter="20">
+                        <el-col :span="12">
+                          <el-form-item label="编码">
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
+                              placeholder="根据系统生成"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="描述"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.description"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="检验方法"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
+                                "
+                                disabled
+                                placeholder="请选择检验方法"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="采样过程编码"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
+                                "
+                                disabled
+                                placeholder="请选择采样过程编码"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="样品份数"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
+                                disabled
+                                placeholder="请输入样品份数"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
 
-                <el-col :span="12">
-                  <el-form-item
-                    label="每份样品量"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                        disabled
-                        placeholder="请输入样品份数"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="是否允许修改特征值"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="结果录入方式"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                      placeholder="请选择结果录入方式"
-                      @change="resultEntryMethodChange($event, item)"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="特征类型"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
-                      placeholder="请选择特征类型"
-                      @change="changeFeatureType"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="每份样品量"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize
+                                "
+                                disabled
+                                placeholder="请输入样品份数"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="是否允许修改特征值"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                          >
+                            <el-switch
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                              disabled
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="结果录入方式"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
+                          >
+                            <el-select
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
+                              "
+                              placeholder="请选择结果录入方式"
+                              @change="resultEntryMethodChange($event, item)"
+                              disabled
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(
+                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
+                                )"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="特征类型"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
+                          >
+                            <el-select
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
+                              placeholder="请选择特征类型"
+                              @change="changeFeatureType"
+                              disabled
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(
+                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
+                                )"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
 
-                <el-col
-                  :span="12"
-                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                >
-                  <el-form-item
-                    label="是否设定上限"
-                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="12"
-                  v-if="
-                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                  "
-                >
-                  <el-form-item
-                    label="上限值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定上限"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                          "
+                        >
+                          <el-form-item
+                            label="上限值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                <el-col
-                  :span="12"
-                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                >
-                  <el-form-item
-                    label="是否设定下限"
-                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="12"
-                  v-if="
-                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                  "
-                >
-                  <el-form-item
-                    label="下限值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定下限"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                          "
+                        >
+                          <el-form-item
+                            label="下限值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                <el-col
-                  :span="12"
-                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                >
-                  <el-form-item
-                    label="是否设定目标值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="12"
-                  v-if="
-                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                  "
-                >
-                  <el-form-item
-                    label="目标值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定目标值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                          "
+                        >
+                          <el-form-item
+                            label="目标值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                <el-col :span="12">
-                  <el-form-item
-                    label="开始时间"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                  >
-                    <el-date-picker
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                      type="datetime"
-                      placeholder="请选择开始时间"
-                      style="width: 100%"
-                      value-format="x"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="结束时间"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                  >
-                    <el-date-picker
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                      type="datetime"
-                      placeholder="请选择结束时间"
-                      style="width: 100%"
-                      value-format="x"
-                    />
-                  </el-form-item>
-                </el-col>
-                <!-- 手动评估的时候显示 -->
-                <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                  <el-form-item
-                    label="评估代码"
-                    required
-                    prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                      placeholder="请选择评估代码"
-                      @change="changeFeatureType"
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="24"
-                  v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
-                    .recordInspectionQuantifyList"
-                  :key="i"
-                 
-                >
-                <div
-                  style="
-                    border: 1px solid #dedede;
-                    border-radius: 4px;
-                    padding-top: 16px;
-                    margin-bottom: 10px;
-                  ">
-                  <el-row :gutter="20">
-                    <!-- 汇总录入的时候显示 -->
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
-                    >
-                      <el-form-item label="合格数量" required>
-                        <el-input
-                          v-model="cur.qualifiedQuantity"
-                          placeholder="请输入合格数量"
-                          type="number"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
-                    >
-                      <el-form-item label="不合格数量" required>
-                        <el-input
-                          v-model="cur.unqualifiedQuantity"
-                          type="number"
-                          placeholder="请输入不合格数量"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'"
-                    >
-                      <el-form-item label="检验值" required>
-                        <el-input
-                          v-model="cur.inspectionValue"
-                          placeholder="请输入检验值"
-                          type="number"
-                          @blur="inspectionValueInput(item, cur)"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'"
-                    >
-                      <el-form-item label="选定集" required>
-                        <el-select
-                          v-model="cur.qualitativeCode"
-                          placeholder="请选择选定集"
-                          @change="changeQualitativeCode($event, item, cur)"
+                        <el-col :span="12">
+                          <el-form-item
+                            label="开始时间"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
+                          >
+                            <el-date-picker
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
+                              "
+                              type="datetime"
+                              placeholder="请选择开始时间"
+                              style="width: 100%"
+                              value-format="x"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="结束时间"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
+                          >
+                            <el-date-picker
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
+                              "
+                              type="datetime"
+                              placeholder="请选择结束时间"
+                              style="width: 100%"
+                              value-format="x"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <!-- 手动评估的时候显示 -->
+                        <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
+                          <el-form-item
+                            label="评估代码"
+                            required
+                            prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                          >
+                            <el-select
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                              placeholder="请选择评估代码"
+                              @change="changeFeatureType"
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
+                    </div>
+                  </el-form>
+                </el-collapse-item>
+                <el-collapse-item name="3">
+                  <template #title>
+                    <div class="small-title">检验结果</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+                    <div>
+                      <el-row :gutter="20">
+                        <el-col
+                          :span="24"
+                          v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
+                            .recordInspectionQuantifyList"
+                          :key="i"
                         >
-                          <el-option
-                            v-for="dict in item.selectedProjectRespVOList"
-                            :key="dict.dictionaryValue"
-                            :label="dict.dictionaryLabel"
-                            :value="dict.dictionaryValue"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                      <el-col
-                      :span="12"
-                    >
-                      <el-form-item label="备注">
-                        <el-input
-                          v-model="cur.remark"
-                          placeholder="请输入备注"
-                          type="text" maxlength="200"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
+                          <div
+                            style="
+                              border: 1px solid #dedede;
+                              border-radius: 4px;
+                              padding-top: 16px;
+                              margin-bottom: 10px;
+                            "
+                          >
+                            <el-row :gutter="20">
+                              <!-- 汇总录入的时候显示 -->
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
+                                  1
+                                "
+                              >
+                                <el-form-item label="合格数量" required>
+                                  <el-input
+                                    v-model="cur.qualifiedQuantity"
+                                    placeholder="请输入合格数量"
+                                    type="number"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
+                                  1
+                                "
+                              >
+                                <el-form-item label="不合格数量" required>
+                                  <el-input
+                                    v-model="cur.unqualifiedQuantity"
+                                    type="number"
+                                    placeholder="请输入不合格数量"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'
+                                "
+                              >
+                                <el-form-item label="检验值" required>
+                                  <el-input
+                                    v-model="cur.inspectionValue"
+                                    placeholder="请输入检验值"
+                                    type="number"
+                                    @blur="inspectionValueInput(item, cur)"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'
+                                "
+                              >
+                                <el-form-item label="选定集" required>
+                                  <el-select
+                                    v-model="cur.qualitativeCode"
+                                    placeholder="请选择选定集"
+                                    @change="changeQualitativeCode($event, item, cur)"
+                                  >
+                                    <el-option
+                                      v-for="dict in item.selectedProjectRespVOList"
+                                      :key="dict.dictionaryValue"
+                                      :label="dict.dictionaryLabel"
+                                      :value="dict.dictionaryValue"
+                                    />
+                                  </el-select>
+                                </el-form-item>
+                              </el-col>
+                              <el-col :span="12">
+                                <el-form-item label="备注">
+                                  <el-input
+                                    v-model="cur.remark"
+                                    placeholder="请输入备注"
+                                    type="text"
+                                    maxlength="200"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
                       <el-form-item label="缺陷级别" required>
                         <el-select v-model="cur.defectLevel" placeholder="请选择缺陷级别" disabled>
                           <el-option v-for="dict in getStrDictOptions(DICT_TYPE.DEFECT_LEVEL)" :key="dict.value" :label="dict.label" :value="dict.value" />
                         </el-select>
                       </el-form-item>
                     </el-col> -->
-                  </el-row>
-                  </div>
-                </el-col>
-              </el-row>
-            </div>
-            </el-form>
+                            </el-row>
+                          </div>
+                        </el-col>
+                      </el-row>
+                    </div>
+                  </el-form>
+                </el-collapse-item>
+              </el-collapse>
             </div>
           </el-tab-pane>
         </el-tabs>
-        
       </div>
       <template #footer>
         <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
@@ -681,7 +730,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     data.value = JSON.parse(JSON.stringify(row))
     //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
     let list = []
-    const masterId = row.jobId ||row.id
+    const masterId = row.jobId || row.id
     list = await InspectionJobDetailPageApi.getInspectionJobDetailList(masterId)
     data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(masterId)
     list.forEach((item, index) => {
@@ -1361,84 +1410,114 @@ const boxList = ref()
 //   })
 // }
 const inspectionValueInput = (item, cur) => {
-  for ( let i = 0;i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;i++) {
-    item.isPass = true
-//  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
-  if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
-  ) {
-    item.isPass = false
-    return
-  } 
-  // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
-  if (
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
-  ) {
-    item.isPass = false
-    return
-  }
-  // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
-  if (
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
-  ) {
-    item.isPass = false
-    return
-  }
-   // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
-   if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-   ( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-  ) {
-    item.isPass = false
-    return
-  }
-  // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
-  if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    (parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)||
-    parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
-  ) {
-    item.isPass = false
-    return
-  }
-   // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
-   if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    (parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)||
-    parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+  for (
+    let i = 0;
+    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;
+    i++
   ) {
-    item.isPass = false
-    return
-  }
+    item.isPass = true
+    //  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
+    if (
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
+    if (
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      (parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+        parseFloat(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+            .inspectionValue
+        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      (parseFloat(cur.inspectionValue) >
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+        parseFloat(cur.inspectionValue) <
+          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      (parseFloat(cur.inspectionValue) >
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
+        parseFloat(cur.inspectionValue) <
+          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+    ) {
+      item.isPass = false
+      return
+    }
     // 如果上限值和下限值,目标值存在 大于上限并且小于下限值显示红色图标
     if (
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-      parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      (parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+        parseFloat(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+            .inspectionValue
+        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
     ) {
       item.isPass = false
       return
@@ -1453,8 +1532,8 @@ const inspectionValueInput = (item, cur) => {
   color: #1a8bfc;
   font-size: 16px;
 }
-.tabs-box{
-  max-height:calc(80vh - 40px) ;
+.tabs-box {
+  max-height: calc(80vh - 40px);
   overflow-x: hidden;
   overflow-y: auto;
 }
diff --git a/src/views/qms/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue
index c627fede3..6ca773464 100644
--- a/src/views/qms/inspectionRecord/addForm.vue
+++ b/src/views/qms/inspectionRecord/addForm.vue
@@ -35,7 +35,7 @@
             />
           </div>
         </div>
-        
+
         <el-tabs
           v-model="editableTabsValue"
           class="demo-tabs"
@@ -71,421 +71,470 @@
               </span>
             </template>
             <div class="tabs-box">
-            <div class="small-title">检验工序</div>
-            <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码" prop="processCode">
-                    <el-input
-                      v-model="item.processCode"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="检验特性编号">
-                    <el-input
-                      v-model="item.inspectionFeatureCode"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="描述" prop="processDescribe">
-                    <el-input v-model="item.processDescribe" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="顺序号" prop="sequenceCode">
-                    <el-input v-model="item.sequenceCode" :disabled="true" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div class="small-title">检验特性</div>
-            <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-            <div>
-                <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="编码">
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
-                      placeholder="根据系统生成"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="描述"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.description"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="检验方法"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName"
-                        disabled
-                        placeholder="请选择检验方法"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="采样过程编码"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName"
-                        disabled
-                        placeholder="请选择采样过程编码"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="样品份数"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
-                        disabled
-                        placeholder="请输入样品份数"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
+              <el-collapse accordion>
+                <el-collapse-item name="1">
+                  <template #title>
+                    <div class="small-title">检验工序</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
+                    <el-row :gutter="20">
+                      <el-col :span="12">
+                        <el-form-item label="编码" prop="processCode">
+                          <el-input
+                            v-model="item.processCode"
+                            placeholder="根据系统生成"
+                            :disabled="true"
+                          />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="检验特性编号">
+                          <el-input
+                            v-model="item.inspectionFeatureCode"
+                            placeholder="根据系统生成"
+                            :disabled="true"
+                          />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="描述" prop="processDescribe">
+                          <el-input v-model="item.processDescribe" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="顺序号" prop="sequenceCode">
+                          <el-input v-model="item.sequenceCode" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                    </el-row>
+                  </el-form>
+                </el-collapse-item>
+                <el-collapse-item name="2">
+                  <template #title>
+                    <div class="small-title">检验特性</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+                    <div>
+                      <el-row :gutter="20">
+                        <el-col :span="12">
+                          <el-form-item label="编码">
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
+                              placeholder="根据系统生成"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="描述"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.description"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="检验方法"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
+                                "
+                                disabled
+                                placeholder="请选择检验方法"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="采样过程编码"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
+                                "
+                                disabled
+                                placeholder="请选择采样过程编码"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="样品份数"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="item.inspectionJobCharacteristicsUpdateReqVO.sampleQty"
+                                disabled
+                                placeholder="请输入样品份数"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
 
-                <el-col :span="12">
-                  <el-form-item
-                    label="每份样品量"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                        disabled
-                        placeholder="请输入样品份数"
-                      />
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="是否允许修改特征值"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                      disabled
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="结果录入方式"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                      placeholder="请选择结果录入方式"
-                      @change="resultEntryMethodChange($event, item)"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="特征类型"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
-                      placeholder="请选择特征类型"
-                      @change="changeFeatureType"
-                      disabled
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(
-                          DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                        )"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="每份样品量"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize
+                                "
+                                disabled
+                                placeholder="请输入样品份数"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="是否允许修改特征值"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                          >
+                            <el-switch
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                              disabled
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="结果录入方式"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
+                          >
+                            <el-select
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
+                              "
+                              placeholder="请选择结果录入方式"
+                              @change="resultEntryMethodChange($event, item)"
+                              disabled
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(
+                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
+                                )"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="特征类型"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
+                          >
+                            <el-select
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
+                              placeholder="请选择特征类型"
+                              @change="changeFeatureType"
+                              disabled
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(
+                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
+                                )"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
 
-                <el-col
-                  :span="12"
-                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                >
-                  <el-form-item
-                    label="是否设定上限"
-                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="12"
-                  v-if="
-                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                  "
-                >
-                  <el-form-item
-                    label="上限值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定上限"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                          "
+                        >
+                          <el-form-item
+                            label="上限值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                <el-col
-                  :span="12"
-                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                >
-                  <el-form-item
-                    label="是否设定下限"
-                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="12"
-                  v-if="
-                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                  "
-                >
-                  <el-form-item
-                    label="下限值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定下限"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                          "
+                        >
+                          <el-form-item
+                            label="下限值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                <el-col
-                  :span="12"
-                  v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                >
-                  <el-form-item
-                    label="是否设定目标值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                  >
-                    <el-switch
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="12"
-                  v-if="
-                    item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                  "
-                >
-                  <el-form-item
-                    label="目标值"
-                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  >
-                    <el-input
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
-                      :disabled="true"
-                    />
-                  </el-form-item>
-                </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定目标值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                          "
+                        >
+                          <el-form-item
+                            label="目标值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                <el-col :span="12">
-                  <el-form-item
-                    label="开始时间"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                  >
-                    <el-date-picker
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                      type="datetime"
-                      placeholder="请选择开始时间"
-                      style="width: 100%"
-                      value-format="x"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="结束时间"
-                    prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                  >
-                    <el-date-picker
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                      type="datetime"
-                      placeholder="请选择结束时间"
-                      style="width: 100%"
-                      value-format="x"
-                    />
-                  </el-form-item>
-                </el-col>
-                <!-- 手动评估的时候显示 -->
-                <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                  <el-form-item
-                    label="评估代码"
-                    required
-                    prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                  >
-                    <el-select
-                      v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                      placeholder="请选择评估代码"
-                      @change="changeFeatureType"
-                    >
-                      <el-option
-                        v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col
-                  :span="24"
-                  v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
-                    .recordInspectionQuantifyList"
-                  :key="i"
-                 
-                >
-                <div
-                  style="
-                    border: 1px solid #dedede;
-                    border-radius: 4px;
-                    padding-top: 16px;
-                    margin-bottom: 10px;
-                  ">
-                  <el-row :gutter="20">
-                    <!-- 汇总录入的时候显示 -->
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
-                    >
-                      <el-form-item label="合格数量" required>
-                        <el-input
-                          v-model="cur.qualifiedQuantity"
-                          placeholder="请输入合格数量"
-                          type="number"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1"
-                    >
-                      <el-form-item label="不合格数量" required>
-                        <el-input
-                          v-model="cur.unqualifiedQuantity"
-                          type="number"
-                          placeholder="请输入不合格数量"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'"
-                    >
-                      <el-form-item label="检验值" required>
-                        <el-input
-                          v-model="cur.inspectionValue"
-                          placeholder="请输入检验值"
-                          type="number"
-                          @blur="inspectionValueInput(item, cur)"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'"
-                    >
-                      <el-form-item label="选定集" required>
-                        <el-select
-                          v-model="cur.qualitativeCode"
-                          placeholder="请选择选定集"
-                          @change="changeQualitativeCode($event, item, cur)"
+                        <el-col :span="12">
+                          <el-form-item
+                            label="开始时间"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
+                          >
+                            <el-date-picker
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
+                              "
+                              type="datetime"
+                              placeholder="请选择开始时间"
+                              style="width: 100%"
+                              value-format="x"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="结束时间"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
+                          >
+                            <el-date-picker
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
+                              "
+                              type="datetime"
+                              placeholder="请选择结束时间"
+                              style="width: 100%"
+                              value-format="x"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <!-- 手动评估的时候显示 -->
+                        <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
+                          <el-form-item
+                            label="评估代码"
+                            required
+                            prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                          >
+                            <el-select
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                              placeholder="请选择评估代码"
+                              @change="changeFeatureType"
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
+                    </div>
+                  </el-form>
+                </el-collapse-item>
+                <el-collapse-item name="3">
+                  <template #title>
+                    <div class="small-title">检验结果</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+                    <div>
+                      <el-row :gutter="20">
+                        <el-col
+                          :span="24"
+                          v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
+                            .recordInspectionQuantifyList"
+                          :key="i"
                         >
-                          <el-option
-                            v-for="dict in item.selectedProjectRespVOList"
-                            :key="dict.dictionaryValue"
-                            :label="dict.dictionaryLabel"
-                            :value="dict.dictionaryValue"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                      <el-col
-                      :span="12"
-                    >
-                      <el-form-item label="备注">
-                        <el-input
-                          v-model="cur.remark"
-                          placeholder="请输入备注"
-                          type="text" maxlength="200"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
+                          <div
+                            style="
+                              border: 1px solid #dedede;
+                              border-radius: 4px;
+                              padding-top: 16px;
+                              margin-bottom: 10px;
+                            "
+                          >
+                            <el-row :gutter="20">
+                              <!-- 汇总录入的时候显示 -->
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
+                                  1
+                                "
+                              >
+                                <el-form-item label="合格数量" required>
+                                  <el-input
+                                    v-model="cur.qualifiedQuantity"
+                                    placeholder="请输入合格数量"
+                                    type="number"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod ==
+                                  1
+                                "
+                              >
+                                <el-form-item label="不合格数量" required>
+                                  <el-input
+                                    v-model="cur.unqualifiedQuantity"
+                                    type="number"
+                                    placeholder="请输入不合格数量"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'
+                                "
+                              >
+                                <el-form-item label="检验值" required>
+                                  <el-input
+                                    v-model="cur.inspectionValue"
+                                    placeholder="请输入检验值"
+                                    type="number"
+                                    @blur="inspectionValueInput(item, cur)"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <el-col
+                                :span="12"
+                                v-if="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'
+                                "
+                              >
+                                <el-form-item label="选定集" required>
+                                  <el-select
+                                    v-model="cur.qualitativeCode"
+                                    placeholder="请选择选定集"
+                                    @change="changeQualitativeCode($event, item, cur)"
+                                  >
+                                    <el-option
+                                      v-for="dict in item.selectedProjectRespVOList"
+                                      :key="dict.dictionaryValue"
+                                      :label="dict.dictionaryLabel"
+                                      :value="dict.dictionaryValue"
+                                    />
+                                  </el-select>
+                                </el-form-item>
+                              </el-col>
+                              <el-col :span="12">
+                                <el-form-item label="备注">
+                                  <el-input
+                                    v-model="cur.remark"
+                                    placeholder="请输入备注"
+                                    type="text"
+                                    maxlength="200"
+                                  />
+                                </el-form-item>
+                              </el-col>
+                              <!-- <el-col :span="12" v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'" >
                       <el-form-item label="缺陷级别" required>
                         <el-select v-model="cur.defectLevel" placeholder="请选择缺陷级别" disabled>
                           <el-option v-for="dict in getStrDictOptions(DICT_TYPE.DEFECT_LEVEL)" :key="dict.value" :label="dict.label" :value="dict.value" />
                         </el-select>
                       </el-form-item>
                     </el-col> -->
-                  </el-row>
-                  </div>
-                </el-col>
-              </el-row>
-            </div>
-            </el-form>
+                            </el-row>
+                          </div>
+                        </el-col>
+                      </el-row>
+                    </div>
+                  </el-form>
+                </el-collapse-item>
+              </el-collapse>
             </div>
           </el-tab-pane>
         </el-tabs>
-        
       </div>
       <template #footer>
         <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
@@ -524,7 +573,7 @@ import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain
 import * as InspectionJobPackageApi from '@/api/qms/inspectionJob/InspectionJobPackage/InspectionJobPackage'
 import * as InspectionRecordDetailPageApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
 
-  import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
+import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
 const { proxy } = getCurrentInstance()
 
 const message = useMessage() // 消息弹窗
@@ -683,9 +732,11 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     data.value = JSON.parse(JSON.stringify(row))
     //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
     let list = []
-    const masterId =row.id
-      list = await InspectionRecordDetailPageApi.getInspectionRecordDetailList(row.id)
-    data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(masterId)
+    const masterId = row.id
+    list = await InspectionRecordDetailPageApi.getInspectionRecordDetailList(row.id)
+    data.value.packageList = await InspectionRecordPackageApi.getInspectionRecordPackageList(
+      masterId
+    )
     list.forEach((item, index) => {
       editableTabsValue.value = 1
       item.name = index + 1
@@ -699,7 +750,10 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
         ).toFixed(6)
       )
       // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-      item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList = item.inspectionRecordCharacteristicsRespVO.featureType == 1 ? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList : item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList
+      item.inspectionRecordCharacteristicsRespVO.recordInspectionQuantifyList =
+        item.inspectionRecordCharacteristicsRespVO.featureType == 1
+          ? item.inspectionRecordCharacteristicsRespVO.qualitativeRespVOList
+          : item.inspectionRecordCharacteristicsRespVO.quantifyRespVOList
       if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) {
         // 单个录入时
         if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 2) {
@@ -1364,84 +1418,114 @@ const boxList = ref()
 //   })
 // }
 const inspectionValueInput = (item, cur) => {
-  for ( let i = 0;i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;i++) {
-    item.isPass = true
-//  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
-  if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
-  ) {
-    item.isPass = false
-    return
-  } 
-  // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
-  if (
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
-  ) {
-    item.isPass = false
-    return
-  }
-  // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
-  if (
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
-  ) {
-    item.isPass = false
-    return
-  }
-   // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
-   if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-   ( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-    parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-  ) {
-    item.isPass = false
-    return
-  }
-  // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
-  if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-    (parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)||
-    parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
-  ) {
-    item.isPass = false
-    return
-  }
-   // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
-   if (
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
-    !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
-    item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-    (parseFloat(cur.inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)||
-    parseFloat(cur.inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+  for (
+    let i = 0;
+    i < item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.length;
+    i++
   ) {
-    item.isPass = false
-    return
-  }
+    item.isPass = true
+    //  如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping)
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果下限值存在,上限值和目标值不存在 小于下限值显示红色图标
+    if (
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果目标值存在,上限值和下限值不存在 小于目标值显示红色图标
+    if (
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) != parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果上限值和下限值存在,目标值不存在 大于上限并且小于下限值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      (parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+        parseFloat(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+            .inspectionValue
+        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果上限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      (parseFloat(cur.inspectionValue) >
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+        parseFloat(cur.inspectionValue) <
+          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget))
+    ) {
+      item.isPass = false
+      return
+    }
+    // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标
+    if (
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
+      !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
+      item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
+      (parseFloat(cur.inspectionValue) >
+        parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) ||
+        parseFloat(cur.inspectionValue) <
+          parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+    ) {
+      item.isPass = false
+      return
+    }
     // 如果上限值和下限值,目标值存在 大于上限并且小于下限值显示红色图标
     if (
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping &&
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit &&
       item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget &&
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue&&
-      (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
-      parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+        .inspectionValue &&
+      (parseFloat(
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue
+      ) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) ||
+        parseFloat(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+            .inspectionValue
+        ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
     ) {
       item.isPass = false
       return
@@ -1456,8 +1540,8 @@ const inspectionValueInput = (item, cur) => {
   color: #1a8bfc;
   font-size: 16px;
 }
-.tabs-box{
-  max-height:calc(80vh - 40px) ;
+.tabs-box {
+  max-height: calc(80vh - 40px);
   overflow-x: hidden;
   overflow-y: auto;
 }
diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue
index d4fed9f00..fd5b0390e 100644
--- a/src/views/qms/inspectionRecordFirst/addForm.vue
+++ b/src/views/qms/inspectionRecordFirst/addForm.vue
@@ -139,322 +139,353 @@
               </span>
             </template>
             <div class="tabs-box">
-              <div class="small-title">检验工序</div>
-              <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="编码" prop="processCode">
-                      <el-input
-                        v-model="item.processCode"
-                        placeholder="根据系统生成"
-                        :disabled="true"
-                      />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="检验特性编号">
-                      <el-input
-                        v-model="item.inspectionFeatureCode"
-                        placeholder="根据系统生成"
-                        :disabled="true"
-                      />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="描述" prop="processDescribe">
-                      <el-input v-model="item.processDescribe" :disabled="true" />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="顺序号" prop="sequenceCode">
-                      <el-input v-model="item.sequenceCode" :disabled="true" />
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-              </el-form>
-              <div class="small-title">检验特性</div>
-              <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
-                <div>
-                  <el-row :gutter="20">
-                    <el-col :span="12">
-                      <el-form-item label="编码">
-                        <el-input
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
-                          placeholder="根据系统生成"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="描述"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.description"
-                      >
-                        <el-input
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="检验方法"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
-                      >
-                        <div style="display: flex; width: 100%">
+              <el-collapse accordion>
+                <el-collapse-item name="1">
+                  <template #title>
+                    <div class="small-title">检验工序</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formProcessRef">
+                    <el-row :gutter="20">
+                      <el-col :span="12">
+                        <el-form-item label="编码" prop="processCode">
                           <el-input
-                            v-model="
-                              item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
-                            "
-                            disabled
-                            placeholder="请选择检验方法"
+                            v-model="item.processCode"
+                            placeholder="根据系统生成"
+                            :disabled="true"
                           />
-                        </div>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="采样过程编码"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
-                      >
-                        <div style="display: flex; width: 100%">
-                          <el-input
-                            v-model="
-                              item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
-                            "
-                            disabled
-                            placeholder="请选择采样过程编码"
-                          />
-                        </div>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="样品份数" prop="samplingProcessRespVO.sampleQty">
-                        <div style="display: flex; width: 100%">
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="检验特性编号">
                           <el-input
-                            v-model="item.samplingProcessRespVO.sampleQty"
-                            disabled
-                            placeholder="请输入样品份数"
+                            v-model="item.inspectionFeatureCode"
+                            placeholder="根据系统生成"
+                            :disabled="true"
                           />
-                        </div>
-                      </el-form-item>
-                    </el-col>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="描述" prop="processDescribe">
+                          <el-input v-model="item.processDescribe" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="顺序号" prop="sequenceCode">
+                          <el-input v-model="item.sequenceCode" :disabled="true" />
+                        </el-form-item>
+                      </el-col>
+                    </el-row>
+                  </el-form>
+                </el-collapse-item>
+                <el-collapse-item name="2">
+                  <template #title>
+                    <div class="small-title">检验特性</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
+                    <div>
+                      <el-row :gutter="20">
+                        <el-col :span="12">
+                          <el-form-item label="编码">
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.number"
+                              placeholder="根据系统生成"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="描述"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.description"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="检验方法"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionMethodCode"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.inspectionMethodName
+                                "
+                                disabled
+                                placeholder="请选择检验方法"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="采样过程编码"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.samplingProcessCode"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="
+                                  item.inspectionJobCharacteristicsUpdateReqVO.samplingProcessName
+                                "
+                                disabled
+                                placeholder="请选择采样过程编码"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item label="样品份数" prop="samplingProcessRespVO.sampleQty">
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="item.samplingProcessRespVO.sampleQty"
+                                disabled
+                                placeholder="请输入样品份数"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
 
-                    <el-col :span="12">
-                      <el-form-item
-                        label="每份样品量"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
-                      >
-                        <div style="display: flex; width: 100%">
-                          <el-input
-                            v-model="data.samplePieceSize"
-                            disabled
-                            placeholder="请输入样品份数"
-                          />
-                        </div>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="是否允许修改特征值"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                      >
-                        <el-switch
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
-                          disabled
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="结果录入方式"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                      >
-                        <el-select
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
-                          placeholder="请选择结果录入方式"
-                          @change="resultEntryMethodChange($event, item)"
-                          disabled
+                        <el-col :span="12">
+                          <el-form-item
+                            label="每份样品量"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
+                          >
+                            <div style="display: flex; width: 100%">
+                              <el-input
+                                v-model="data.samplePieceSize"
+                                disabled
+                                placeholder="请输入样品份数"
+                              />
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="是否允许修改特征值"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                          >
+                            <el-switch
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.isCanUpdate"
+                              disabled
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="结果录入方式"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod"
+                          >
+                            <el-select
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod
+                              "
+                              placeholder="请选择结果录入方式"
+                              @change="resultEntryMethodChange($event, item)"
+                              disabled
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(
+                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
+                                )"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="特征类型"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
+                          >
+                            <el-select
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
+                              placeholder="请选择特征类型"
+                              @change="changeFeatureType"
+                              disabled
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(
+                                  DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
+                                )"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
                         >
-                          <el-option
-                            v-for="dict in getStrDictOptions(
-                              DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                            )"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="特征类型"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.featureType"
-                      >
-                        <el-select
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.featureType"
-                          placeholder="请选择特征类型"
-                          @change="changeFeatureType"
-                          disabled
+                          <el-form-item
+                            label="是否设定上限"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
+                          "
                         >
-                          <el-option
-                            v-for="dict in getStrDictOptions(
-                              DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                            )"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                    >
-                      <el-form-item
-                        label="是否设定上限"
-                        prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                      >
-                        <el-switch
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="
-                        item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                        item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping
-                      "
-                    >
-                      <el-form-item
-                        label="上限值"
-                        prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                      >
-                        <el-input
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
-
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                    >
-                      <el-form-item
-                        label="是否设定下限"
-                        prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                      >
-                        <el-switch
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="
-                        item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                        item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
-                      "
-                    >
-                      <el-form-item
-                        label="下限值"
-                        prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                      >
-                        <el-input
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
+                          <el-form-item
+                            label="上限值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                    <el-col
-                      :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
-                    >
-                      <el-form-item
-                        label="是否设定目标值"
-                        prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                      >
-                        <el-switch
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col
-                      :span="12"
-                      v-if="
-                        item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
-                        item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
-                      "
-                    >
-                      <el-form-item
-                        label="目标值"
-                        prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                      >
-                        <el-input
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
-                          :disabled="true"
-                        />
-                      </el-form-item>
-                    </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
+                        >
+                          <el-form-item
+                            label="是否设定下限"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit
+                          "
+                        >
+                          <el-form-item
+                            label="下限值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
 
-                    <el-col :span="12">
-                      <el-form-item
-                        label="开始时间"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                      >
-                        <el-date-picker
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
-                          type="datetime"
-                          placeholder="请选择开始时间"
-                          style="width: 100%"
-                          value-format="x"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item
-                        label="结束时间"
-                        prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                      >
-                        <el-date-picker
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
-                          type="datetime"
-                          placeholder="请选择结束时间"
-                          style="width: 100%"
-                          value-format="x"
-                        />
-                      </el-form-item>
-                    </el-col>
-                    <!-- 手动评估的时候显示 -->
-                    <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                      <el-form-item
-                        label="评估代码"
-                        required
-                        prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                      >
-                        <el-select
-                          v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
-                          placeholder="请选择评估代码"
-                          @change="changeFeatureType"
+                        <el-col
+                          :span="12"
+                          v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
                         >
-                          <el-option
-                            v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
+                          <el-form-item
+                            label="是否设定目标值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                          >
+                            <el-switch
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                              "
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col
+                          :span="12"
+                          v-if="
+                            item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0 &&
+                            item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget
+                          "
+                        >
+                          <el-form-item
+                            label="目标值"
+                            prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                          >
+                            <el-input
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget"
+                              :disabled="true"
+                            />
+                          </el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                          <el-form-item
+                            label="开始时间"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime"
+                          >
+                            <el-date-picker
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime
+                              "
+                              type="datetime"
+                              placeholder="请选择开始时间"
+                              style="width: 100%"
+                              value-format="x"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item
+                            label="结束时间"
+                            prop="inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime"
+                          >
+                            <el-date-picker
+                              v-model="
+                                item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime
+                              "
+                              type="datetime"
+                              placeholder="请选择结束时间"
+                              style="width: 100%"
+                              value-format="x"
+                            />
+                          </el-form-item>
+                        </el-col>
+                        <!-- 手动评估的时候显示 -->
+                        <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
+                          <el-form-item
+                            label="评估代码"
+                            required
+                            prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                          >
+                            <el-select
+                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode"
+                              placeholder="请选择评估代码"
+                              @change="changeFeatureType"
+                            >
+                              <el-option
+                                v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              />
+                            </el-select>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
+                    </div>
+                  </el-form>
+                </el-collapse-item>
+                <el-collapse-item name="3">
+                  <template #title>
+                    <div class="small-title">检验结果</div>
+                  </template>
+                  <el-form :model="item" label-width="auto" :rules="rules" ref="formFeaturesRef">
                     <el-col
                       :span="24"
                       v-for="(cur, i) in item.inspectionJobCharacteristicsUpdateReqVO
@@ -551,9 +582,9 @@
                         </el-row>
                       </div>
                     </el-col>
-                  </el-row>
-                </div>
-              </el-form>
+                  </el-form>
+                </el-collapse-item>
+              </el-collapse>
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -1081,12 +1112,12 @@ const opensearchItemsTable = () => {
       column: 'type',
       action: 'in',
       value: 'BCP,CCP'
-    },
-    {
-      column: 'status',
-      action: 'in',
-      value: 'ENABLE'
     }
+    // {
+    //   column: 'status',
+    //   action: 'in',
+    //   value: 'ENABLE'
+    // }
   )
   // 参数整理
   _searchCondition.isSearch = true
@@ -1178,7 +1209,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
       data.value.inspectionSchemeCode = InspectionSchemeObj?.code || ''
       if (!data.value.inspectionSchemeCode) {
         data.value.subList = []
-        return;
+        return
       }
       let list = await InspectionJobDetailApi.getBySchemeCode(data.value.inspectionSchemeCode)
       editableTabsValue.value = 1
@@ -1551,15 +1582,15 @@ const onItemBlur = async (field, pageApi) => {
     if (obj) {
       // data.value['itemName'] = obj.name
       // data.value['desc1'] = obj.desc1
-      // const searchTableSuccess = async(formField, searchField, val, type, row) 
-      searchTableSuccess(field,'code',array.list,'main')
+      // const searchTableSuccess = async(formField, searchField, val, type, row)
+      searchTableSuccess(field, 'code', array.list, 'main')
     } else {
       message.alert('暂无数据')
       data.value[field] = ''
       data.value['itemName'] = ''
       data.value['desc1'] = ''
       data.value['inspectionSchemeCode'] = ''
-      data.value.subList =[]
+      data.value.subList = []
     }
   } else {
     data.value[field] = ''
@@ -1611,12 +1642,12 @@ const onInspectionSchemeBlur = async (field, pageApi) => {
     count.value++
     const obj = array.list[0]
     if (obj) {
-      searchTableSuccess(field,'code',array.list,'main')
+      searchTableSuccess(field, 'code', array.list, 'main')
     } else {
       message.alert('暂无数据')
       data.value[field] = ''
       data.value['inspectionSchemeName'] = ''
-      data.value.subList =[]
+      data.value.subList = []
     }
   } else {
     data.value['inspectionSchemeName'] = ''