diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
index 13f5fe8cd..d41d922db 100644
--- a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue
@@ -1,542 +1,582 @@
 <template>
   <div>
-  <Dialog
-    :title="dialogTitle"
-    v-model="dialogVisible"
-    :width="dialogWidth"
-    :close-on-click-modal="false"
-    :vLoading="formLoading"
-  >
-    <div style="max-height: 60vh; overflow-y: auto; padding: 0px 20px">
-      <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
-        <el-row gutter="20">
-          <el-col :span="12">
-            <el-form-item label="编码" prop="code">
-              <el-input v-model="data.code" placeholder="根据系统生成" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="物料编码" prop="itemCode">
-              <div style="display: flex; width: 100%">
-                <el-input v-model="data.itemCode" disabled placeholder="请选择物料编码" />
-                <el-button
-                  type="info"
-                  plain
-                  style="width: 40px"
-                  @click="
-                    opensearchTable(
-                      'itemCode',
-                      null,
-                      '物料编码',
-                      Itembasic.allSchemas,
-                      ItemBasicApi.getItembasicPage,
-                      null,
-                      false,
-                      'form',
-                      null
-                    )
-                  "
-                  ><Icon icon="ep:search" />
-                </el-button>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="版本" prop="version">
-              <el-input v-model="data.version" placeholder="请填写版本" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="检验类型编码" prop="testTypeCode">
-              <div style="display: flex; width: 100%">
-                <el-input v-model="data.testTypeCode" disabled placeholder="请选择检验类型编码" />
-                <el-button
-                  type="info"
-                  plain
-                  style="width: 40px"
-                  @click="
-                    opensearchTable(
-                      'testTypeCode',
-                      null,
-                      '检验类型',
-                      SamplingProcess.allSchemas,
-                      SamplingProcessApi.getSamplingProcessPage,
-                      null,
-                      false,
-                      'form',
-                      null
-                    )
-                  "
-                  ><Icon icon="ep:search" />
-                </el-button>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="检验模板编码" prop="programmeTemplateCode">
-              <div style="display: flex; width: 100%">
-                <el-input
-                  v-model="data.programmeTemplateCode"
-                  disabled
-                  placeholder="请选择检验模板编码"
-                />
-                <el-button
-                  type="info"
-                  plain
-                  style="width: 40px"
-                  @click="
-                    opensearchTable(
-                      'programmeTemplateCode',
-                      null,
-                      '检验模板编码',
-                      InspectionTemplateMain.allSchemas,
-                      InspectionTemplateApi.inspectionTemplatePage,
-                      null,
-                      false,
-                      'form',
-                      null
-                    )
-                  "
-                  ><Icon icon="ep:search" />
-                </el-button>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="拆分规则" prop="splitRule">
-              <el-select v-model="data.splitRule" placeholder="请选择拆分规则">
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.SPLIT_RULES)"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="aql" prop="aql">
-              <el-select v-model="data.aql" placeholder="请选择aql">
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.BASIC_AQL)"
-                  :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="inspectionLevel">
-              <el-select v-model="data.inspectionLevel" placeholder="请选择检验水平">
-                <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_LEVEL)"
-                  :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="effectiveDate">
-              <el-date-picker
-                v-model="data.effectiveDate"
-                type="datetime"
-                placeholder="请选择生效时间"
-                style="width: 100%"
-                value-format="x"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="失效时间" prop="expirationDate">
-              <el-date-picker
-                v-model="data.expirationDate"
-                type="datetime"
-                placeholder="请选择失效时间"
-                style="width: 100%"
-                value-format="x"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否可用" prop="available">
-              <el-switch v-model="data.available" active-value="TRUE" inactive-value='FALSE'/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <el-tabs
-        v-model="editableTabsValue"
-        editable
-        class="demo-tabs"
-        @edit="handleTabsEdit"
-        type="border-card"
-        tab-position="left"
-        :stretch="false"
-      >
-        <el-tab-pane
-          v-for="item in data.process"
-          :key="item.name"
-          :label="item.description"
-          :name="item.name"
-        >
-          <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="code">
-                  <el-input v-model="item.code" placeholder="根据系统生成" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="检验方案模板编码">
+    <Dialog
+      :title="dialogTitle"
+      v-model="dialogVisible"
+      :width="dialogWidth"
+      :close-on-click-modal="false"
+      :vLoading="formLoading"
+    >
+      <div style="max-height: 60vh; overflow-y: auto; padding: 0px 20px">
+        <el-form :model="data" label-width="auto" :rules="rules" ref="formMainRef">
+          <el-row gutter="20">
+            <el-col :span="12">
+              <el-form-item label="编码" prop="code">
+                <el-input v-model="data.code" placeholder="根据系统生成" :disabled="true" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="物料编码" prop="itemCode">
+                <div style="display: flex; width: 100%">
+                  <el-input v-model="data.itemCode" disabled placeholder="请选择物料编码" />
+                  <el-button
+                    type="info"
+                    plain
+                    style="width: 40px"
+                    @click="
+                      opensearchTable(
+                        'itemCode',
+                        null,
+                        '物料编码',
+                        Itembasic.allSchemas,
+                        ItemBasicApi.getItembasicPage,
+                        null,
+                        false,
+                        'form',
+                        null
+                      )
+                    "
+                    ><Icon icon="ep:search" />
+                  </el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="版本" prop="version">
+                <el-input v-model="data.version" placeholder="请填写版本" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="检验类型编码" prop="testTypeCode">
+                <div style="display: flex; width: 100%">
+                  <el-input v-model="data.testTypeCode" disabled placeholder="请选择检验类型编码" />
+                  <el-button
+                    type="info"
+                    plain
+                    style="width: 40px"
+                    @click="
+                      opensearchTable(
+                        'testTypeCode',
+                        null,
+                        '检验类型',
+                        SamplingProcess.allSchemas,
+                        SamplingProcessApi.getSamplingProcessPage,
+                        null,
+                        false,
+                        'form',
+                        null
+                      )
+                    "
+                    ><Icon icon="ep:search" />
+                  </el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="检验模板编码" prop="programmeTemplateCode">
+                <div style="display: flex; width: 100%">
                   <el-input
-                    v-model="item.inspectionCode"
-                    placeholder="根据系统生成"
-                    :disabled="true"
+                    v-model="data.programmeTemplateCode"
+                    disabled
+                    placeholder="请选择检验模板编码"
                   />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="描述" prop="description">
-                  <el-input v-model="item.description" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="顺序号" prop="sequenceCode">
-                  <el-input v-model="item.sequenceCode" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="检验特性编码">
-                  <el-input
-                    v-model="item.inspectionCharCode"
-                    placeholder="根据系统生成"
-                    :disabled="true"
+                  <el-button
+                    type="info"
+                    plain
+                    style="width: 40px"
+                    @click="
+                      opensearchTable(
+                        'programmeTemplateCode',
+                        null,
+                        '检验模板编码',
+                        InspectionTemplateMain.allSchemas,
+                        InspectionTemplateApi.inspectionTemplatePage,
+                        null,
+                        false,
+                        'form',
+                        null
+                      )
+                    "
+                    ><Icon icon="ep:search" />
+                  </el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="拆分规则" prop="splitRule">
+                <el-select v-model="data.splitRule" placeholder="请选择拆分规则">
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.SPLIT_RULES)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
                   />
-                </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">
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="编码">
-                  <el-input
-                    v-model="item.inspectionCharacteristicsBaseVO.code"
-                    placeholder="根据系统生成"
-                    :disabled="true"
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="aql" prop="aql">
+                <el-select v-model="data.aql" placeholder="请选择aql">
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.BASIC_AQL)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
                   />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="描述" prop="inspectionCharacteristicsBaseVO.description">
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.description" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="检验方法编码"
-                  prop="inspectionCharacteristicsBaseVO.inspectionMethodCode"
-                >
-                  <div style="display: flex; width: 100%">
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="检验水平" prop="inspectionLevel">
+                <el-select v-model="data.inspectionLevel" placeholder="请选择检验水平">
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_LEVEL)"
+                    :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="effectiveDate">
+                <el-date-picker
+                  v-model="data.effectiveDate"
+                  type="datetime"
+                  placeholder="请选择生效时间"
+                  style="width: 100%"
+                  value-format="x"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="失效时间" prop="expirationDate">
+                <el-date-picker
+                  v-model="data.expirationDate"
+                  type="datetime"
+                  placeholder="请选择失效时间"
+                  style="width: 100%"
+                  value-format="x"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否可用" prop="available">
+                <el-switch v-model="data.available" active-value="TRUE" inactive-value="FALSE" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-tabs
+          v-model="editableTabsValue"
+          editable
+          class="demo-tabs"
+          @edit="handleTabsEdit"
+          type="border-card"
+          tab-position="left"
+          :stretch="false"
+        >
+          <el-tab-pane
+            v-for="item in data.process"
+            :key="item.name"
+            :label="item.description"
+            :name="item.name"
+          >
+            <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="code">
+                    <el-input v-model="item.code" placeholder="根据系统生成" :disabled="true" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="检验方案模板编码">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode"
-                      disabled
-                      placeholder="请选择检验方法编码"
+                      v-model="item.inspectionCode"
+                      placeholder="根据系统生成"
+                      :disabled="true"
                     />
-                    <el-button
-                      type="info"
-                      plain
-                      style="width: 40px"
-                      @click="
-                        opensearchTable(
-                          'inspectionMethodCode',
-                          null,
-                          '检验方法',
-                          SamplingProcess.allSchemas,
-                          SamplingProcessApi.getSamplingProcessPage,
-                          null,
-                          false,
-                          null,
-                          item
-                        )
-                      "
-                      ><Icon icon="ep:search"
-                    /></el-button>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="采样过程编码"
-                  prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
-                >
-                  <div style="display: flex; width: 100%">
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="描述" prop="description">
+                    <el-input v-model="item.description" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="顺序号" prop="sequenceCode">
+                    <el-input v-model="item.sequenceCode" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="检验特性编码">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateCode"
-                      disabled
-                      placeholder="请选择采样过程编码"
+                      v-model="item.inspectionCharCode"
+                      placeholder="根据系统生成"
+                      :disabled="true"
                     />
-                    <el-button
-                      type="info"
-                      plain
-                      style="width: 40px"
-                      @click="
-                        opensearchTable(
-                          'dynamicUpdateCode',
-                          null,
-                          '采样过程编码',
-                          SamplingProcess.allSchemas,
-                          SamplingProcessApi.getSamplingProcessPage,
-                          null,
-                          false,
-                          null,
-                          item
-                        )
-                      "
-                      ><Icon icon="ep:search"
-                    /></el-button>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="动态修改规则编码"
-                  prop="inspectionCharacteristicsBaseVO.inspectionMethod"
-                >
-                  <div style="display: flex; width: 100%">
+                  </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">
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="编码">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethod"
+                      v-model="item.inspectionCharacteristicsBaseVO.code"
+                      placeholder="根据系统生成"
+                      :disabled="true"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="描述" prop="inspectionCharacteristicsBaseVO.description">
+                    <el-input v-model="item.inspectionCharacteristicsBaseVO.description" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="检验方法编码"
+                    prop="inspectionCharacteristicsBaseVO.inspectionMethodCode"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode"
+                        disabled
+                        placeholder="请选择检验方法编码"
+                      />
+                      <el-button
+                        type="info"
+                        plain
+                        style="width: 40px"
+                        @click="
+                          opensearchTable(
+                            'inspectionMethodCode',
+                            null,
+                            '检验方法',
+                            InspectionMethod.allSchemas,
+                            InspectionMethodApi.getInspectionMethodPage,
+                            [
+                              {
+                                key: 'available',
+                                value: 'TRUE',
+                                isMainValue: false
+                              }
+                            ],
+                            false,
+                            null,
+                            item
+                          )
+                        "
+                        ><Icon icon="ep:search"
+                      /></el-button>
+                    </div>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="采样过程编码"
+                    prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                        disabled
+                        placeholder="请选择采样过程编码"
+                      />
+                      <el-button
+                        type="info"
+                        plain
+                        style="width: 40px"
+                        @click="
+                          opensearchTable(
+                            'dynamicUpdateCode',
+                            null,
+                            '采样过程编码',
+                            SamplingProcess.allSchemas,
+                            SamplingProcessApi.getSamplingProcessPage,
+                            [
+                              {
+                                key: 'available',
+                                value: 'TRUE',
+                                isMainValue: false
+                              }
+                            ],
+                            false,
+                            null,
+                            item
+                          )
+                        "
+                        ><Icon icon="ep:search"
+                      /></el-button>
+                    </div>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="动态修改规则编码"
+                    prop="inspectionCharacteristicsBaseVO.inspectionMethod"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionCharacteristicsBaseVO.inspectionMethod"
+                        disabled
+                        placeholder="请选择动态修改规则编码"
+                      />
+                      <el-button
+                        type="info"
+                        plain
+                        style="width: 40px"
+                        @click="
+                          opensearchTable(
+                            'inspectionMethod',
+                            null,
+                            '动态修改规则编码',
+                            DynamicRule.allSchemas,
+                            DynamicRuleApi.getDynamicRulePage,
+                            [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                            false,
+                            null,
+                            item
+                          )
+                        "
+                        ><Icon icon="ep:search"
+                      /></el-button>
+                    </div>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="是否允许修改特征值"
+                    prop="inspectionCharacteristicsBaseVO.isCanUpdate"
+                  >
+                    <el-switch
+                      v-model="item.inspectionCharacteristicsBaseVO.isCanUpdate"
                       disabled
-                      placeholder="请选择动态修改规则编码"
                     />
-                    <el-button
-                      type="info"
-                      plain
-                      style="width: 40px"
-                      @click="
-                        opensearchTable(
-                          'inspectionMethod',
-                          null,
-                          '动态修改规则编码',
-                          SamplingProcess.allSchemas,
-                          SamplingProcessApi.getSamplingProcessPage,
-                          null,
-                          false,
-                          null,
-                          item
-                        )
-                      "
-                      ><Icon icon="ep:search"
-                    /></el-button>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="是否允许修改特征值"
-                  prop="inspectionCharacteristicsBaseVO.isCanUpdate"
-                >
-                  <el-switch v-model="item.inspectionCharacteristicsBaseVO.isCanUpdate" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="结果录入方式"
-                  prop="inspectionCharacteristicsBaseVO.resultEntryMethod"
-                >
-                  <el-select
-                    v-model="item.inspectionCharacteristicsBaseVO.resultEntryMethod"
-                    placeholder="请选择结果录入方式"
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="结果录入方式"
+                    prop="inspectionCharacteristicsBaseVO.resultEntryMethod"
                   >
-                    <el-option
-                      v-for="dict in getStrDictOptions(
-                        DICT_TYPE.INSPECTION_CHARACTERISTICS_RESULT_ENTRY
-                      )"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
+                    <el-select
+                      v-model="item.inspectionCharacteristicsBaseVO.resultEntryMethod"
+                      placeholder="请选择结果录入方式"
+                    >
+                      <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="inspectionCharacteristicsBaseVO.featureType">
+                    <!-- <el-input v-model="item.featureType" /> -->
+                    <el-select
+                      v-model="item.inspectionCharacteristicsBaseVO.featureType"
+                      placeholder="请选择特征类型"
+                      @change="changeFeatureType"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    >
+                      <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.inspectionCharacteristicsBaseVO.featureType == 0">
+                  <el-form-item
+                    label="是否设定上限"
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                  >
+                    <el-switch
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                      @change="changeIsCapping"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="特征类型" prop="inspectionCharacteristicsBaseVO.featureType">
-                  <!-- <el-input v-model="item.featureType" /> -->
-                  <el-select
-                    v-model="item.inspectionCharacteristicsBaseVO.featureType"
-                    placeholder="请选择特征类型"
-                    @change="changeFeatureType"
-                    :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="上限值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
                   >
-                    <el-option
-                      v-for="dict in getStrDictOptions(
-                        DICT_TYPE.INSPECTION_CHARACTERISTICS_FEATURE_TYPE
-                      )"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
-                <el-form-item
-                  label="是否设定上限"
-                  prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
-                >
-                  <el-switch v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping" @change="changeIsCapping"
-                    :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="上限值"
-                  prop="inspectionCharacteristicsBaseVO.quantifyCapping"
-                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
-                >
-                  <el-input
-                    v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping"
-                    :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  prop="inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
-                  label="是否设定下限"
-                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
-                >
-                  
-                 <el-switch v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit" @change="changeLowlimit"
-                    :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="下限值"
-                  prop="inspectionCharacteristicsBaseVO.quantifyLowlimit"
-                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
-                >
-                  <el-input
-                    v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit"
-                    :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  prop="inspectionCharacteristicsBaseVO.quantifyIsTarget"
-                  label="是否设定目标值"
-                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
-                >
-                  <el-switch v-model="item.inspectionCharacteristicsBaseVO.quantifyIsTarget" @change="changeIsTarget"
-                    :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="目标值"
-                  prop="inspectionCharacteristicsBaseVO.quantifyTarget"
-                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
-                >
-                  <el-input
-                    v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget"
-                    :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
-                  />
-                </el-form-item>
-              </el-col>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                    label="是否设定下限"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-switch
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                      @change="changeLowlimit"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="下限值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyLowlimit"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    prop="inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                    label="是否设定目标值"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-switch
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                      @change="changeIsTarget"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="目标值"
+                    prop="inspectionCharacteristicsBaseVO.quantifyTarget"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
 
-              <el-col :span="12">
-                <el-form-item
-                  label="计量单位"
-                  prop="inspectionCharacteristicsBaseVO.quantifyUom"
-                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
-                >
-                  <el-input
-                    v-model="item.inspectionCharacteristicsBaseVO.quantifyUom"
-                    :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="小数位"
-                  prop="inspectionCharacteristicsBaseVO.quantifyDecimal"
-                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
-                >
-                  <el-input
-                    v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal"
-                    :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="选择集编码"
-                  prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
-                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 1"
-                >
-                  <div style="display: flex; width: 100%">
+                <el-col :span="12">
+                  <el-form-item
+                    label="计量单位"
+                    prop="inspectionCharacteristicsBaseVO.quantifyUom"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
-                      disabled
-                      placeholder="请选择选择集编码"
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyUom"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
                     />
-                    <el-button
-                      type="info"
-                      plain
-                      style="width: 40px"
-                      @click="
-                        opensearchTable(
-                          'quantifyQuantifyCode',
-                          null,
-                          '选择集编码',
-                          SamplingProcess.allSchemas,
-                          SamplingProcessApi.getSamplingProcessPage,
-                          null,
-                          false,
-                          null,
-                          item
-                        )
-                      "
-                      v-if="item.inspectionCharacteristicsBaseVO.isCanUpdate"
-                      ><Icon icon="ep:search"
-                    /></el-button>
-                  </div>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-    <template #footer>
-      <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
-    </template>
-  </Dialog>
-  <Dialog title="修改名称" v-model="dialogVisibleName" width="500px" :close-on-click-modal="false">
-    <div style="padding: 0px 20px">
-      <el-form ref="nameRef" :model="nameForm">
-        <el-form-item
-          :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
-          prop="name"
-        >
-          <el-input v-model="nameForm.name" style="width: 240px" placeholder="请输入名称" />
-        </el-form-item>
-      </el-form>
-    </div>
-    <template #footer>
-      <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick1" />
-    </template>
-  </Dialog>
-  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
-</div>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="小数位"
+                    prop="inspectionCharacteristicsBaseVO.quantifyDecimal"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
+                  >
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal"
+                      :disabled="!item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="选择集编码"
+                    prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
+                    v-if="item.inspectionCharacteristicsBaseVO.featureType == 1"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
+                        disabled
+                        placeholder="请选择选择集编码"
+                      />
+                      <el-button
+                        type="info"
+                        plain
+                        style="width: 40px"
+                        @click="
+                          opensearchTable(
+                            'quantifyQuantifyCode',
+                            null,
+                            '选择集编码',
+                            SelectedSet.allSchemas,
+                            SelectedSetApi.getSelectedSetPage,
+                          [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                            false,
+                            null,
+                            item
+                          )
+                        "
+                        v-if="item.inspectionCharacteristicsBaseVO.isCanUpdate"
+                        ><Icon icon="ep:search"
+                      /></el-button>
+                    </div>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+      <template #footer>
+        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
+      </template>
+    </Dialog>
+    <Dialog
+      title="修改名称"
+      v-model="dialogVisibleName"
+      width="500px"
+      :close-on-click-modal="false"
+    >
+      <div style="padding: 0px 20px">
+        <el-form ref="nameRef" :model="nameForm">
+          <el-form-item
+            :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
+            prop="name"
+          >
+            <el-input v-model="nameForm.name" style="width: 240px" placeholder="请输入名称" />
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick1" />
+      </template>
+    </Dialog>
+    <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -546,11 +586,18 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
 import { SearchTable } from '@/components/SearchTable'
 import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
-import * as SamplingProcessApi from '@/api/qms/samplingProcess'
 import { InspectionTemplateMain } from '@/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data'
 import * as InspectionTemplateApi from '@/api/qms/inspectionTemplate'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
-import * as  ItemBasicApi from '@/api/wms/itembasic'
+import * as ItemBasicApi from '@/api/wms/itembasic'
+import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程
+import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法
+import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法
+import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
+import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则
+import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
+import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集
+
 const message = useMessage() // 消息弹窗
 
 const props = defineProps({
@@ -599,13 +646,13 @@ const data = ref({
   code: '',
   itemCode: '',
   version: '',
-  testTypeCode:'',
-  programmeTemplateCode:'',
-  splitRule:'',
-  aql:'',
-  inspectionLevel:'',
-  effectiveDate:'',
-  expirationDate:'',
+  testTypeCode: '',
+  programmeTemplateCode: '',
+  splitRule: '',
+  aql: '',
+  inspectionLevel: '',
+  effectiveDate: '',
+  expirationDate: '',
   available: 'TRUE',
   process: []
 })
@@ -624,12 +671,14 @@ const rules = ref({
   itemCode: [{ required: true, message: '请选择物料编码', trigger: 'blur' }],
   version: [{ required: true, message: '请填写版本', trigger: 'blur' }],
   testTypeCode: [{ required: true, message: '请选择检验类型编码', trigger: ['blur', 'change'] }],
-  programmeTemplateCode: [{ required: true, message: '请选择检验模板编码', trigger:['blur', 'change'] }],
-  splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change']}],
-  aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change']}],
-  inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change']}],
-  effectiveDate: [{ required: true, message: '请选择生效时间', trigger: ['blur', 'change']}],
-  expirationDate: [{ required: true, message: '请选择失效时间', trigger: ['blur', 'change']}],
+  programmeTemplateCode: [
+    { required: true, message: '请选择检验模板编码', trigger: ['blur', 'change'] }
+  ],
+  splitRule: [{ required: true, message: '请选择拆分规则', trigger: ['blur', 'change'] }],
+  aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }],
+  inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }],
+  effectiveDate: [{ required: true, message: '请选择生效时间', trigger: ['blur', 'change'] }],
+  expirationDate: [{ required: true, message: '请选择失效时间', trigger: ['blur', 'change'] }],
   'inspectionCharacteristicsBaseVO.description': [
     { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
   ],
@@ -679,13 +728,13 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   formType.value = type
   if (row) {
     data.value = JSON.parse(JSON.stringify(row))
-    let list =[]
-    if(row.content){
+    let list = []
+    if (row.content) {
       list = JSON.parse(row.content)
-    }else{
+    } else {
       list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode)
     }
-    
+
     list.forEach((item, index) => {
       editableTabsValue.value = index + 1
       item.name = index + 1
@@ -712,13 +761,13 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       code: '',
       itemCode: '',
       version: '',
-      testTypeCode:'',
-      programmeTemplateCode:'',
-      splitRule:'',
-      aql:'',
-      inspectionLevel:'',
-      effectiveDate:'',
-      expirationDate:'',
+      testTypeCode: '',
+      programmeTemplateCode: '',
+      splitRule: '',
+      aql: '',
+      inspectionLevel: '',
+      effectiveDate: '',
+      expirationDate: '',
       available: 'TRUE',
       process: []
     }
@@ -962,15 +1011,14 @@ const opensearchTable = (
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
 const searchTableSuccess = async (formField, searchField, val, type, row) => {
- 
   if (type == 'tableForm') {
     // 明细查询页赋值
     row[formField] = val[0][searchField]
   } else {
     console.log(formField)
-  console.log(val[0].code)
-  console.log(type)
-      data.value[formField] = val[0].code
+    console.log(val[0].code)
+    console.log(type)
+    data.value[formField] = val[0].code
     if (formField == 'programmeTemplateCode') {
       let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
       list.forEach((item, index) => {
diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
index bd5aa233b..d73e00ebb 100644
--- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
@@ -124,7 +124,7 @@
                           'inspectionMethodCode',
                           null,
                           '检验方法',
-                          SamplingProcess.allSchemas,
+                          InspectionMethod.allSchemas,
                           InspectionMethodApi.getInspectionMethodPage,
                           [
                             {
@@ -202,7 +202,7 @@
                           'inspectionMethod',
                           null,
                           '动态修改规则编码',
-                          SamplingProcess.allSchemas,
+                          DynamicRule.allSchemas,
                           DynamicRuleApi.getDynamicRulePage,
                           [
                             {
@@ -366,7 +366,7 @@
                           'quantifyQuantifyCode',
                           null,
                           '选择集编码',
-                          SamplingProcess.allSchemas,
+                          SelectedSet.allSchemas,
                           SelectedSetApi.getSelectedSetPage,
                           [
                             {
@@ -419,10 +419,13 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as InspectionProcessPageApi from '@/api/qms/inspectionTemplate'
 import { SearchTable } from '@/components/SearchTable'
 import { SamplingProcess } from '@/views/qms/samplingProcess/samplingProcess.data'
-import * as SamplingProcessApi from '@/api/qms/samplingProcess'//采样过程
-import * as InspectionMethodApi from '@/api/qms/inspectionMethod'//检验方法
-import * as DynamicRuleApi from '@/api/qms/dynamicRule'//动态修改规则
-import * as SelectedSetApi from '@/api/qms/selectedSet'//选择集
+import * as SamplingProcessApi from '@/api/qms/samplingProcess' //采样过程
+import * as InspectionMethodApi from '@/api/qms/inspectionMethod' //检验方法
+import { InspectionMethod } from '@/views/qms/inspectionMethod/inspectionMethod.data' //检验方法
+import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
+import { DynamicRule } from '@/views/qms/basicDataManage/dynamicRule/dynamicRule.data' //动态修改规则
+import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
+import { SelectedSet } from '@/views/qms/basicDataManage/selectedSet/selectedSet.data' //选择集
 const message = useMessage() // 消息弹窗
 
 const props = defineProps({