diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 0ba2c90..9bc4d06 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -42,6 +42,7 @@
     return row[span]
   }
 }
+// 初始化列表数据
 export function initTableRow(data: any) {
   let tableData = []
   tableData = data.map((item: any) => {

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 0ba2c90..9bc4d06 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -42,6 +42,7 @@
     return row[span]
   }
 }
+// 初始化列表数据
 export function initTableRow(data: any) {
   let tableData = []
   tableData = data.map((item: any) => {
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index aab09b4..2fa868a 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -52,6 +52,7 @@
 watch(() => props.form, (newVal) => {
   form.value = newVal
 })
+// 取消列表把列表置空
 const pageEditFlag = ref(false)
 const tableLoading = ref(false)
 const list = ref<IList[]>([])
@@ -111,7 +112,7 @@
 // ----------------------------------------表头------------------------------------------------
 const columns_line_voltage_regulation = ref<TableColumn[]>([ // 电源电压调整率
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '调压器输出值', value: 'voltageRegulatorOutputValue', align: 'center', required: true, type: 'select' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'input' },
@@ -126,12 +127,12 @@
 // 电压表示值误差(数字式)、电流表示值误差(直接测量)--(数字式)
 const columns_voltage_representation_value_error_number = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'input' },
 ])
 // 电压表示值误差(数字式)
@@ -141,24 +142,24 @@
 // 电压表示值误差(指针式)、电流表示值误差(直接测量)--(指针式)
 const columns_voltage_representation_value_error_pointer = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
 ])
 // 电流表示值误差(间接测量)--数字式
 const columns_ammeter_indirect_number = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值', value: 'standardResistanceValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值单位', value: 'standardResistanceValueUnit', align: 'center', required: true, type: 'select' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'input' },
 ])
 // 电流表示值误差(间接测量)
@@ -166,26 +167,26 @@
 // 电流表示值误差(间接测量)--指针式
 const columns_ammeter_indirect_pointer = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值', value: 'standardResistanceValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值单位', value: 'standardResistanceValueUnit', align: 'center', required: true, type: 'select' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
 ])
 // 纹波电压
 const columns_ripple_voltage = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' },
 ])
 // 输出电压短期稳定性
 const columns_output_voltage_stability = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '仪器技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'input' },
 ])
@@ -263,14 +264,9 @@
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
         }
-        console.log(data, 'data')
         lineVoltageRegulationList.value.push(data)
         break
       case '负载调整率': // 负载调整率
-        if (loadRegulationList.value.length === 8) {
-          ElMessage.warning('最多添加四项')
-          return
-        }
         data = {
           params: '负载调整率',
           dataType: '2',
@@ -295,15 +291,16 @@
           measureIndicationValue: '', // 被检表示值
           resolution: '0.0001', // 分辨力
           editable: true,
-          maximumError: '', // 最大允许误差
+
         }
-        if (form.value.ammeterDirectType === '1') {
+        if (form.value.voltageRepresentationValueErrorType === '1') {
           //  数字式
           voltageRepresentationValueErrorList.value.push({
             ...data,
             dataTypeType: '1',
             errorParamA: '', // 误差参数a
             errorParamB: '', // 误差参数b
+            maximumError: '',
           })
         }
         else {
@@ -313,6 +310,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -345,6 +343,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -380,6 +379,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -460,7 +460,6 @@
   let result = true
   for (const i in columnsDict.value) {
     const requireLength = !!((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i])
-    console.log(requireLength, 'requireLength')
     if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
       result = false
       break
@@ -601,8 +600,21 @@
     fun(true)
     return
   }
+  // 指针式 禁用最大允许误差
+
+  if (scope.row.dataTypeType === '2' && column.text === '最大允许误差') {
+    fun(true)
+    return
+  }
   fun(props.pageType === 'detail')
 }
+// 禁用某一个选项
+// const disabledItem = ({ scope, column, citem }, fun) => {
+//   if (scope.row.dataTypeType === '1' && column.text === '最大允许误差' && citem.value === '1') {
+//     return true
+//   }
+//   return false
+// }
 // ---------------------------------------------获取字典---------------------------------------------------
 const TechnicalIndexSymbolList = ref<{ value: string;name: string;id: string }[]>([]) // 技术指标前符号
 const OutputChannelList = ref<{ value: string;name: string;id: string }[]>([]) // 输出通道
@@ -678,8 +690,18 @@
     测量单位: unitList1.value,
   }
 }
+// 生成最终list
+const getList = () => {
+  let result = []
+  for (const i in chekedDict) {
+    if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) {
+      result = [...result, ...listDict.value[i]]
+    }
+  }
+  return result
+}
 fecthDict()
-defineExpose({ list, checkAllList, form })
+defineExpose({ list, checkAllList, form, getList })
 </script>
 
 <template>
@@ -765,6 +787,7 @@
     :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation" :page-type="pageType" title="电压表示值误差" index="3" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电压表示值误差')"
     @add-row="addRow"
     @del-row="delRow"
@@ -806,6 +829,7 @@
     :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -835,6 +859,7 @@
     :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -848,7 +873,7 @@
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterDirectType"
+        v-model="form.ammeterIndirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
         class="full-width-input"

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 0ba2c90..9bc4d06 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -42,6 +42,7 @@
     return row[span]
   }
 }
+// 初始化列表数据
 export function initTableRow(data: any) {
   let tableData = []
   tableData = data.map((item: any) => {
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index aab09b4..2fa868a 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -52,6 +52,7 @@
 watch(() => props.form, (newVal) => {
   form.value = newVal
 })
+// 取消列表把列表置空
 const pageEditFlag = ref(false)
 const tableLoading = ref(false)
 const list = ref<IList[]>([])
@@ -111,7 +112,7 @@
 // ----------------------------------------表头------------------------------------------------
 const columns_line_voltage_regulation = ref<TableColumn[]>([ // 电源电压调整率
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '调压器输出值', value: 'voltageRegulatorOutputValue', align: 'center', required: true, type: 'select' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'input' },
@@ -126,12 +127,12 @@
 // 电压表示值误差(数字式)、电流表示值误差(直接测量)--(数字式)
 const columns_voltage_representation_value_error_number = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'input' },
 ])
 // 电压表示值误差(数字式)
@@ -141,24 +142,24 @@
 // 电压表示值误差(指针式)、电流表示值误差(直接测量)--(指针式)
 const columns_voltage_representation_value_error_pointer = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
 ])
 // 电流表示值误差(间接测量)--数字式
 const columns_ammeter_indirect_number = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值', value: 'standardResistanceValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值单位', value: 'standardResistanceValueUnit', align: 'center', required: true, type: 'select' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'input' },
 ])
 // 电流表示值误差(间接测量)
@@ -166,26 +167,26 @@
 // 电流表示值误差(间接测量)--指针式
 const columns_ammeter_indirect_pointer = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值', value: 'standardResistanceValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值单位', value: 'standardResistanceValueUnit', align: 'center', required: true, type: 'select' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
 ])
 // 纹波电压
 const columns_ripple_voltage = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' },
 ])
 // 输出电压短期稳定性
 const columns_output_voltage_stability = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '仪器技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'input' },
 ])
@@ -263,14 +264,9 @@
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
         }
-        console.log(data, 'data')
         lineVoltageRegulationList.value.push(data)
         break
       case '负载调整率': // 负载调整率
-        if (loadRegulationList.value.length === 8) {
-          ElMessage.warning('最多添加四项')
-          return
-        }
         data = {
           params: '负载调整率',
           dataType: '2',
@@ -295,15 +291,16 @@
           measureIndicationValue: '', // 被检表示值
           resolution: '0.0001', // 分辨力
           editable: true,
-          maximumError: '', // 最大允许误差
+
         }
-        if (form.value.ammeterDirectType === '1') {
+        if (form.value.voltageRepresentationValueErrorType === '1') {
           //  数字式
           voltageRepresentationValueErrorList.value.push({
             ...data,
             dataTypeType: '1',
             errorParamA: '', // 误差参数a
             errorParamB: '', // 误差参数b
+            maximumError: '',
           })
         }
         else {
@@ -313,6 +310,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -345,6 +343,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -380,6 +379,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -460,7 +460,6 @@
   let result = true
   for (const i in columnsDict.value) {
     const requireLength = !!((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i])
-    console.log(requireLength, 'requireLength')
     if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
       result = false
       break
@@ -601,8 +600,21 @@
     fun(true)
     return
   }
+  // 指针式 禁用最大允许误差
+
+  if (scope.row.dataTypeType === '2' && column.text === '最大允许误差') {
+    fun(true)
+    return
+  }
   fun(props.pageType === 'detail')
 }
+// 禁用某一个选项
+// const disabledItem = ({ scope, column, citem }, fun) => {
+//   if (scope.row.dataTypeType === '1' && column.text === '最大允许误差' && citem.value === '1') {
+//     return true
+//   }
+//   return false
+// }
 // ---------------------------------------------获取字典---------------------------------------------------
 const TechnicalIndexSymbolList = ref<{ value: string;name: string;id: string }[]>([]) // 技术指标前符号
 const OutputChannelList = ref<{ value: string;name: string;id: string }[]>([]) // 输出通道
@@ -678,8 +690,18 @@
     测量单位: unitList1.value,
   }
 }
+// 生成最终list
+const getList = () => {
+  let result = []
+  for (const i in chekedDict) {
+    if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) {
+      result = [...result, ...listDict.value[i]]
+    }
+  }
+  return result
+}
 fecthDict()
-defineExpose({ list, checkAllList, form })
+defineExpose({ list, checkAllList, form, getList })
 </script>
 
 <template>
@@ -765,6 +787,7 @@
     :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation" :page-type="pageType" title="电压表示值误差" index="3" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电压表示值误差')"
     @add-row="addRow"
     @del-row="delRow"
@@ -806,6 +829,7 @@
     :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -835,6 +859,7 @@
     :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -848,7 +873,7 @@
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterDirectType"
+        v-model="form.ammeterIndirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
         class="full-width-input"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index bd7608e..b4634c0 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -85,7 +85,7 @@
     default: () => ([]),
   },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'addRow', 'delRow', 'changeLoadSituationa', 'calculateResult', 'disabled'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'addRow', 'delRow', 'changeLoadSituationa', 'calculateResult', 'disabled', 'disabledItem'])
 // ------------------------------------------字典----------------------------------------------
 // -------定义数据--------------
 interface columnsCheckInfo {
@@ -169,13 +169,22 @@
   })
   return result
 }
+// 下拉框某一项禁用情况
+// citem 当前下拉框选项
+// const disabledItem = (scope: any, column: any, citem: any) => {
+//   let result = false
+//   emit('disabledItem', { scope, column, citem }, (value: boolean) => {
+//     result = value
+//   })
+//   return result
+// }
 // 下拉框获取焦点 或者 下拉框的值发生变化
 const changeLoadSituationa = (value: any, index: number, text: string, type: string, list: any[], title: string) => {
   emit('changeLoadSituationa', value, index, text, type, list, title)
 }
 // 计算结果
-const calculateResult = (title) => {
-  emit('calculateResult', title)
+const calculateResult = (title: string, index: string) => {
+  emit('calculateResult', title, index)
 }
 // 获取字典value
 const getDictValue = (value: string) => {
@@ -221,7 +230,7 @@
         <el-button v-if="props.showBtn" type="info" @click="delRow(selectList, props.data, props.title)">
           删除行
         </el-button>
-        <el-button v-if="props.calcBtn" type="primary" @click="calculateResult(props.title)">
+        <el-button v-if="props.calcBtn" type="primary" @click="calculateResult(props.title, props.index)">
           计算结果
         </el-button>
         <!-- 自定义按钮 -->
@@ -263,7 +272,7 @@
             <slot v-if="props.customContent" name="custom-content" :scope="scope" :column="item" />
             <template v-if="!props.customContent">
               <!-- 文本内容 -->
-              <div v-if="item.type === 'text'" style="text-align: center;width: 100%;">
+              <div v-if="item.type === 'text'" style="text-align: center;width: 100%;line-height: 30px;">
                 {{ scope.row[item.value] }}
               </div>
               <!-- 输入框 -->
@@ -290,7 +299,8 @@
                   v-for="citem in getAnySelect(item.text, title)"
                   :key="citem.id"
                   :label="citem.name"
-                  :value="citem.name"
+                  :disabled="citem.disabled"
+                  :value="citem[item.bind ? item.bind : 'name']"
                 />
               </el-select>
               <!-- 输入下拉框(与字典联动) -->

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 0ba2c90..9bc4d06 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -42,6 +42,7 @@
     return row[span]
   }
 }
+// 初始化列表数据
 export function initTableRow(data: any) {
   let tableData = []
   tableData = data.map((item: any) => {
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index aab09b4..2fa868a 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -52,6 +52,7 @@
 watch(() => props.form, (newVal) => {
   form.value = newVal
 })
+// 取消列表把列表置空
 const pageEditFlag = ref(false)
 const tableLoading = ref(false)
 const list = ref<IList[]>([])
@@ -111,7 +112,7 @@
 // ----------------------------------------表头------------------------------------------------
 const columns_line_voltage_regulation = ref<TableColumn[]>([ // 电源电压调整率
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '调压器输出值', value: 'voltageRegulatorOutputValue', align: 'center', required: true, type: 'select' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'input' },
@@ -126,12 +127,12 @@
 // 电压表示值误差(数字式)、电流表示值误差(直接测量)--(数字式)
 const columns_voltage_representation_value_error_number = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'input' },
 ])
 // 电压表示值误差(数字式)
@@ -141,24 +142,24 @@
 // 电压表示值误差(指针式)、电流表示值误差(直接测量)--(指针式)
 const columns_voltage_representation_value_error_pointer = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
 ])
 // 电流表示值误差(间接测量)--数字式
 const columns_ammeter_indirect_number = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值', value: 'standardResistanceValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值单位', value: 'standardResistanceValueUnit', align: 'center', required: true, type: 'select' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'input' },
 ])
 // 电流表示值误差(间接测量)
@@ -166,26 +167,26 @@
 // 电流表示值误差(间接测量)--指针式
 const columns_ammeter_indirect_pointer = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值', value: 'standardResistanceValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值单位', value: 'standardResistanceValueUnit', align: 'center', required: true, type: 'select' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
 ])
 // 纹波电压
 const columns_ripple_voltage = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' },
 ])
 // 输出电压短期稳定性
 const columns_output_voltage_stability = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '仪器技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'input' },
 ])
@@ -263,14 +264,9 @@
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
         }
-        console.log(data, 'data')
         lineVoltageRegulationList.value.push(data)
         break
       case '负载调整率': // 负载调整率
-        if (loadRegulationList.value.length === 8) {
-          ElMessage.warning('最多添加四项')
-          return
-        }
         data = {
           params: '负载调整率',
           dataType: '2',
@@ -295,15 +291,16 @@
           measureIndicationValue: '', // 被检表示值
           resolution: '0.0001', // 分辨力
           editable: true,
-          maximumError: '', // 最大允许误差
+
         }
-        if (form.value.ammeterDirectType === '1') {
+        if (form.value.voltageRepresentationValueErrorType === '1') {
           //  数字式
           voltageRepresentationValueErrorList.value.push({
             ...data,
             dataTypeType: '1',
             errorParamA: '', // 误差参数a
             errorParamB: '', // 误差参数b
+            maximumError: '',
           })
         }
         else {
@@ -313,6 +310,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -345,6 +343,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -380,6 +379,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -460,7 +460,6 @@
   let result = true
   for (const i in columnsDict.value) {
     const requireLength = !!((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i])
-    console.log(requireLength, 'requireLength')
     if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
       result = false
       break
@@ -601,8 +600,21 @@
     fun(true)
     return
   }
+  // 指针式 禁用最大允许误差
+
+  if (scope.row.dataTypeType === '2' && column.text === '最大允许误差') {
+    fun(true)
+    return
+  }
   fun(props.pageType === 'detail')
 }
+// 禁用某一个选项
+// const disabledItem = ({ scope, column, citem }, fun) => {
+//   if (scope.row.dataTypeType === '1' && column.text === '最大允许误差' && citem.value === '1') {
+//     return true
+//   }
+//   return false
+// }
 // ---------------------------------------------获取字典---------------------------------------------------
 const TechnicalIndexSymbolList = ref<{ value: string;name: string;id: string }[]>([]) // 技术指标前符号
 const OutputChannelList = ref<{ value: string;name: string;id: string }[]>([]) // 输出通道
@@ -678,8 +690,18 @@
     测量单位: unitList1.value,
   }
 }
+// 生成最终list
+const getList = () => {
+  let result = []
+  for (const i in chekedDict) {
+    if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) {
+      result = [...result, ...listDict.value[i]]
+    }
+  }
+  return result
+}
 fecthDict()
-defineExpose({ list, checkAllList, form })
+defineExpose({ list, checkAllList, form, getList })
 </script>
 
 <template>
@@ -765,6 +787,7 @@
     :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation" :page-type="pageType" title="电压表示值误差" index="3" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电压表示值误差')"
     @add-row="addRow"
     @del-row="delRow"
@@ -806,6 +829,7 @@
     :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -835,6 +859,7 @@
     :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -848,7 +873,7 @@
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterDirectType"
+        v-model="form.ammeterIndirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
         class="full-width-input"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index bd7608e..b4634c0 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -85,7 +85,7 @@
     default: () => ([]),
   },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'addRow', 'delRow', 'changeLoadSituationa', 'calculateResult', 'disabled'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'addRow', 'delRow', 'changeLoadSituationa', 'calculateResult', 'disabled', 'disabledItem'])
 // ------------------------------------------字典----------------------------------------------
 // -------定义数据--------------
 interface columnsCheckInfo {
@@ -169,13 +169,22 @@
   })
   return result
 }
+// 下拉框某一项禁用情况
+// citem 当前下拉框选项
+// const disabledItem = (scope: any, column: any, citem: any) => {
+//   let result = false
+//   emit('disabledItem', { scope, column, citem }, (value: boolean) => {
+//     result = value
+//   })
+//   return result
+// }
 // 下拉框获取焦点 或者 下拉框的值发生变化
 const changeLoadSituationa = (value: any, index: number, text: string, type: string, list: any[], title: string) => {
   emit('changeLoadSituationa', value, index, text, type, list, title)
 }
 // 计算结果
-const calculateResult = (title) => {
-  emit('calculateResult', title)
+const calculateResult = (title: string, index: string) => {
+  emit('calculateResult', title, index)
 }
 // 获取字典value
 const getDictValue = (value: string) => {
@@ -221,7 +230,7 @@
         <el-button v-if="props.showBtn" type="info" @click="delRow(selectList, props.data, props.title)">
           删除行
         </el-button>
-        <el-button v-if="props.calcBtn" type="primary" @click="calculateResult(props.title)">
+        <el-button v-if="props.calcBtn" type="primary" @click="calculateResult(props.title, props.index)">
           计算结果
         </el-button>
         <!-- 自定义按钮 -->
@@ -263,7 +272,7 @@
             <slot v-if="props.customContent" name="custom-content" :scope="scope" :column="item" />
             <template v-if="!props.customContent">
               <!-- 文本内容 -->
-              <div v-if="item.type === 'text'" style="text-align: center;width: 100%;">
+              <div v-if="item.type === 'text'" style="text-align: center;width: 100%;line-height: 30px;">
                 {{ scope.row[item.value] }}
               </div>
               <!-- 输入框 -->
@@ -290,7 +299,8 @@
                   v-for="citem in getAnySelect(item.text, title)"
                   :key="citem.id"
                   :label="citem.name"
-                  :value="citem.name"
+                  :disabled="citem.disabled"
+                  :value="citem[item.bind ? item.bind : 'name']"
                 />
               </el-select>
               <!-- 输入下拉框(与字典联动) -->
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index a7f51f0..1bbfc91 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -248,7 +248,7 @@
       currentRepresentErrorIndirect: standardRef.value.form.currentRepresentErrorIndirect, // 电流表示值误差(间接测量)
       rippleVoltage: standardRef.value.form.rippleVoltage, // 纹波电压
       voltageOutputStability: standardRef.value.form.voltageOutputStability, // 输出电压短期稳定性
-      measureItemDataDcPowerList: standardRef.value.list.map((item: any) => ({
+      measureItemDataDcPowerList: standardRef.value.getList().map((item: any) => ({
         ...item,
         itemId: infoId.value,
       })), // 鉴定项列表

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 0ba2c90..9bc4d06 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -42,6 +42,7 @@
     return row[span]
   }
 }
+// 初始化列表数据
 export function initTableRow(data: any) {
   let tableData = []
   tableData = data.map((item: any) => {
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index aab09b4..2fa868a 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -52,6 +52,7 @@
 watch(() => props.form, (newVal) => {
   form.value = newVal
 })
+// 取消列表把列表置空
 const pageEditFlag = ref(false)
 const tableLoading = ref(false)
 const list = ref<IList[]>([])
@@ -111,7 +112,7 @@
 // ----------------------------------------表头------------------------------------------------
 const columns_line_voltage_regulation = ref<TableColumn[]>([ // 电源电压调整率
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '调压器输出值', value: 'voltageRegulatorOutputValue', align: 'center', required: true, type: 'select' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'input' },
@@ -126,12 +127,12 @@
 // 电压表示值误差(数字式)、电流表示值误差(直接测量)--(数字式)
 const columns_voltage_representation_value_error_number = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'input' },
 ])
 // 电压表示值误差(数字式)
@@ -141,24 +142,24 @@
 // 电压表示值误差(指针式)、电流表示值误差(直接测量)--(指针式)
 const columns_voltage_representation_value_error_pointer = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
 ])
 // 电流表示值误差(间接测量)--数字式
 const columns_ammeter_indirect_number = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值', value: 'standardResistanceValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值单位', value: 'standardResistanceValueUnit', align: 'center', required: true, type: 'select' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'input' },
 ])
 // 电流表示值误差(间接测量)
@@ -166,26 +167,26 @@
 // 电流表示值误差(间接测量)--指针式
 const columns_ammeter_indirect_pointer = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值', value: 'standardResistanceValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值单位', value: 'standardResistanceValueUnit', align: 'center', required: true, type: 'select' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
 ])
 // 纹波电压
 const columns_ripple_voltage = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' },
 ])
 // 输出电压短期稳定性
 const columns_output_voltage_stability = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '仪器技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'input' },
 ])
@@ -263,14 +264,9 @@
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
         }
-        console.log(data, 'data')
         lineVoltageRegulationList.value.push(data)
         break
       case '负载调整率': // 负载调整率
-        if (loadRegulationList.value.length === 8) {
-          ElMessage.warning('最多添加四项')
-          return
-        }
         data = {
           params: '负载调整率',
           dataType: '2',
@@ -295,15 +291,16 @@
           measureIndicationValue: '', // 被检表示值
           resolution: '0.0001', // 分辨力
           editable: true,
-          maximumError: '', // 最大允许误差
+
         }
-        if (form.value.ammeterDirectType === '1') {
+        if (form.value.voltageRepresentationValueErrorType === '1') {
           //  数字式
           voltageRepresentationValueErrorList.value.push({
             ...data,
             dataTypeType: '1',
             errorParamA: '', // 误差参数a
             errorParamB: '', // 误差参数b
+            maximumError: '',
           })
         }
         else {
@@ -313,6 +310,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -345,6 +343,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -380,6 +379,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -460,7 +460,6 @@
   let result = true
   for (const i in columnsDict.value) {
     const requireLength = !!((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i])
-    console.log(requireLength, 'requireLength')
     if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
       result = false
       break
@@ -601,8 +600,21 @@
     fun(true)
     return
   }
+  // 指针式 禁用最大允许误差
+
+  if (scope.row.dataTypeType === '2' && column.text === '最大允许误差') {
+    fun(true)
+    return
+  }
   fun(props.pageType === 'detail')
 }
+// 禁用某一个选项
+// const disabledItem = ({ scope, column, citem }, fun) => {
+//   if (scope.row.dataTypeType === '1' && column.text === '最大允许误差' && citem.value === '1') {
+//     return true
+//   }
+//   return false
+// }
 // ---------------------------------------------获取字典---------------------------------------------------
 const TechnicalIndexSymbolList = ref<{ value: string;name: string;id: string }[]>([]) // 技术指标前符号
 const OutputChannelList = ref<{ value: string;name: string;id: string }[]>([]) // 输出通道
@@ -678,8 +690,18 @@
     测量单位: unitList1.value,
   }
 }
+// 生成最终list
+const getList = () => {
+  let result = []
+  for (const i in chekedDict) {
+    if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) {
+      result = [...result, ...listDict.value[i]]
+    }
+  }
+  return result
+}
 fecthDict()
-defineExpose({ list, checkAllList, form })
+defineExpose({ list, checkAllList, form, getList })
 </script>
 
 <template>
@@ -765,6 +787,7 @@
     :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation" :page-type="pageType" title="电压表示值误差" index="3" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电压表示值误差')"
     @add-row="addRow"
     @del-row="delRow"
@@ -806,6 +829,7 @@
     :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -835,6 +859,7 @@
     :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -848,7 +873,7 @@
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterDirectType"
+        v-model="form.ammeterIndirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
         class="full-width-input"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index bd7608e..b4634c0 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -85,7 +85,7 @@
     default: () => ([]),
   },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'addRow', 'delRow', 'changeLoadSituationa', 'calculateResult', 'disabled'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'addRow', 'delRow', 'changeLoadSituationa', 'calculateResult', 'disabled', 'disabledItem'])
 // ------------------------------------------字典----------------------------------------------
 // -------定义数据--------------
 interface columnsCheckInfo {
@@ -169,13 +169,22 @@
   })
   return result
 }
+// 下拉框某一项禁用情况
+// citem 当前下拉框选项
+// const disabledItem = (scope: any, column: any, citem: any) => {
+//   let result = false
+//   emit('disabledItem', { scope, column, citem }, (value: boolean) => {
+//     result = value
+//   })
+//   return result
+// }
 // 下拉框获取焦点 或者 下拉框的值发生变化
 const changeLoadSituationa = (value: any, index: number, text: string, type: string, list: any[], title: string) => {
   emit('changeLoadSituationa', value, index, text, type, list, title)
 }
 // 计算结果
-const calculateResult = (title) => {
-  emit('calculateResult', title)
+const calculateResult = (title: string, index: string) => {
+  emit('calculateResult', title, index)
 }
 // 获取字典value
 const getDictValue = (value: string) => {
@@ -221,7 +230,7 @@
         <el-button v-if="props.showBtn" type="info" @click="delRow(selectList, props.data, props.title)">
           删除行
         </el-button>
-        <el-button v-if="props.calcBtn" type="primary" @click="calculateResult(props.title)">
+        <el-button v-if="props.calcBtn" type="primary" @click="calculateResult(props.title, props.index)">
           计算结果
         </el-button>
         <!-- 自定义按钮 -->
@@ -263,7 +272,7 @@
             <slot v-if="props.customContent" name="custom-content" :scope="scope" :column="item" />
             <template v-if="!props.customContent">
               <!-- 文本内容 -->
-              <div v-if="item.type === 'text'" style="text-align: center;width: 100%;">
+              <div v-if="item.type === 'text'" style="text-align: center;width: 100%;line-height: 30px;">
                 {{ scope.row[item.value] }}
               </div>
               <!-- 输入框 -->
@@ -290,7 +299,8 @@
                   v-for="citem in getAnySelect(item.text, title)"
                   :key="citem.id"
                   :label="citem.name"
-                  :value="citem.name"
+                  :disabled="citem.disabled"
+                  :value="citem[item.bind ? item.bind : 'name']"
                 />
               </el-select>
               <!-- 输入下拉框(与字典联动) -->
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index a7f51f0..1bbfc91 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -248,7 +248,7 @@
       currentRepresentErrorIndirect: standardRef.value.form.currentRepresentErrorIndirect, // 电流表示值误差(间接测量)
       rippleVoltage: standardRef.value.form.rippleVoltage, // 纹波电压
       voltageOutputStability: standardRef.value.form.voltageOutputStability, // 输出电压短期稳定性
-      measureItemDataDcPowerList: standardRef.value.list.map((item: any) => ({
+      measureItemDataDcPowerList: standardRef.value.getList().map((item: any) => ({
         ...item,
         itemId: infoId.value,
       })), // 鉴定项列表
diff --git a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
index 9311317..13b0ac0 100644
--- a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
@@ -1,5 +1,61 @@
 // 检定项数据表格
 export interface IDetailMeasureList {
-  id: string
+  absoluteError: string
+  createTime: string
+  dataId: string | number
+  dataType: string
+  dataTypeType: string
+  exceedMark: string | number
+  id: string | number
+  loadRegulation: string
+  loadSituation: string
+  maximumError: string
+  maximumErrorUnit: string
+  measureIndicationValue: string
+  outputChannel: string
+  outputVoltageMaxChange: string
+  resolution: string | number
+  resolutionDigit: string | number
+  rippleVoltage: string
+  shortTermStability: string
+  standardResistanceValue: string
+  standardResistanceValueUnit: string
+  standardValue: string
+  standardVoltageValue: string
+  standardVoltageValueUnit: string
+  technicalIndex: string
+  technicalIndexDigit: string | number
+  technicalIndexSymbol: string
+  unit: string
+  updateTime: string
+  voltageDifference: string
+  voltageMaxDifference: string
+  voltageOutputValue: string
+  voltageRegulation: string
+  voltageRegulatorOutputValue: string
+  params: string
+  errorParamA: string
+  errorParamB: string
+  fullScaleValue: string
+  accuracyA: string
+}
+
+export interface itemFormDataType {
+  itemId: string // 检定项id
+  itemCategoryName: string // 设备检定项分类名称
+  itemCategoryId: string // 设备检定项分类名称id
+  belongStandardEquipment: string // 标准装置code
+  belongStandardEquipmentName: string // 标准装置名称
+  appearanceRemark: string // 外观（1/string | numberr）
+  appearanceFunctionCheck: string | numberr // 外观
+  voltageRegulation: string | numberr // 电源电压调整率
+  loadRegulation: string | numberr // 负载调整率
+  voltageRepresentError: string | numberr // 电压表示值误差
+  currentRepresentErrorDirect: string | numberr // 电流表示值误差(直接测量)
+  currentRepresentErrorIndirect: string | numberr // 电流表示值误差(间接测量)
+  rippleVoltage: string | numberr // 纹波电压
+  voltageOutputStability: string | numberr // 输出电压短期稳定性
+  remark: string // 情况说明
+  conclusion: string // 检验结论
 
 }

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 0ba2c90..9bc4d06 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -42,6 +42,7 @@
     return row[span]
   }
 }
+// 初始化列表数据
 export function initTableRow(data: any) {
   let tableData = []
   tableData = data.map((item: any) => {
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index aab09b4..2fa868a 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -52,6 +52,7 @@
 watch(() => props.form, (newVal) => {
   form.value = newVal
 })
+// 取消列表把列表置空
 const pageEditFlag = ref(false)
 const tableLoading = ref(false)
 const list = ref<IList[]>([])
@@ -111,7 +112,7 @@
 // ----------------------------------------表头------------------------------------------------
 const columns_line_voltage_regulation = ref<TableColumn[]>([ // 电源电压调整率
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '调压器输出值', value: 'voltageRegulatorOutputValue', align: 'center', required: true, type: 'select' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'input' },
@@ -126,12 +127,12 @@
 // 电压表示值误差(数字式)、电流表示值误差(直接测量)--(数字式)
 const columns_voltage_representation_value_error_number = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'input' },
 ])
 // 电压表示值误差(数字式)
@@ -141,24 +142,24 @@
 // 电压表示值误差(指针式)、电流表示值误差(直接测量)--(指针式)
 const columns_voltage_representation_value_error_pointer = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
 ])
 // 电流表示值误差(间接测量)--数字式
 const columns_ammeter_indirect_number = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值', value: 'standardResistanceValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值单位', value: 'standardResistanceValueUnit', align: 'center', required: true, type: 'select' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'input' },
 ])
 // 电流表示值误差(间接测量)
@@ -166,26 +167,26 @@
 // 电流表示值误差(间接测量)--指针式
 const columns_ammeter_indirect_pointer = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值', value: 'standardResistanceValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值单位', value: 'standardResistanceValueUnit', align: 'center', required: true, type: 'select' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
 ])
 // 纹波电压
 const columns_ripple_voltage = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' },
 ])
 // 输出电压短期稳定性
 const columns_output_voltage_stability = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '仪器技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'input' },
 ])
@@ -263,14 +264,9 @@
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
         }
-        console.log(data, 'data')
         lineVoltageRegulationList.value.push(data)
         break
       case '负载调整率': // 负载调整率
-        if (loadRegulationList.value.length === 8) {
-          ElMessage.warning('最多添加四项')
-          return
-        }
         data = {
           params: '负载调整率',
           dataType: '2',
@@ -295,15 +291,16 @@
           measureIndicationValue: '', // 被检表示值
           resolution: '0.0001', // 分辨力
           editable: true,
-          maximumError: '', // 最大允许误差
+
         }
-        if (form.value.ammeterDirectType === '1') {
+        if (form.value.voltageRepresentationValueErrorType === '1') {
           //  数字式
           voltageRepresentationValueErrorList.value.push({
             ...data,
             dataTypeType: '1',
             errorParamA: '', // 误差参数a
             errorParamB: '', // 误差参数b
+            maximumError: '',
           })
         }
         else {
@@ -313,6 +310,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -345,6 +343,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -380,6 +379,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -460,7 +460,6 @@
   let result = true
   for (const i in columnsDict.value) {
     const requireLength = !!((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i])
-    console.log(requireLength, 'requireLength')
     if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
       result = false
       break
@@ -601,8 +600,21 @@
     fun(true)
     return
   }
+  // 指针式 禁用最大允许误差
+
+  if (scope.row.dataTypeType === '2' && column.text === '最大允许误差') {
+    fun(true)
+    return
+  }
   fun(props.pageType === 'detail')
 }
+// 禁用某一个选项
+// const disabledItem = ({ scope, column, citem }, fun) => {
+//   if (scope.row.dataTypeType === '1' && column.text === '最大允许误差' && citem.value === '1') {
+//     return true
+//   }
+//   return false
+// }
 // ---------------------------------------------获取字典---------------------------------------------------
 const TechnicalIndexSymbolList = ref<{ value: string;name: string;id: string }[]>([]) // 技术指标前符号
 const OutputChannelList = ref<{ value: string;name: string;id: string }[]>([]) // 输出通道
@@ -678,8 +690,18 @@
     测量单位: unitList1.value,
   }
 }
+// 生成最终list
+const getList = () => {
+  let result = []
+  for (const i in chekedDict) {
+    if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) {
+      result = [...result, ...listDict.value[i]]
+    }
+  }
+  return result
+}
 fecthDict()
-defineExpose({ list, checkAllList, form })
+defineExpose({ list, checkAllList, form, getList })
 </script>
 
 <template>
@@ -765,6 +787,7 @@
     :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation" :page-type="pageType" title="电压表示值误差" index="3" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电压表示值误差')"
     @add-row="addRow"
     @del-row="delRow"
@@ -806,6 +829,7 @@
     :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -835,6 +859,7 @@
     :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -848,7 +873,7 @@
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterDirectType"
+        v-model="form.ammeterIndirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
         class="full-width-input"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index bd7608e..b4634c0 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -85,7 +85,7 @@
     default: () => ([]),
   },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'addRow', 'delRow', 'changeLoadSituationa', 'calculateResult', 'disabled'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'addRow', 'delRow', 'changeLoadSituationa', 'calculateResult', 'disabled', 'disabledItem'])
 // ------------------------------------------字典----------------------------------------------
 // -------定义数据--------------
 interface columnsCheckInfo {
@@ -169,13 +169,22 @@
   })
   return result
 }
+// 下拉框某一项禁用情况
+// citem 当前下拉框选项
+// const disabledItem = (scope: any, column: any, citem: any) => {
+//   let result = false
+//   emit('disabledItem', { scope, column, citem }, (value: boolean) => {
+//     result = value
+//   })
+//   return result
+// }
 // 下拉框获取焦点 或者 下拉框的值发生变化
 const changeLoadSituationa = (value: any, index: number, text: string, type: string, list: any[], title: string) => {
   emit('changeLoadSituationa', value, index, text, type, list, title)
 }
 // 计算结果
-const calculateResult = (title) => {
-  emit('calculateResult', title)
+const calculateResult = (title: string, index: string) => {
+  emit('calculateResult', title, index)
 }
 // 获取字典value
 const getDictValue = (value: string) => {
@@ -221,7 +230,7 @@
         <el-button v-if="props.showBtn" type="info" @click="delRow(selectList, props.data, props.title)">
           删除行
         </el-button>
-        <el-button v-if="props.calcBtn" type="primary" @click="calculateResult(props.title)">
+        <el-button v-if="props.calcBtn" type="primary" @click="calculateResult(props.title, props.index)">
           计算结果
         </el-button>
         <!-- 自定义按钮 -->
@@ -263,7 +272,7 @@
             <slot v-if="props.customContent" name="custom-content" :scope="scope" :column="item" />
             <template v-if="!props.customContent">
               <!-- 文本内容 -->
-              <div v-if="item.type === 'text'" style="text-align: center;width: 100%;">
+              <div v-if="item.type === 'text'" style="text-align: center;width: 100%;line-height: 30px;">
                 {{ scope.row[item.value] }}
               </div>
               <!-- 输入框 -->
@@ -290,7 +299,8 @@
                   v-for="citem in getAnySelect(item.text, title)"
                   :key="citem.id"
                   :label="citem.name"
-                  :value="citem.name"
+                  :disabled="citem.disabled"
+                  :value="citem[item.bind ? item.bind : 'name']"
                 />
               </el-select>
               <!-- 输入下拉框(与字典联动) -->
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index a7f51f0..1bbfc91 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -248,7 +248,7 @@
       currentRepresentErrorIndirect: standardRef.value.form.currentRepresentErrorIndirect, // 电流表示值误差(间接测量)
       rippleVoltage: standardRef.value.form.rippleVoltage, // 纹波电压
       voltageOutputStability: standardRef.value.form.voltageOutputStability, // 输出电压短期稳定性
-      measureItemDataDcPowerList: standardRef.value.list.map((item: any) => ({
+      measureItemDataDcPowerList: standardRef.value.getList().map((item: any) => ({
         ...item,
         itemId: infoId.value,
       })), // 鉴定项列表
diff --git a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
index 9311317..13b0ac0 100644
--- a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
@@ -1,5 +1,61 @@
 // 检定项数据表格
 export interface IDetailMeasureList {
-  id: string
+  absoluteError: string
+  createTime: string
+  dataId: string | number
+  dataType: string
+  dataTypeType: string
+  exceedMark: string | number
+  id: string | number
+  loadRegulation: string
+  loadSituation: string
+  maximumError: string
+  maximumErrorUnit: string
+  measureIndicationValue: string
+  outputChannel: string
+  outputVoltageMaxChange: string
+  resolution: string | number
+  resolutionDigit: string | number
+  rippleVoltage: string
+  shortTermStability: string
+  standardResistanceValue: string
+  standardResistanceValueUnit: string
+  standardValue: string
+  standardVoltageValue: string
+  standardVoltageValueUnit: string
+  technicalIndex: string
+  technicalIndexDigit: string | number
+  technicalIndexSymbol: string
+  unit: string
+  updateTime: string
+  voltageDifference: string
+  voltageMaxDifference: string
+  voltageOutputValue: string
+  voltageRegulation: string
+  voltageRegulatorOutputValue: string
+  params: string
+  errorParamA: string
+  errorParamB: string
+  fullScaleValue: string
+  accuracyA: string
+}
+
+export interface itemFormDataType {
+  itemId: string // 检定项id
+  itemCategoryName: string // 设备检定项分类名称
+  itemCategoryId: string // 设备检定项分类名称id
+  belongStandardEquipment: string // 标准装置code
+  belongStandardEquipmentName: string // 标准装置名称
+  appearanceRemark: string // 外观（1/string | numberr）
+  appearanceFunctionCheck: string | numberr // 外观
+  voltageRegulation: string | numberr // 电源电压调整率
+  loadRegulation: string | numberr // 负载调整率
+  voltageRepresentError: string | numberr // 电压表示值误差
+  currentRepresentErrorDirect: string | numberr // 电流表示值误差(直接测量)
+  currentRepresentErrorIndirect: string | numberr // 电流表示值误差(间接测量)
+  rippleVoltage: string | numberr // 纹波电压
+  voltageOutputStability: string | numberr // 输出电压短期稳定性
+  remark: string // 情况说明
+  conclusion: string // 检验结论
 
 }
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index bcc217a..4de8a51 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -8,7 +8,7 @@
 import selectStandard from '../../dialog/selectStandardDialog.vue'
 import TemplateFormAndTable from '../templateFormAndTable.vue'
 import { useSolveFormData } from '../useSolveFormData'
-import type { IDetailMeasureList } from './second-interface'
+import type { IDetailMeasureList, itemFormDataType } from './second-interface'
 import templateTable1 from './templateTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { dictType } from '@/global'
@@ -20,6 +20,7 @@
 import { calc } from '@/utils/useCalc'
 import templateTable from '@/views/business/measure/item/components/second/templateTable.vue'
 import { initTableRow } from '@/commonMethods/useMergeTableRow'
+import { differenceArray } from '@/utils/Array'
 const props = defineProps({
   infoId: String, // id
   dataNo: String, // 检定数据编号
@@ -29,14 +30,15 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute() // 路由参数
 const ruleFormRef = ref() // 表单ref
+const list = ref([]) // 总数据
 const templateFormAndTableRef = ref() // 表单和被检设备、测量设备表格公共组件ref
-const itemFormData = ref({ // 有关于检定项的数据
+const itemFormData = ref<itemFormDataType>({ // 有关于检定项的数据
   itemId: '', // 检定项id
   itemCategoryName: '', // 设备检定项分类名称
   itemCategoryId: '', // 设备检定项分类名称id
   belongStandardEquipment: '', // 标准装置code
   belongStandardEquipmentName: '', // 标准装置名称
-  appearance: '外观完好，工作正常', // 外观（1/0）
+  appearanceRemark: '外观完好，工作正常', // 外观（1/0）
   appearanceFunctionCheck: 0, // 外观
   voltageRegulation: 0, // 电源电压调整率
   loadRegulation: 0, // 负载调整率
@@ -53,7 +55,6 @@
 const infoId = ref('') // 列表id
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -74,85 +75,120 @@
 const ammeterIndirectList = ref<IDetailMeasureList[]>([]) // 电流表示值误差（间接测量）
 const rippleVoltageList = ref<IDetailMeasureList[]>([]) // 纹波电压
 const outputVoltageStabilityList = ref<IDetailMeasureList[]>([]) // 输出电压短期稳定性
-
+const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({})
+const setListDict = () => {
+  listDict.value = {
+    '1-电源电压调整率': lineVoltageRegulationList.value, // 1
+    '2-负载调整率': loadRegulationList.value, // 2
+    '3-电压表示值误差': voltageRepresentationValueErrorList.value, // 3
+    '4-电流表示值误差(直接测量)': ammeterDirectList.value, // 4
+    '5-电流表示值误差(间接测量)': ammeterIndirectList.value, // 5
+    '6-纹波电压': rippleVoltageList.value, // 6
+    '7-输出电压短期稳定性': outputVoltageStabilityList.value, // 7
+  }
+}
 const columns_line_voltage_regulation = ref<TableColumn[]>([ // 电源电压调整率
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   { text: '调压器输出值', value: 'voltageRegulatorOutputValue', align: 'center', required: true, type: 'text' },
-  { text: '被检电源输出电压值', value: 'voltageOutputValue', align: 'center', required: true, type: 'input' },
+  { text: '被检电源输出电压值', value: 'voltageOutputValue', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
   { text: '被检电源输出电压最大差值', value: 'voltageMaxDifference', align: 'center', required: false, type: 'text' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'text' },
   { text: '电源电压调整率', value: 'voltageRegulation', align: 'center', required: false, type: 'text' },
 ])
-
 const columns_load_regulation = ref<TableColumn[]>([ // 负载调整率
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   { text: '负载情况', value: 'loadSituation', align: 'center', required: true, type: 'text' },
-  { text: '被检电源输出电压值', value: 'voltageOutputValue', align: 'center', required: true, type: 'input' },
-  { text: '电压差值', value: 'voltageDifference', align: 'center', required: true, type: 'text' },
+  { text: '被检电源输出电压值', value: 'voltageOutputValue', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
+  { text: '电压差值', value: 'voltageDifference', align: 'center', type: 'text' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'text' },
-  { text: '负载调整率', value: 'loadRegulation', align: 'center', required: true, type: 'text' },
+  { text: '负载调整率', value: 'loadRegulation', align: 'center', type: 'text' },
 ])
-
 // 电压表示值误差
 const columns_voltage_representation_value_error = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
   { text: '标准值', value: 'standardValue', align: 'center', required: true, type: 'input' },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'text' },
-  { text: '绝对误差', value: 'absoluteError', align: 'center', required: true, type: 'text' },
+  { text: '绝对误差', value: 'absoluteError', align: 'center', type: 'text' },
 ])
-
 // 电流表示值误差（间接测量）
 const columns_ammeter_indirect = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
-  { text: '标准电压值', value: 'standardVoltageValue', align: 'center', required: true, type: 'input' },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, type: 'text' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
+  { text: '标准电压值', value: 'standardVoltageValue', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
+  { text: '标准值', value: 'standardValue', align: 'center', type: 'text' },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'text' },
-  { text: '绝对误差', value: 'absoluteError', align: 'center', required: true, type: 'text' },
+  { text: '绝对误差', value: 'absoluteError', align: 'center', type: 'text' },
 ])
-
 // 纹波电压
 const columns_ripple_voltage = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'text' },
-  { text: '纹波电压', value: 'rippleVoltage', align: 'center', required: true, type: 'input' },
+  { text: '纹波电压', value: 'rippleVoltage', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
 ])
-
 // 输出电压短期稳定性
-const columns_output_voltage_stability = ref<TableColumn[]>([
+const columns_output_voltage_stability = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'text' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
-  { text: '被测电源输出电压', value: 'voltageOutputValue', align: 'center', required: true, type: 'input' },
-  { text: '输出电压最大变化值', value: 'outputVoltageMaxChange', align: 'center', required: true, type: 'text' },
+  { text: '被测电源输出电压', value: 'voltageOutputValue', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
+  { text: '输出电压最大变化值', value: 'outputVoltageMaxChange', align: 'center', type: 'text' },
   { text: '仪器技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'text' },
-  { text: '短期稳定性', value: 'shortTermStability', align: 'center', required: true, type: 'text' },
+  { text: '短期稳定性', value: 'shortTermStability', align: 'center', type: 'text' },
 ])
+const columnsDict = ref<{ [key: string]: any[] | TableColumn[] }>({
+  '1-电源电压调整率': columns_line_voltage_regulation.value, // 1
+  '2-负载调整率': columns_load_regulation.value, // 2
+  '3-电压表示值误差': columns_voltage_representation_value_error.value, // 3
+  '4-电流表示值误差(直接测量)': columns_voltage_representation_value_error.value, // 4
+  '5-电流表示值误差(间接测量)': columns_ammeter_indirect.value, // 5
+  '6-纹波电压': columns_ripple_voltage.value, // 6
+  '7-输出电压短期稳定性': columns_output_voltage_stability.value, // 7
+})
+watch(() => pageType.value, (newValue) => {
+  if (newValue) {
+    if (newValue === 'detail') {
+      for (const i in columnsDict.value) {
+        columnsDict.value[i].forEach((item: TableColumn | any) => {
+          item.type = 'text'
+        })
+      }
+    }
+  }
+})
 // 增加行 - 输出电压短期稳定性
 const addRow = () => {
+  if (!checkList(outputVoltageStabilityList.value, columns_output_voltage_stability.value, '输出电压短期稳定性')) { return }
+  // 增加行
   outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1])
+  // 初始化数据
   outputVoltageStabilityList.value = initTableRow(outputVoltageStabilityList.value)
-  // outputVoltageStabilityList.value = outputVoltageStabilityList.value.map((item) => {
-  //   const obj = {}
-  //   for (const i in item) {
-  //     if (!i.includes('-span')) {
-  //       obj[i] = item[i]
-  //     }
-  //   }
-  //   console.log(obj, 'obj')
-  //   return obj
-  // })
+}
+// 删除行
+const delRow = (checkList: any[]) => {
+  if (!checkList.length) {
+    ElMessage.warning('请选择需要删除的数据')
+    return
+  }
+  // 每个输入通道，最少需要有二行数据
+  if (checkList.every(item => outputVoltageStabilityList.value.filter(citem => citem.outputChannel === item.outputChannel).length < 2)) {
+    ElMessage.warning('输出通道最少需要有两行数据')
+    return
+  }
+  // 删除行
+  outputVoltageStabilityList.value = differenceArray(outputVoltageStabilityList.value, checkList)
+  // 初始化数据
+  outputVoltageStabilityList.value = initTableRow(outputVoltageStabilityList.value)
 }
 // -------------------------------------------获取详情信息--------------------------------------------------
 // 获取页面详情信息
@@ -169,34 +205,53 @@
     orderId: $route.query.orderId, // 任务单id
     sampleId: $route.query.sampleId, // 被检设备id
   }).then((res) => {
+    console.log(res.data, '编辑 详情')
     // 有关于检定项的数据
-    itemFormData.value.itemId = res.data.itemId // 检定项id
-    itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称
-    itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id
-    itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0）
-
+    itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
+    initInputData(res.data.measureDataDcPowerList)
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
-
-    // list.value = res.data.measureDataPistonGaugeList.map((item: IDetailMeasureList) => {
-    //   return {
-    //     ...item,
-    //     editable: pageType.value !== 'detail',
-    //   }
-    // }) // 检定数据
-
     infoId.value = res.data.id
     emits('giveInfoId', infoId.value)
     loading.close()
   })
 }
-
+// 最大允许误差 计算
+const calcMaxError = (item: any) => {
+  // 1数字式、2指针式
+  if (item.dataTypeType === '1') {
+    if (item.maximumError === '2') {
+      return Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB) * Number(item.resolution)
+    }
+    else if (item.maximumError === '2') {
+      return Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB)
+    }
+    else if (item.maximumError === '1') {
+      return Number(item.accuracyA) * Number(item.fullScaleValue)
+    }
+  }
+  else if (item.dataTypeType === '2') {
+    return Number(item.accuracyA) * Number(item.fullScaleValue)
+  }
+}
+// 初始化数据
+function initAllData() {
+  for (const i in listDict.value) {
+    listDict.value[i] = []
+  }
+  lineVoltageRegulationList.value = []
+  loadRegulationList.value = []
+  voltageRepresentationValueErrorList.value = []
+  ammeterDirectList.value = []
+  ammeterIndirectList.value = []
+  rippleVoltageList.value = []
+  outputVoltageStabilityList.value = []
+}
 // 初始化输入数据
-const initInputData = (data: any) => {
-  console.log(data, 'data')
-  data.forEach((item: any) => {
-    console.log(item, 'item')
+function initInputData(data: any[]) {
+  initAllData()
+  data.forEach((item) => {
     switch (item.dataType) {
       case '1':
         // 电源电压调整率
@@ -208,15 +263,15 @@
         break
       case '3':
         // 电压表示值误差
-        voltageRepresentationValueErrorList.value.push({ ...item, params: '电压表示值误差' })
+        voltageRepresentationValueErrorList.value.push({ ...item, params: '电压表示值误差', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : item.maximumError })
         break
       case '4':
         // 电流表示值误差(直接测量)
-        ammeterDirectList.value.push({ ...item, params: '电流表示值误差(直接测量)' })
+        ammeterDirectList.value.push({ ...item, params: '电流表示值误差(直接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : item.maximumError })
         break
       case '5':
         // 电流表示值误差(间接测量)
-        ammeterIndirectList.value.push({ ...item, params: '电流表示值误差(间接测量)' })
+        ammeterIndirectList.value.push({ ...item, params: '电流表示值误差(间接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : item.maximumError })
         break
       case '6':
         // 纹波电压
@@ -228,8 +283,15 @@
         break
     }
   })
+  setListDict()
 }
-
+const getList = () => {
+  let arr = [] as IDetailMeasureList[]
+  for (const i in listDict.value) {
+    arr = [...arr, ...listDict.value[i]]
+  }
+  return arr
+}
 /**
  * 新增的时候获取检定项输入数据(获取检定项分类详情)
  * @param itemId  检定项id
@@ -243,7 +305,6 @@
     belongStandardEquipment, // 检校标准装置字典code
   }
   getItemInfo(params).then((res) => {
-    console.log(res.data, '鉴定项')
     itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
     itemFormData.value.voltageRegulation = res.data.voltageRegulation // 电源电压调整率
     itemFormData.value.loadRegulation = res.data.loadRegulation // 负载调整率
@@ -252,7 +313,7 @@
     itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流表示值误差(间接测量)
     itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压
     itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性
-    initInputData(res.data.measureItemDataDcPowerList)
+    initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' })))
   })
 }
 // -----------------------------------------字典----------------------------------------
@@ -265,49 +326,84 @@
 // 调压器输出值
 // ----------------------------------------点击保存时校验---------------------------------------
 // 校验
-const checkout = () => {
+// 检查数据
+function checkList(list: IDetailMeasureList[], columns: TableColumn[] | any[], title: string) {
+  return useCheckList(list, columns, title)
+}
+// 检查所有数据
+function checkAllList() {
+  let result = true
+  for (const i in columnsDict.value) {
+    const requireLength = listDict.value[i].length > 0
+    if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
+      result = false
+      break
+    }
+  }
+  return result
 }
 // -----------------------------------------生成结果处理----------------------------------------
+// 计算
+const calculateFun = async (list: IDetailMeasureList[]) => {
+  let result = [] as any[]
+  const params = {
+    belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
+    itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
+    measureDataDcPowerList: list,
+  }
+  const res = await calculateHandle(params)
+  result = res.data
+  return result
+}
+// 计算单独鉴定项
+const caclItem = async (list: IDetailMeasureList[], columns: TableColumn[] | any[], title: string) => {
+  if (!checkList(list, columns, title)) { return }
+  const res = await calculateFun(list)
+  return res.map(item => ({ ...item, params: title }))
+}
 // 点击计算结果
-const calculate = (title: string) => {
-  console.log(title, 'title')
+const calculate = async (title: string, index: string) => {
+  let result = [] as IDetailMeasureList[]
   switch (title) {
     case '电源电压调整率':
-      // lineVoltageRegulationList.value.forEach((item: any) => {
-      //   // 计算 被检电源输出电压最大差值 调压器输出值的最大值与最小值的被检电源输出电压值差的绝对值
-      //   const voltageRegulatorOutputValue = RegulatorOutputValue.value.map(item => Number(item.name))
-      //   // console.log(Math.max(...voltageRegulatorOutputValue))
-      //   console.log(Math.max(...voltageRegulatorOutputValue), Math.min(...voltageRegulatorOutputValue))
-      //   item.voltageMaxDifference = Math.abs(Math.max(...voltageRegulatorOutputValue) - Number(item.voltageOutputValue)) - Math.abs(Math.min(...voltageRegulatorOutputValue) - Number(item.voltageOutputValue))
-      // })
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      lineVoltageRegulationList.value = result || lineVoltageRegulationList.value
+      setListDict()
       break
+    case '负载调整率':
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      loadRegulationList.value = result || loadRegulationList.value
+      setListDict()
+      break
+    case '电压表示值误差':
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      voltageRepresentationValueErrorList.value = result || voltageRepresentationValueErrorList.value
+      setListDict()
+      break
+    case '电流表示值误差(直接测量)':
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      ammeterDirectList.value = result || ammeterDirectList.value
+      setListDict()
+      break
+    case '电流表示值误差(间接测量)':
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      ammeterIndirectList.value = result || ammeterIndirectList.value
+      setListDict()
+      break
+    case '纹波电压':
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      rippleVoltageList.value = result || rippleVoltageList.value
+      setListDict()
+      break
+    case '输出电压短期稳定性':
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      outputVoltageStabilityList.value = result || outputVoltageStabilityList.value
+      setListDict()
+      break
+    case '' :
+      if (!checkAllList()) { return }
+      initInputData(await calculateFun(getList()))
   }
-  // ElMessage.info('敬请期待')
-  // return false
-  // if (!list.value.length) {
-  //   ElMessage.warning('没有检定项数据，无法生成结果')
-  //   return false
-  // }
-  // if (!useCheckList(list.value, measureColumns.value, '检定数据')) {
-  //   return false
-  // }
-  // const params = {
-  //   belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
-  //   itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
-  //   measureDataCalibratorList: list.value,
-  // }
-  // calculateHandle(params).then((res) => {
-  //   if (res.data && res.data.length) {
-  //     resultList.value = res.data.map((item: IDetailMeasureList) => {
-  //       return {
-  //         ...item,
-  //       }
-  //     }) // 检定数据
-  //   }
-  //   else {
-  //     list.value = res.data
-  //   }
-  // })
 }
 
 // ------------------------------------------钩子----------------------------------------------
@@ -337,7 +433,7 @@
   }
 })
 
-defineExpose({ checkout, itemFormData, templateFormAndTableRef, pageType })
+defineExpose({ checkList, itemFormData, templateFormAndTableRef, pageType, getList, checkAllList })
 </script>
 
 <template>
@@ -359,12 +455,12 @@
         label-position="right"
         style="margin-top: 20px;"
       >
-        <el-row v-if="itemFormData.appearanceFunctionCheck">
+        <el-row v-if="itemFormData.appearanceFunctionCheck === '1' || itemFormData.appearanceFunctionCheck === 1">
           <!-- 外观  -->
           <el-col :span="12">
-            <el-form-item label="外观及功能性检查:" prop="appearance">
+            <el-form-item label="外观及功能性检查:" prop="appearanceRemark">
               <el-input
-                v-model="itemFormData.appearance"
+                v-model="itemFormData.appearanceRemark"
                 class="full-width-input"
                 autosize
                 type="textarea"
@@ -373,51 +469,96 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <!-- 电源电压调整率 -->
+        <template-table
+          v-if="lineVoltageRegulationList.length" title="电源电压调整率" :data="lineVoltageRegulationList" :columns="columns_line_voltage_regulation"
+          index="1" :show-btn="false" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel', 'voltageMaxDifference', 'technicalIndex', 'voltageRegulation']"
+          @calculate-result="calculate"
+        >
+          <!-- 技术指标 -->
+          <template #pre-content="{ scope, column }">
+            <div v-if="column.text === '被检电源技术指标'" style="line-height: 30px;margin-right: 10px;">
+              {{ scope.row.technicalIndexSymbol }}
+            </div>
+          </template>
+        </template-table>
+        <!-- 负载调整率 -->
+        <template-table
+          v-if="loadRegulationList.length" title="负载调整率" :data="loadRegulationList" :columns="columns_load_regulation"
+          index="2" :show-btn="false" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel', 'voltageDifference', 'technicalIndex', 'loadRegulation']" @calculate-result="calculate"
+        >
+          <!-- 技术指标 -->
+          <template #pre-content="{ scope, column }">
+            <div v-if="column.text === '被检电源技术指标'" style="line-height: 30px;margin-right: 10px;">
+              {{ scope.row.technicalIndexSymbol }}
+            </div>
+          </template>
+        </template-table>
+
+        <!--  电压表示值误差 -->
+        <template-table
+          v-if="voltageRepresentationValueErrorList.length" title="电压表示值误差" :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation_value_error"
+          index="3" :show-btn="false" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
+        >
+          <!-- 符号 -->
+          <template #pre-content="{ column }">
+            <div v-if="column.text === '最大允许误差'" style="line-height: 30px;margin-right: 10px;">
+              ±
+            </div>
+          </template>
+        </template-table>
+
+        <!-- 电流表示值误差（直接测量） -->
+        <template-table
+          v-if="ammeterDirectList.length" title="电流表示值误差(直接测量)" :data="ammeterDirectList" :columns="columns_voltage_representation_value_error"
+          index="4" :show-btn="false" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
+        >
+          <!-- 符号 -->
+          <template #pre-content="{ column }">
+            <div v-if="column.text === '最大允许误差'" style="line-height: 30px;margin-right: 10px;">
+              ±
+            </div>
+          </template>
+        </template-table>
+        <!-- 电流表示值误差（间接测量） -->
+        <template-table
+          v-if="ammeterIndirectList.length" title="电流表示值误差(间接测量)" :data="ammeterIndirectList" :columns="columns_ammeter_indirect"
+          index="5" :show-btn="false" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
+        >
+          <!-- 符号 -->
+          <template #pre-content="{ column }">
+            <div v-if="column.text === '最大允许误差'" style="line-height: 30px;margin-right: 10px;">
+              ±
+            </div>
+          </template>
+        </template-table>
+        <!--  纹波电压 -->
+        <template-table
+          v-if="rippleVoltageList.length" title="纹波电压" :data="rippleVoltageList" :columns="columns_ripple_voltage"
+          index="6" :show-btn="false" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
+        >
+          <!-- 技术指标 -->
+          <template #pre-content="{ scope, column }">
+            <div v-if="column.text === '被检电源技术指标'" style="line-height: 30px;margin-right: 10px;">
+              {{ scope.row.technicalIndexSymbol }}
+            </div>
+          </template>
+        </template-table>
+        <!--  输出电压短期稳定性 -->
+        <template-table
+          v-if="outputVoltageStabilityList.length" title="输出电压短期稳定性" :data="outputVoltageStabilityList" :columns="columns_output_voltage_stability" :disabled="pageType === 'detail'"
+          index="7" :show-btn="pageType !== 'detail'" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="pageType !== 'detail'" :need-merge-cells="['outputVoltageMaxChange', 'technicalIndex', 'shortTermStability']" @calculate-result="calculate"
+          @add-row="addRow"
+          @del-row="delRow"
+        >
+          <!-- 仪器技术指标 -->
+          <template #pre-content="{ scope, column }">
+            <div v-if="column.text === '仪器技术指标'" style="line-height: 30px;margin-right: 10px;">
+              {{ scope.row.technicalIndexSymbol }}
+            </div>
+          </template>
+        </template-table>
       </el-form>
-
-      <!-- 电源电压调整率 -->
-      <template-table
-        v-if="itemFormData.voltageRegulation" title="电源电压调整率" :data="lineVoltageRegulationList" :columns="columns_line_voltage_regulation"
-        index="1" :show-btn="false" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel', 'voltageMaxDifference', 'technicalIndex', 'voltageRegulation']"
-        @calculate-result="calculate"
-      />
-      <!-- 负载调整率 -->
-      <template-table
-        v-if="itemFormData.loadRegulation" title="负载调整率" :data="loadRegulationList" :columns="columns_load_regulation"
-        index="2" :show-btn="false" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel', 'voltageDifference', 'technicalIndex', 'loadRegulation']" @calculate-result="calculate"
-      />
-
-      <!--  电压表示值误差 -->
-      <template-table
-        v-if="itemFormData.voltageRepresentError" title="电压表示值误差" :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation_value_error"
-        index="3" :show-btn="false" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
-      />
-
-      <!-- 电流表示值误差（直接测量） -->
-      <template-table
-        v-if="itemFormData.currentRepresentErrorDirect" title="电流表示值误差(直接测量)" :data="ammeterDirectList" :columns="columns_voltage_representation_value_error"
-        index="4" :show-btn="false" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
-      />
-
-      <!-- 电流表示值误差（间接测量） -->
-      <template-table
-        v-if="itemFormData.currentRepresentErrorIndirect" title="电流表示值误差(间接测量)" :data="ammeterIndirectList" :columns="columns_ammeter_indirect"
-        index="5" :show-btn="false" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
-      />
-
-      <!--  纹波电压 -->
-      <template-table
-        v-if="itemFormData.rippleVoltage" title="纹波电压" :data="rippleVoltageList" :columns="columns_ripple_voltage"
-        index="6" :show-btn="false" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
-      />
-
-      <!--  输出电压短期稳定性 -->
-      <template-table
-        v-if="itemFormData.voltageOutputStability" title="输出电压短期稳定性" :data="outputVoltageStabilityList" :columns="columns_output_voltage_stability"
-        index="7" :show-btn="true" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel', 'outputVoltageMaxChange', 'technicalIndex', 'shortTermStability']" @calculate-result="calculate"
-        @addRow="addRow"
-      />
-
       <!-- 历史修改记录 -->
       <change-record v-show="pageType === 'detail' && current === 'change-record'" :info-id="infoId" />
     </detail-block>

diff --git a/src/commonMethods/useMergeTableRow.ts b/src/commonMethods/useMergeTableRow.ts
index 0ba2c90..9bc4d06 100644
--- a/src/commonMethods/useMergeTableRow.ts
+++ b/src/commonMethods/useMergeTableRow.ts
@@ -42,6 +42,7 @@
     return row[span]
   }
 }
+// 初始化列表数据
 export function initTableRow(data: any) {
   let tableData = []
   tableData = data.map((item: any) => {
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index aab09b4..2fa868a 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -52,6 +52,7 @@
 watch(() => props.form, (newVal) => {
   form.value = newVal
 })
+// 取消列表把列表置空
 const pageEditFlag = ref(false)
 const tableLoading = ref(false)
 const list = ref<IList[]>([])
@@ -111,7 +112,7 @@
 // ----------------------------------------表头------------------------------------------------
 const columns_line_voltage_regulation = ref<TableColumn[]>([ // 电源电压调整率
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '调压器输出值', value: 'voltageRegulatorOutputValue', align: 'center', required: true, type: 'select' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'input' },
@@ -126,12 +127,12 @@
 // 电压表示值误差(数字式)、电流表示值误差(直接测量)--(数字式)
 const columns_voltage_representation_value_error_number = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'input' },
 ])
 // 电压表示值误差(数字式)
@@ -141,24 +142,24 @@
 // 电压表示值误差(指针式)、电流表示值误差(直接测量)--(指针式)
 const columns_voltage_representation_value_error_pointer = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '测量单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
 ])
 // 电流表示值误差(间接测量)--数字式
 const columns_ammeter_indirect_number = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值', value: 'standardResistanceValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值单位', value: 'standardResistanceValueUnit', align: 'center', required: true, type: 'select' },
   { text: '误差参数a', value: 'errorParamA', align: 'center', required: true, type: 'input' },
   { text: '误差参数b', value: 'errorParamB', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
   { text: '分辨力', value: 'resolution', align: 'center', required: true, type: 'input' },
 ])
 // 电流表示值误差(间接测量)
@@ -166,26 +167,26 @@
 // 电流表示值误差(间接测量)--指针式
 const columns_ammeter_indirect_pointer = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值', value: 'standardResistanceValue', align: 'center', required: true, type: 'input' },
   { text: '标准电阻值单位', value: 'standardResistanceValueUnit', align: 'center', required: true, type: 'select' },
   { text: '准确度a', value: 'accuracyA', align: 'center', required: true, type: 'input' },
   { text: '指针式仪表满量程值', value: 'fullScaleValue', align: 'center', required: true, type: 'input' },
-  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select' },
+  { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'select', bind: 'value' },
 ])
 // 纹波电压
 const columns_ripple_voltage = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' },
 ])
 // 输出电压短期稳定性
 const columns_output_voltage_stability = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'select' },
   { text: '仪器技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'input' },
 ])
@@ -263,14 +264,9 @@
           voltageRegulatorOutputValue: '', // 调压器输出值
           editable: true,
         }
-        console.log(data, 'data')
         lineVoltageRegulationList.value.push(data)
         break
       case '负载调整率': // 负载调整率
-        if (loadRegulationList.value.length === 8) {
-          ElMessage.warning('最多添加四项')
-          return
-        }
         data = {
           params: '负载调整率',
           dataType: '2',
@@ -295,15 +291,16 @@
           measureIndicationValue: '', // 被检表示值
           resolution: '0.0001', // 分辨力
           editable: true,
-          maximumError: '', // 最大允许误差
+
         }
-        if (form.value.ammeterDirectType === '1') {
+        if (form.value.voltageRepresentationValueErrorType === '1') {
           //  数字式
           voltageRepresentationValueErrorList.value.push({
             ...data,
             dataTypeType: '1',
             errorParamA: '', // 误差参数a
             errorParamB: '', // 误差参数b
+            maximumError: '',
           })
         }
         else {
@@ -313,6 +310,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -345,6 +343,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -380,6 +379,7 @@
             dataTypeType: '2',
             accuracyA: '', // 准确度a
             fullScaleValue: '', // 指针式仪表满量程值
+            maximumError: '1', // 最大允许误差
           })
         }
         break
@@ -460,7 +460,6 @@
   let result = true
   for (const i in columnsDict.value) {
     const requireLength = !!((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i])
-    console.log(requireLength, 'requireLength')
     if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
       result = false
       break
@@ -601,8 +600,21 @@
     fun(true)
     return
   }
+  // 指针式 禁用最大允许误差
+
+  if (scope.row.dataTypeType === '2' && column.text === '最大允许误差') {
+    fun(true)
+    return
+  }
   fun(props.pageType === 'detail')
 }
+// 禁用某一个选项
+// const disabledItem = ({ scope, column, citem }, fun) => {
+//   if (scope.row.dataTypeType === '1' && column.text === '最大允许误差' && citem.value === '1') {
+//     return true
+//   }
+//   return false
+// }
 // ---------------------------------------------获取字典---------------------------------------------------
 const TechnicalIndexSymbolList = ref<{ value: string;name: string;id: string }[]>([]) // 技术指标前符号
 const OutputChannelList = ref<{ value: string;name: string;id: string }[]>([]) // 输出通道
@@ -678,8 +690,18 @@
     测量单位: unitList1.value,
   }
 }
+// 生成最终list
+const getList = () => {
+  let result = []
+  for (const i in chekedDict) {
+    if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) {
+      result = [...result, ...listDict.value[i]]
+    }
+  }
+  return result
+}
 fecthDict()
-defineExpose({ list, checkAllList, form })
+defineExpose({ list, checkAllList, form, getList })
 </script>
 
 <template>
@@ -765,6 +787,7 @@
     :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation" :page-type="pageType" title="电压表示值误差" index="3" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电压表示值误差')"
     @add-row="addRow"
     @del-row="delRow"
@@ -806,6 +829,7 @@
     :data="ammeterDirectList" :columns="columns_ammeter_direct" :page-type="pageType" title="电流表示值误差(直接测量)" index="4" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(直接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -835,6 +859,7 @@
     :data="ammeterIndirectList" :columns="columns_ammeter_indirect" :page-type="pageType" title="电流表示值误差(间接测量)" index="5" :show-btn="pageType !== 'detail'"
     :select-all-list="tableDict"
     @disabled="disabled"
+    @disabled-item="disabledItem"
     @selection-change="(e) => handleSelectionChange(e, '电流表示值误差(间接测量)')"
     @add-row="addRow"
     @del-row="delRow"
@@ -848,7 +873,7 @@
     <template #custom-right>
       <!-- 选择类型：1数字式、2指针式 -->
       <el-select
-        v-model="form.ammeterDirectType"
+        v-model="form.ammeterIndirectType"
         placeholder="请选择"
         :disabled="pageType === 'detail'"
         class="full-width-input"
diff --git a/src/views/business/measure/item/components/second/templateTable.vue b/src/views/business/measure/item/components/second/templateTable.vue
index bd7608e..b4634c0 100644
--- a/src/views/business/measure/item/components/second/templateTable.vue
+++ b/src/views/business/measure/item/components/second/templateTable.vue
@@ -85,7 +85,7 @@
     default: () => ([]),
   },
 })
-const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'addRow', 'delRow', 'changeLoadSituationa', 'calculateResult', 'disabled'])
+const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange', 'addRow', 'delRow', 'changeLoadSituationa', 'calculateResult', 'disabled', 'disabledItem'])
 // ------------------------------------------字典----------------------------------------------
 // -------定义数据--------------
 interface columnsCheckInfo {
@@ -169,13 +169,22 @@
   })
   return result
 }
+// 下拉框某一项禁用情况
+// citem 当前下拉框选项
+// const disabledItem = (scope: any, column: any, citem: any) => {
+//   let result = false
+//   emit('disabledItem', { scope, column, citem }, (value: boolean) => {
+//     result = value
+//   })
+//   return result
+// }
 // 下拉框获取焦点 或者 下拉框的值发生变化
 const changeLoadSituationa = (value: any, index: number, text: string, type: string, list: any[], title: string) => {
   emit('changeLoadSituationa', value, index, text, type, list, title)
 }
 // 计算结果
-const calculateResult = (title) => {
-  emit('calculateResult', title)
+const calculateResult = (title: string, index: string) => {
+  emit('calculateResult', title, index)
 }
 // 获取字典value
 const getDictValue = (value: string) => {
@@ -221,7 +230,7 @@
         <el-button v-if="props.showBtn" type="info" @click="delRow(selectList, props.data, props.title)">
           删除行
         </el-button>
-        <el-button v-if="props.calcBtn" type="primary" @click="calculateResult(props.title)">
+        <el-button v-if="props.calcBtn" type="primary" @click="calculateResult(props.title, props.index)">
           计算结果
         </el-button>
         <!-- 自定义按钮 -->
@@ -263,7 +272,7 @@
             <slot v-if="props.customContent" name="custom-content" :scope="scope" :column="item" />
             <template v-if="!props.customContent">
               <!-- 文本内容 -->
-              <div v-if="item.type === 'text'" style="text-align: center;width: 100%;">
+              <div v-if="item.type === 'text'" style="text-align: center;width: 100%;line-height: 30px;">
                 {{ scope.row[item.value] }}
               </div>
               <!-- 输入框 -->
@@ -290,7 +299,8 @@
                   v-for="citem in getAnySelect(item.text, title)"
                   :key="citem.id"
                   :label="citem.name"
-                  :value="citem.name"
+                  :disabled="citem.disabled"
+                  :value="citem[item.bind ? item.bind : 'name']"
                 />
               </el-select>
               <!-- 输入下拉框(与字典联动) -->
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index a7f51f0..1bbfc91 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -248,7 +248,7 @@
       currentRepresentErrorIndirect: standardRef.value.form.currentRepresentErrorIndirect, // 电流表示值误差(间接测量)
       rippleVoltage: standardRef.value.form.rippleVoltage, // 纹波电压
       voltageOutputStability: standardRef.value.form.voltageOutputStability, // 输出电压短期稳定性
-      measureItemDataDcPowerList: standardRef.value.list.map((item: any) => ({
+      measureItemDataDcPowerList: standardRef.value.getList().map((item: any) => ({
         ...item,
         itemId: infoId.value,
       })), // 鉴定项列表
diff --git a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
index 9311317..13b0ac0 100644
--- a/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
+++ b/src/views/business/taskMeasure/measureData/components/second/second-interface.ts
@@ -1,5 +1,61 @@
 // 检定项数据表格
 export interface IDetailMeasureList {
-  id: string
+  absoluteError: string
+  createTime: string
+  dataId: string | number
+  dataType: string
+  dataTypeType: string
+  exceedMark: string | number
+  id: string | number
+  loadRegulation: string
+  loadSituation: string
+  maximumError: string
+  maximumErrorUnit: string
+  measureIndicationValue: string
+  outputChannel: string
+  outputVoltageMaxChange: string
+  resolution: string | number
+  resolutionDigit: string | number
+  rippleVoltage: string
+  shortTermStability: string
+  standardResistanceValue: string
+  standardResistanceValueUnit: string
+  standardValue: string
+  standardVoltageValue: string
+  standardVoltageValueUnit: string
+  technicalIndex: string
+  technicalIndexDigit: string | number
+  technicalIndexSymbol: string
+  unit: string
+  updateTime: string
+  voltageDifference: string
+  voltageMaxDifference: string
+  voltageOutputValue: string
+  voltageRegulation: string
+  voltageRegulatorOutputValue: string
+  params: string
+  errorParamA: string
+  errorParamB: string
+  fullScaleValue: string
+  accuracyA: string
+}
+
+export interface itemFormDataType {
+  itemId: string // 检定项id
+  itemCategoryName: string // 设备检定项分类名称
+  itemCategoryId: string // 设备检定项分类名称id
+  belongStandardEquipment: string // 标准装置code
+  belongStandardEquipmentName: string // 标准装置名称
+  appearanceRemark: string // 外观（1/string | numberr）
+  appearanceFunctionCheck: string | numberr // 外观
+  voltageRegulation: string | numberr // 电源电压调整率
+  loadRegulation: string | numberr // 负载调整率
+  voltageRepresentError: string | numberr // 电压表示值误差
+  currentRepresentErrorDirect: string | numberr // 电流表示值误差(直接测量)
+  currentRepresentErrorIndirect: string | numberr // 电流表示值误差(间接测量)
+  rippleVoltage: string | numberr // 纹波电压
+  voltageOutputStability: string | numberr // 输出电压短期稳定性
+  remark: string // 情况说明
+  conclusion: string // 检验结论
 
 }
diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
index bcc217a..4de8a51 100644
--- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue
@@ -8,7 +8,7 @@
 import selectStandard from '../../dialog/selectStandardDialog.vue'
 import TemplateFormAndTable from '../templateFormAndTable.vue'
 import { useSolveFormData } from '../useSolveFormData'
-import type { IDetailMeasureList } from './second-interface'
+import type { IDetailMeasureList, itemFormDataType } from './second-interface'
 import templateTable1 from './templateTable.vue'
 import useUserStore from '@/store/modules/user'
 import type { dictType } from '@/global'
@@ -20,6 +20,7 @@
 import { calc } from '@/utils/useCalc'
 import templateTable from '@/views/business/measure/item/components/second/templateTable.vue'
 import { initTableRow } from '@/commonMethods/useMergeTableRow'
+import { differenceArray } from '@/utils/Array'
 const props = defineProps({
   infoId: String, // id
   dataNo: String, // 检定数据编号
@@ -29,14 +30,15 @@
 const $router = useRouter() // 关闭页面使用
 const $route = useRoute() // 路由参数
 const ruleFormRef = ref() // 表单ref
+const list = ref([]) // 总数据
 const templateFormAndTableRef = ref() // 表单和被检设备、测量设备表格公共组件ref
-const itemFormData = ref({ // 有关于检定项的数据
+const itemFormData = ref<itemFormDataType>({ // 有关于检定项的数据
   itemId: '', // 检定项id
   itemCategoryName: '', // 设备检定项分类名称
   itemCategoryId: '', // 设备检定项分类名称id
   belongStandardEquipment: '', // 标准装置code
   belongStandardEquipmentName: '', // 标准装置名称
-  appearance: '外观完好，工作正常', // 外观（1/0）
+  appearanceRemark: '外观完好，工作正常', // 外观（1/0）
   appearanceFunctionCheck: 0, // 外观
   voltageRegulation: 0, // 电源电压调整率
   loadRegulation: 0, // 负载调整率
@@ -53,7 +55,6 @@
 const infoId = ref('') // 列表id
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -74,85 +75,120 @@
 const ammeterIndirectList = ref<IDetailMeasureList[]>([]) // 电流表示值误差（间接测量）
 const rippleVoltageList = ref<IDetailMeasureList[]>([]) // 纹波电压
 const outputVoltageStabilityList = ref<IDetailMeasureList[]>([]) // 输出电压短期稳定性
-
+const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({})
+const setListDict = () => {
+  listDict.value = {
+    '1-电源电压调整率': lineVoltageRegulationList.value, // 1
+    '2-负载调整率': loadRegulationList.value, // 2
+    '3-电压表示值误差': voltageRepresentationValueErrorList.value, // 3
+    '4-电流表示值误差(直接测量)': ammeterDirectList.value, // 4
+    '5-电流表示值误差(间接测量)': ammeterIndirectList.value, // 5
+    '6-纹波电压': rippleVoltageList.value, // 6
+    '7-输出电压短期稳定性': outputVoltageStabilityList.value, // 7
+  }
+}
 const columns_line_voltage_regulation = ref<TableColumn[]>([ // 电源电压调整率
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   { text: '调压器输出值', value: 'voltageRegulatorOutputValue', align: 'center', required: true, type: 'text' },
-  { text: '被检电源输出电压值', value: 'voltageOutputValue', align: 'center', required: true, type: 'input' },
+  { text: '被检电源输出电压值', value: 'voltageOutputValue', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
   { text: '被检电源输出电压最大差值', value: 'voltageMaxDifference', align: 'center', required: false, type: 'text' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'text' },
   { text: '电源电压调整率', value: 'voltageRegulation', align: 'center', required: false, type: 'text' },
 ])
-
 const columns_load_regulation = ref<TableColumn[]>([ // 负载调整率
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   { text: '负载情况', value: 'loadSituation', align: 'center', required: true, type: 'text' },
-  { text: '被检电源输出电压值', value: 'voltageOutputValue', align: 'center', required: true, type: 'input' },
-  { text: '电压差值', value: 'voltageDifference', align: 'center', required: true, type: 'text' },
+  { text: '被检电源输出电压值', value: 'voltageOutputValue', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
+  { text: '电压差值', value: 'voltageDifference', align: 'center', type: 'text' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'text' },
-  { text: '负载调整率', value: 'loadRegulation', align: 'center', required: true, type: 'text' },
+  { text: '负载调整率', value: 'loadRegulation', align: 'center', type: 'text' },
 ])
-
 // 电压表示值误差
 const columns_voltage_representation_value_error = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
   { text: '标准值', value: 'standardValue', align: 'center', required: true, type: 'input' },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'text' },
-  { text: '绝对误差', value: 'absoluteError', align: 'center', required: true, type: 'text' },
+  { text: '绝对误差', value: 'absoluteError', align: 'center', type: 'text' },
 ])
-
 // 电流表示值误差（间接测量）
 const columns_ammeter_indirect = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
-  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: 'input' },
-  { text: '标准电压值', value: 'standardVoltageValue', align: 'center', required: true, type: 'input' },
-  { text: '标准值', value: 'standardValue', align: 'center', required: true, type: 'text' },
+  { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
+  { text: '标准电压值', value: 'standardVoltageValue', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
+  { text: '标准值', value: 'standardValue', align: 'center', type: 'text' },
   { text: '最大允许误差', value: 'maximumError', align: 'center', required: true, type: 'text' },
-  { text: '绝对误差', value: 'absoluteError', align: 'center', required: true, type: 'text' },
+  { text: '绝对误差', value: 'absoluteError', align: 'center', type: 'text' },
 ])
-
 // 纹波电压
 const columns_ripple_voltage = ref<TableColumn[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
   { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'text' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
   { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'text' },
-  { text: '纹波电压', value: 'rippleVoltage', align: 'center', required: true, type: 'input' },
+  { text: '纹波电压', value: 'rippleVoltage', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
 ])
-
 // 输出电压短期稳定性
-const columns_output_voltage_stability = ref<TableColumn[]>([
+const columns_output_voltage_stability = ref<any[]>([
   { text: '检定项目', value: 'params', align: 'center', required: true, type: 'text' },
-  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: 'text' },
+  { text: '输出通道', value: 'outputChannel', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'select-dict', code: 'standardOutputChannel' },
   { text: '单位', value: 'unit', align: 'center', required: true, type: 'text' },
-  { text: '被测电源输出电压', value: 'voltageOutputValue', align: 'center', required: true, type: 'input' },
-  { text: '输出电压最大变化值', value: 'outputVoltageMaxChange', align: 'center', required: true, type: 'text' },
+  { text: '被测电源输出电压', value: 'voltageOutputValue', align: 'center', required: true, type: pageType.value === 'detail' ? 'text' : 'input' },
+  { text: '输出电压最大变化值', value: 'outputVoltageMaxChange', align: 'center', type: 'text' },
   { text: '仪器技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'text' },
-  { text: '短期稳定性', value: 'shortTermStability', align: 'center', required: true, type: 'text' },
+  { text: '短期稳定性', value: 'shortTermStability', align: 'center', type: 'text' },
 ])
+const columnsDict = ref<{ [key: string]: any[] | TableColumn[] }>({
+  '1-电源电压调整率': columns_line_voltage_regulation.value, // 1
+  '2-负载调整率': columns_load_regulation.value, // 2
+  '3-电压表示值误差': columns_voltage_representation_value_error.value, // 3
+  '4-电流表示值误差(直接测量)': columns_voltage_representation_value_error.value, // 4
+  '5-电流表示值误差(间接测量)': columns_ammeter_indirect.value, // 5
+  '6-纹波电压': columns_ripple_voltage.value, // 6
+  '7-输出电压短期稳定性': columns_output_voltage_stability.value, // 7
+})
+watch(() => pageType.value, (newValue) => {
+  if (newValue) {
+    if (newValue === 'detail') {
+      for (const i in columnsDict.value) {
+        columnsDict.value[i].forEach((item: TableColumn | any) => {
+          item.type = 'text'
+        })
+      }
+    }
+  }
+})
 // 增加行 - 输出电压短期稳定性
 const addRow = () => {
+  if (!checkList(outputVoltageStabilityList.value, columns_output_voltage_stability.value, '输出电压短期稳定性')) { return }
+  // 增加行
   outputVoltageStabilityList.value.push(outputVoltageStabilityList.value[outputVoltageStabilityList.value.length - 1])
+  // 初始化数据
   outputVoltageStabilityList.value = initTableRow(outputVoltageStabilityList.value)
-  // outputVoltageStabilityList.value = outputVoltageStabilityList.value.map((item) => {
-  //   const obj = {}
-  //   for (const i in item) {
-  //     if (!i.includes('-span')) {
-  //       obj[i] = item[i]
-  //     }
-  //   }
-  //   console.log(obj, 'obj')
-  //   return obj
-  // })
+}
+// 删除行
+const delRow = (checkList: any[]) => {
+  if (!checkList.length) {
+    ElMessage.warning('请选择需要删除的数据')
+    return
+  }
+  // 每个输入通道，最少需要有二行数据
+  if (checkList.every(item => outputVoltageStabilityList.value.filter(citem => citem.outputChannel === item.outputChannel).length < 2)) {
+    ElMessage.warning('输出通道最少需要有两行数据')
+    return
+  }
+  // 删除行
+  outputVoltageStabilityList.value = differenceArray(outputVoltageStabilityList.value, checkList)
+  // 初始化数据
+  outputVoltageStabilityList.value = initTableRow(outputVoltageStabilityList.value)
 }
 // -------------------------------------------获取详情信息--------------------------------------------------
 // 获取页面详情信息
@@ -169,34 +205,53 @@
     orderId: $route.query.orderId, // 任务单id
     sampleId: $route.query.sampleId, // 被检设备id
   }).then((res) => {
+    console.log(res.data, '编辑 详情')
     // 有关于检定项的数据
-    itemFormData.value.itemId = res.data.itemId // 检定项id
-    itemFormData.value.itemCategoryName = res.data.itemCategoryName // 设备检定项分类名称
-    itemFormData.value.itemCategoryId = res.data.itemCategoryId ? res.data.itemCategoryId : itemFormData.value.itemCategoryId // 设备检定项分类名称id
-    itemFormData.value.appearance = `${res.data.appearance}` // 外观（1/0）
-
+    itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
+    initInputData(res.data.measureDataDcPowerList)
     // =======================================表单公共组件数据处理=======================================================
     useSolveFormData(res, templateFormAndTableRef.value)
     // ==================================检定数据========================================================================
-
-    // list.value = res.data.measureDataPistonGaugeList.map((item: IDetailMeasureList) => {
-    //   return {
-    //     ...item,
-    //     editable: pageType.value !== 'detail',
-    //   }
-    // }) // 检定数据
-
     infoId.value = res.data.id
     emits('giveInfoId', infoId.value)
     loading.close()
   })
 }
-
+// 最大允许误差 计算
+const calcMaxError = (item: any) => {
+  // 1数字式、2指针式
+  if (item.dataTypeType === '1') {
+    if (item.maximumError === '2') {
+      return Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB) * Number(item.resolution)
+    }
+    else if (item.maximumError === '2') {
+      return Number(item.errorParamA) * Number(item.measureIndicationValue) + Number(item.errorParamB)
+    }
+    else if (item.maximumError === '1') {
+      return Number(item.accuracyA) * Number(item.fullScaleValue)
+    }
+  }
+  else if (item.dataTypeType === '2') {
+    return Number(item.accuracyA) * Number(item.fullScaleValue)
+  }
+}
+// 初始化数据
+function initAllData() {
+  for (const i in listDict.value) {
+    listDict.value[i] = []
+  }
+  lineVoltageRegulationList.value = []
+  loadRegulationList.value = []
+  voltageRepresentationValueErrorList.value = []
+  ammeterDirectList.value = []
+  ammeterIndirectList.value = []
+  rippleVoltageList.value = []
+  outputVoltageStabilityList.value = []
+}
 // 初始化输入数据
-const initInputData = (data: any) => {
-  console.log(data, 'data')
-  data.forEach((item: any) => {
-    console.log(item, 'item')
+function initInputData(data: any[]) {
+  initAllData()
+  data.forEach((item) => {
     switch (item.dataType) {
       case '1':
         // 电源电压调整率
@@ -208,15 +263,15 @@
         break
       case '3':
         // 电压表示值误差
-        voltageRepresentationValueErrorList.value.push({ ...item, params: '电压表示值误差' })
+        voltageRepresentationValueErrorList.value.push({ ...item, params: '电压表示值误差', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : item.maximumError })
         break
       case '4':
         // 电流表示值误差(直接测量)
-        ammeterDirectList.value.push({ ...item, params: '电流表示值误差(直接测量)' })
+        ammeterDirectList.value.push({ ...item, params: '电流表示值误差(直接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : item.maximumError })
         break
       case '5':
         // 电流表示值误差(间接测量)
-        ammeterIndirectList.value.push({ ...item, params: '电流表示值误差(间接测量)' })
+        ammeterIndirectList.value.push({ ...item, params: '电流表示值误差(间接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : item.maximumError })
         break
       case '6':
         // 纹波电压
@@ -228,8 +283,15 @@
         break
     }
   })
+  setListDict()
 }
-
+const getList = () => {
+  let arr = [] as IDetailMeasureList[]
+  for (const i in listDict.value) {
+    arr = [...arr, ...listDict.value[i]]
+  }
+  return arr
+}
 /**
  * 新增的时候获取检定项输入数据(获取检定项分类详情)
  * @param itemId  检定项id
@@ -243,7 +305,6 @@
     belongStandardEquipment, // 检校标准装置字典code
   }
   getItemInfo(params).then((res) => {
-    console.log(res.data, '鉴定项')
     itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查
     itemFormData.value.voltageRegulation = res.data.voltageRegulation // 电源电压调整率
     itemFormData.value.loadRegulation = res.data.loadRegulation // 负载调整率
@@ -252,7 +313,7 @@
     itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流表示值误差(间接测量)
     itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压
     itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性
-    initInputData(res.data.measureItemDataDcPowerList)
+    initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' })))
   })
 }
 // -----------------------------------------字典----------------------------------------
@@ -265,49 +326,84 @@
 // 调压器输出值
 // ----------------------------------------点击保存时校验---------------------------------------
 // 校验
-const checkout = () => {
+// 检查数据
+function checkList(list: IDetailMeasureList[], columns: TableColumn[] | any[], title: string) {
+  return useCheckList(list, columns, title)
+}
+// 检查所有数据
+function checkAllList() {
+  let result = true
+  for (const i in columnsDict.value) {
+    const requireLength = listDict.value[i].length > 0
+    if (!useCheckList(listDict.value[i], columnsDict.value[i], i.substring(2), '', '', '', requireLength)) {
+      result = false
+      break
+    }
+  }
+  return result
 }
 // -----------------------------------------生成结果处理----------------------------------------
+// 计算
+const calculateFun = async (list: IDetailMeasureList[]) => {
+  let result = [] as any[]
+  const params = {
+    belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
+    itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
+    measureDataDcPowerList: list,
+  }
+  const res = await calculateHandle(params)
+  result = res.data
+  return result
+}
+// 计算单独鉴定项
+const caclItem = async (list: IDetailMeasureList[], columns: TableColumn[] | any[], title: string) => {
+  if (!checkList(list, columns, title)) { return }
+  const res = await calculateFun(list)
+  return res.map(item => ({ ...item, params: title }))
+}
 // 点击计算结果
-const calculate = (title: string) => {
-  console.log(title, 'title')
+const calculate = async (title: string, index: string) => {
+  let result = [] as IDetailMeasureList[]
   switch (title) {
     case '电源电压调整率':
-      // lineVoltageRegulationList.value.forEach((item: any) => {
-      //   // 计算 被检电源输出电压最大差值 调压器输出值的最大值与最小值的被检电源输出电压值差的绝对值
-      //   const voltageRegulatorOutputValue = RegulatorOutputValue.value.map(item => Number(item.name))
-      //   // console.log(Math.max(...voltageRegulatorOutputValue))
-      //   console.log(Math.max(...voltageRegulatorOutputValue), Math.min(...voltageRegulatorOutputValue))
-      //   item.voltageMaxDifference = Math.abs(Math.max(...voltageRegulatorOutputValue) - Number(item.voltageOutputValue)) - Math.abs(Math.min(...voltageRegulatorOutputValue) - Number(item.voltageOutputValue))
-      // })
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      lineVoltageRegulationList.value = result || lineVoltageRegulationList.value
+      setListDict()
       break
+    case '负载调整率':
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      loadRegulationList.value = result || loadRegulationList.value
+      setListDict()
+      break
+    case '电压表示值误差':
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      voltageRepresentationValueErrorList.value = result || voltageRepresentationValueErrorList.value
+      setListDict()
+      break
+    case '电流表示值误差(直接测量)':
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      ammeterDirectList.value = result || ammeterDirectList.value
+      setListDict()
+      break
+    case '电流表示值误差(间接测量)':
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      ammeterIndirectList.value = result || ammeterIndirectList.value
+      setListDict()
+      break
+    case '纹波电压':
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      rippleVoltageList.value = result || rippleVoltageList.value
+      setListDict()
+      break
+    case '输出电压短期稳定性':
+      result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[]
+      outputVoltageStabilityList.value = result || outputVoltageStabilityList.value
+      setListDict()
+      break
+    case '' :
+      if (!checkAllList()) { return }
+      initInputData(await calculateFun(getList()))
   }
-  // ElMessage.info('敬请期待')
-  // return false
-  // if (!list.value.length) {
-  //   ElMessage.warning('没有检定项数据，无法生成结果')
-  //   return false
-  // }
-  // if (!useCheckList(list.value, measureColumns.value, '检定数据')) {
-  //   return false
-  // }
-  // const params = {
-  //   belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置
-  //   itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称
-  //   measureDataCalibratorList: list.value,
-  // }
-  // calculateHandle(params).then((res) => {
-  //   if (res.data && res.data.length) {
-  //     resultList.value = res.data.map((item: IDetailMeasureList) => {
-  //       return {
-  //         ...item,
-  //       }
-  //     }) // 检定数据
-  //   }
-  //   else {
-  //     list.value = res.data
-  //   }
-  // })
 }
 
 // ------------------------------------------钩子----------------------------------------------
@@ -337,7 +433,7 @@
   }
 })
 
-defineExpose({ checkout, itemFormData, templateFormAndTableRef, pageType })
+defineExpose({ checkList, itemFormData, templateFormAndTableRef, pageType, getList, checkAllList })
 </script>
 
 <template>
@@ -359,12 +455,12 @@
         label-position="right"
         style="margin-top: 20px;"
       >
-        <el-row v-if="itemFormData.appearanceFunctionCheck">
+        <el-row v-if="itemFormData.appearanceFunctionCheck === '1' || itemFormData.appearanceFunctionCheck === 1">
           <!-- 外观  -->
           <el-col :span="12">
-            <el-form-item label="外观及功能性检查:" prop="appearance">
+            <el-form-item label="外观及功能性检查:" prop="appearanceRemark">
               <el-input
-                v-model="itemFormData.appearance"
+                v-model="itemFormData.appearanceRemark"
                 class="full-width-input"
                 autosize
                 type="textarea"
@@ -373,51 +469,96 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <!-- 电源电压调整率 -->
+        <template-table
+          v-if="lineVoltageRegulationList.length" title="电源电压调整率" :data="lineVoltageRegulationList" :columns="columns_line_voltage_regulation"
+          index="1" :show-btn="false" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel', 'voltageMaxDifference', 'technicalIndex', 'voltageRegulation']"
+          @calculate-result="calculate"
+        >
+          <!-- 技术指标 -->
+          <template #pre-content="{ scope, column }">
+            <div v-if="column.text === '被检电源技术指标'" style="line-height: 30px;margin-right: 10px;">
+              {{ scope.row.technicalIndexSymbol }}
+            </div>
+          </template>
+        </template-table>
+        <!-- 负载调整率 -->
+        <template-table
+          v-if="loadRegulationList.length" title="负载调整率" :data="loadRegulationList" :columns="columns_load_regulation"
+          index="2" :show-btn="false" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel', 'voltageDifference', 'technicalIndex', 'loadRegulation']" @calculate-result="calculate"
+        >
+          <!-- 技术指标 -->
+          <template #pre-content="{ scope, column }">
+            <div v-if="column.text === '被检电源技术指标'" style="line-height: 30px;margin-right: 10px;">
+              {{ scope.row.technicalIndexSymbol }}
+            </div>
+          </template>
+        </template-table>
+
+        <!--  电压表示值误差 -->
+        <template-table
+          v-if="voltageRepresentationValueErrorList.length" title="电压表示值误差" :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation_value_error"
+          index="3" :show-btn="false" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
+        >
+          <!-- 符号 -->
+          <template #pre-content="{ column }">
+            <div v-if="column.text === '最大允许误差'" style="line-height: 30px;margin-right: 10px;">
+              ±
+            </div>
+          </template>
+        </template-table>
+
+        <!-- 电流表示值误差（直接测量） -->
+        <template-table
+          v-if="ammeterDirectList.length" title="电流表示值误差(直接测量)" :data="ammeterDirectList" :columns="columns_voltage_representation_value_error"
+          index="4" :show-btn="false" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
+        >
+          <!-- 符号 -->
+          <template #pre-content="{ column }">
+            <div v-if="column.text === '最大允许误差'" style="line-height: 30px;margin-right: 10px;">
+              ±
+            </div>
+          </template>
+        </template-table>
+        <!-- 电流表示值误差（间接测量） -->
+        <template-table
+          v-if="ammeterIndirectList.length" title="电流表示值误差(间接测量)" :data="ammeterIndirectList" :columns="columns_ammeter_indirect"
+          index="5" :show-btn="false" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
+        >
+          <!-- 符号 -->
+          <template #pre-content="{ column }">
+            <div v-if="column.text === '最大允许误差'" style="line-height: 30px;margin-right: 10px;">
+              ±
+            </div>
+          </template>
+        </template-table>
+        <!--  纹波电压 -->
+        <template-table
+          v-if="rippleVoltageList.length" title="纹波电压" :data="rippleVoltageList" :columns="columns_ripple_voltage"
+          index="6" :show-btn="false" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
+        >
+          <!-- 技术指标 -->
+          <template #pre-content="{ scope, column }">
+            <div v-if="column.text === '被检电源技术指标'" style="line-height: 30px;margin-right: 10px;">
+              {{ scope.row.technicalIndexSymbol }}
+            </div>
+          </template>
+        </template-table>
+        <!--  输出电压短期稳定性 -->
+        <template-table
+          v-if="outputVoltageStabilityList.length" title="输出电压短期稳定性" :data="outputVoltageStabilityList" :columns="columns_output_voltage_stability" :disabled="pageType === 'detail'"
+          index="7" :show-btn="pageType !== 'detail'" :calc-btn="pageType !== 'detail'" :show-title="true" :is-multi="pageType !== 'detail'" :need-merge-cells="['outputVoltageMaxChange', 'technicalIndex', 'shortTermStability']" @calculate-result="calculate"
+          @add-row="addRow"
+          @del-row="delRow"
+        >
+          <!-- 仪器技术指标 -->
+          <template #pre-content="{ scope, column }">
+            <div v-if="column.text === '仪器技术指标'" style="line-height: 30px;margin-right: 10px;">
+              {{ scope.row.technicalIndexSymbol }}
+            </div>
+          </template>
+        </template-table>
       </el-form>
-
-      <!-- 电源电压调整率 -->
-      <template-table
-        v-if="itemFormData.voltageRegulation" title="电源电压调整率" :data="lineVoltageRegulationList" :columns="columns_line_voltage_regulation"
-        index="1" :show-btn="false" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel', 'voltageMaxDifference', 'technicalIndex', 'voltageRegulation']"
-        @calculate-result="calculate"
-      />
-      <!-- 负载调整率 -->
-      <template-table
-        v-if="itemFormData.loadRegulation" title="负载调整率" :data="loadRegulationList" :columns="columns_load_regulation"
-        index="2" :show-btn="false" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel', 'voltageDifference', 'technicalIndex', 'loadRegulation']" @calculate-result="calculate"
-      />
-
-      <!--  电压表示值误差 -->
-      <template-table
-        v-if="itemFormData.voltageRepresentError" title="电压表示值误差" :data="voltageRepresentationValueErrorList" :columns="columns_voltage_representation_value_error"
-        index="3" :show-btn="false" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
-      />
-
-      <!-- 电流表示值误差（直接测量） -->
-      <template-table
-        v-if="itemFormData.currentRepresentErrorDirect" title="电流表示值误差(直接测量)" :data="ammeterDirectList" :columns="columns_voltage_representation_value_error"
-        index="4" :show-btn="false" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
-      />
-
-      <!-- 电流表示值误差（间接测量） -->
-      <template-table
-        v-if="itemFormData.currentRepresentErrorIndirect" title="电流表示值误差(间接测量)" :data="ammeterIndirectList" :columns="columns_ammeter_indirect"
-        index="5" :show-btn="false" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
-      />
-
-      <!--  纹波电压 -->
-      <template-table
-        v-if="itemFormData.rippleVoltage" title="纹波电压" :data="rippleVoltageList" :columns="columns_ripple_voltage"
-        index="6" :show-btn="false" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel']" @calculate-result="calculate"
-      />
-
-      <!--  输出电压短期稳定性 -->
-      <template-table
-        v-if="itemFormData.voltageOutputStability" title="输出电压短期稳定性" :data="outputVoltageStabilityList" :columns="columns_output_voltage_stability"
-        index="7" :show-btn="true" :calc-btn="true" :show-title="true" :is-multi="false" :need-merge-cells="['outputChannel', 'outputVoltageMaxChange', 'technicalIndex', 'shortTermStability']" @calculate-result="calculate"
-        @addRow="addRow"
-      />
-
       <!-- 历史修改记录 -->
       <change-record v-show="pageType === 'detail' && current === 'change-record'" :info-id="infoId" />
     </detail-block>
diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue
index 4037029..9f9014c 100644
--- a/src/views/business/taskMeasure/measureData/detail.vue
+++ b/src/views/business/taskMeasure/measureData/detail.vue
@@ -73,6 +73,22 @@
       belongStandardEquipmentName: belongStandardEquipmentName.value, // 标准装置名称
     }
   }
+  else if (belongStandardEquipment.value === '2') { // // 第2套：直流稳压电源
+    params = {
+      ...templateDetailRef.value.itemFormData,
+      ...templateDetailRef.value.templateFormAndTableRef.form,
+      belongStandardEquipment: belongStandardEquipment.value, // 标准装置code
+      belongStandardEquipmentName: belongStandardEquipmentName.value, // 标准装置名称
+      id: pageType.value === 'edit' ? infoId.value : '',
+      measureDataDcPowerList: templateDetailRef.value.getList(),
+      model: templateDetailRef.value.templateFormAndTableRef.sampleList[0].sampleModel, // 型号
+      sampleId: templateDetailRef.value.templateFormAndTableRef.sampleList[0].sampleId,
+      sampleName: templateDetailRef.value.templateFormAndTableRef.sampleList[0].sampleName,
+      manufactureNo: templateDetailRef.value.templateFormAndTableRef.sampleList[0].manufactureNo,
+      // equipmentList
+      equipmentIds: templateDetailRef.value.templateFormAndTableRef.measureEquipmentList.map((item: { id: string }) => item.id),
+    }
+  }
   else if (belongStandardEquipment.value === '3') { // 第3套：多功能电气安全校准器
     params = {
       ...templateDetailRef.value.templateFormAndTableRef.form,
@@ -137,6 +153,9 @@
   if (belongStandardEquipment.value === '1') { // 第一套：多功能校准源
     return templateDetailRef.value.checkout()
   }
+  else if (belongStandardEquipment.value === '2') { // 第二套 直流稳压电源
+    return templateDetailRef.value.checkAllList() && templateDetailRef.value.templateFormAndTableRef.checkout()
+  }
   else if (belongStandardEquipment.value === '3') { // 第3套：多功能电气安全校准器
     if (templateDetailRef.value.checkout() && templateDetailRef.value.templateFormAndTableRef.checkout()) {
       return true
@@ -171,6 +190,7 @@
         background: 'rgba(255, 255, 255, 0.8)',
       })
       const params = solveSaveParams() // 处理入参
+      console.log(params, 'params')
       // 新建
       if (pageType.value === 'add') { // 新建
         addMeasureData(params).then((res) => {