diff --git a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
index 6bea8c9..dcf2e0c 100644
--- a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
+++ b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
@@ -32,7 +32,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 

diff --git a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
index 6bea8c9..dcf2e0c 100644
--- a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
+++ b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
@@ -32,7 +32,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 9870b50..fee23d3 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -31,7 +31,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
@@ -156,6 +156,15 @@
     fetchData()
   })
 }, { immediate: true })
+onMounted (() => {
+  console.log(props.processId, 'props.processId')
+  if (props.processId) {
+    listQuery.value.processId = props.processId
+    getDict().then(() => {
+      fetchData()
+    })
+  }
+})
 </script>
 
 <template>

diff --git a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
index 6bea8c9..dcf2e0c 100644
--- a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
+++ b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
@@ -32,7 +32,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 9870b50..fee23d3 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -31,7 +31,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
@@ -156,6 +156,15 @@
     fetchData()
   })
 }, { immediate: true })
+onMounted (() => {
+  console.log(props.processId, 'props.processId')
+  if (props.processId) {
+    listQuery.value.processId = props.processId
+    getDict().then(() => {
+      fetchData()
+    })
+  }
+})
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index 4d738b9..4291e58 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -50,7 +50,15 @@
   voltageOutputStability: 1, // 输出电压短期稳定性
 })
 watch(() => props.form, (newVal) => {
-  form1.value = newVal
+  form1.value = {
+    ...newVal,
+    voltageRepresentationValueErrorType: form1.value.voltageRepresentationValueErrorType,
+    ammeterDirectType: form1.value.ammeterDirectType,
+    ammeterIndirectType: form1.value.ammeterIndirectType,
+  }
+  // form1.value.voltageRepresentationValueErrorType = '1'
+  // form1.value.ammeterDirectType = '1'
+  // form1.value.ammeterIndirectType = '1'
 })
 // 取消列表把列表置空
 const pageEditFlag = ref(false)
@@ -564,14 +572,17 @@
         case '3':
           // 电压表示值误差
           voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差' })
+          form1.value.voltageRepresentationValueErrorType = item.dataTypeType as string
           break
         case '4':
           // 电流表示值误差(直接测量)
           ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)' })
+          form1.value.ammeterDirectType = item.dataTypeType as string
           break
         case '5':
           // 电流表示值误差(间接测量)
           ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)' })
+          form1.value.ammeterIndirectType = item.dataTypeType as string
           break
         case '6':
           // 纹波电压

diff --git a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
index 6bea8c9..dcf2e0c 100644
--- a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
+++ b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
@@ -32,7 +32,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 9870b50..fee23d3 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -31,7 +31,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
@@ -156,6 +156,15 @@
     fetchData()
   })
 }, { immediate: true })
+onMounted (() => {
+  console.log(props.processId, 'props.processId')
+  if (props.processId) {
+    listQuery.value.processId = props.processId
+    getDict().then(() => {
+      fetchData()
+    })
+  }
+})
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index 4d738b9..4291e58 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -50,7 +50,15 @@
   voltageOutputStability: 1, // 输出电压短期稳定性
 })
 watch(() => props.form, (newVal) => {
-  form1.value = newVal
+  form1.value = {
+    ...newVal,
+    voltageRepresentationValueErrorType: form1.value.voltageRepresentationValueErrorType,
+    ammeterDirectType: form1.value.ammeterDirectType,
+    ammeterIndirectType: form1.value.ammeterIndirectType,
+  }
+  // form1.value.voltageRepresentationValueErrorType = '1'
+  // form1.value.ammeterDirectType = '1'
+  // form1.value.ammeterIndirectType = '1'
 })
 // 取消列表把列表置空
 const pageEditFlag = ref(false)
@@ -564,14 +572,17 @@
         case '3':
           // 电压表示值误差
           voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差' })
+          form1.value.voltageRepresentationValueErrorType = item.dataTypeType as string
           break
         case '4':
           // 电流表示值误差(直接测量)
           ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)' })
+          form1.value.ammeterDirectType = item.dataTypeType as string
           break
         case '5':
           // 电流表示值误差(间接测量)
           ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)' })
+          form1.value.ammeterIndirectType = item.dataTypeType as string
           break
         case '6':
           // 纹波电压
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index 139d89c..116d90b 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -1428,7 +1428,7 @@
       v-show="currentDate === '核查数据' || currentDate === ''"
       :table-data="listRepeatability"
       :table-header="repeatabilityColumns"
-      :merge-rows="[]"
+      :merge-rows="['checkPoint']"
       :need-index="true"
     />
     <!-- 历史日期重复性数据 -->
@@ -1436,7 +1436,7 @@
       v-show="currentDate !== '核查数据' && currentDate !== ''"
       :table-data="listRepeatabilityCheckDate"
       :table-header="repeatabilityColumnsCheckData"
-      :merge-rows="[]"
+      :merge-rows="['checkPoint']"
       :need-index="true"
       max-height="300"
     />

diff --git a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
index 6bea8c9..dcf2e0c 100644
--- a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
+++ b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
@@ -32,7 +32,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 9870b50..fee23d3 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -31,7 +31,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
@@ -156,6 +156,15 @@
     fetchData()
   })
 }, { immediate: true })
+onMounted (() => {
+  console.log(props.processId, 'props.processId')
+  if (props.processId) {
+    listQuery.value.processId = props.processId
+    getDict().then(() => {
+      fetchData()
+    })
+  }
+})
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index 4d738b9..4291e58 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -50,7 +50,15 @@
   voltageOutputStability: 1, // 输出电压短期稳定性
 })
 watch(() => props.form, (newVal) => {
-  form1.value = newVal
+  form1.value = {
+    ...newVal,
+    voltageRepresentationValueErrorType: form1.value.voltageRepresentationValueErrorType,
+    ammeterDirectType: form1.value.ammeterDirectType,
+    ammeterIndirectType: form1.value.ammeterIndirectType,
+  }
+  // form1.value.voltageRepresentationValueErrorType = '1'
+  // form1.value.ammeterDirectType = '1'
+  // form1.value.ammeterIndirectType = '1'
 })
 // 取消列表把列表置空
 const pageEditFlag = ref(false)
@@ -564,14 +572,17 @@
         case '3':
           // 电压表示值误差
           voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差' })
+          form1.value.voltageRepresentationValueErrorType = item.dataTypeType as string
           break
         case '4':
           // 电流表示值误差(直接测量)
           ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)' })
+          form1.value.ammeterDirectType = item.dataTypeType as string
           break
         case '5':
           // 电流表示值误差(间接测量)
           ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)' })
+          form1.value.ammeterIndirectType = item.dataTypeType as string
           break
         case '6':
           // 纹波电压
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index 139d89c..116d90b 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -1428,7 +1428,7 @@
       v-show="currentDate === '核查数据' || currentDate === ''"
       :table-data="listRepeatability"
       :table-header="repeatabilityColumns"
-      :merge-rows="[]"
+      :merge-rows="['checkPoint']"
       :need-index="true"
     />
     <!-- 历史日期重复性数据 -->
@@ -1436,7 +1436,7 @@
       v-show="currentDate !== '核查数据' && currentDate !== ''"
       :table-data="listRepeatabilityCheckDate"
       :table-header="repeatabilityColumnsCheckData"
-      :merge-rows="[]"
+      :merge-rows="['checkPoint']"
       :need-index="true"
       max-height="300"
     />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index bd60a37..787b165 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -75,7 +75,7 @@
   { text: '文件编号', value: 'formNo', align: 'center' },
   { text: '文件名称', value: 'formName', align: 'center' },
   { text: '查新结果', value: 'noveltyResult', align: 'center' },
-  { text: '查新比例', value: 'searchRatio', align: 'center' },
+  { text: '更新比例', value: 'searchRatio', align: 'center' },
   { text: '查新人', value: 'createUserName', align: 'center' },
   { text: '查新日期', value: 'noveltyDate', align: 'center' },
 ])
@@ -271,7 +271,7 @@
           <normal-table
             :data="list" :total="total" :columns="columns" :query="listQueryLeft" is-showmulti-select
             :list-loading="loadingTable" :is-multi="props.isMulti" :height="360"
-            :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]" @change="changePage" @rowClick="rowClick"
+            :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]" @change="changePage" @row-click="rowClick"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -300,7 +300,7 @@
           <normal-table
             :data="methodsList" :total="total" :columns="methodsColumns" :query="listQueryRight"
             :list-loading="methodsLoadingTable" :is-multi="false" :height="416" :pagination="false"
-            @multiSelect="rowClickRight"
+            @multi-select="rowClickRight"
           >
             <!-- 序号 -->
             <template #preColumns>

diff --git a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
index 6bea8c9..dcf2e0c 100644
--- a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
+++ b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
@@ -32,7 +32,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 9870b50..fee23d3 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -31,7 +31,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
@@ -156,6 +156,15 @@
     fetchData()
   })
 }, { immediate: true })
+onMounted (() => {
+  console.log(props.processId, 'props.processId')
+  if (props.processId) {
+    listQuery.value.processId = props.processId
+    getDict().then(() => {
+      fetchData()
+    })
+  }
+})
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index 4d738b9..4291e58 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -50,7 +50,15 @@
   voltageOutputStability: 1, // 输出电压短期稳定性
 })
 watch(() => props.form, (newVal) => {
-  form1.value = newVal
+  form1.value = {
+    ...newVal,
+    voltageRepresentationValueErrorType: form1.value.voltageRepresentationValueErrorType,
+    ammeterDirectType: form1.value.ammeterDirectType,
+    ammeterIndirectType: form1.value.ammeterIndirectType,
+  }
+  // form1.value.voltageRepresentationValueErrorType = '1'
+  // form1.value.ammeterDirectType = '1'
+  // form1.value.ammeterIndirectType = '1'
 })
 // 取消列表把列表置空
 const pageEditFlag = ref(false)
@@ -564,14 +572,17 @@
         case '3':
           // 电压表示值误差
           voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差' })
+          form1.value.voltageRepresentationValueErrorType = item.dataTypeType as string
           break
         case '4':
           // 电流表示值误差(直接测量)
           ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)' })
+          form1.value.ammeterDirectType = item.dataTypeType as string
           break
         case '5':
           // 电流表示值误差(间接测量)
           ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)' })
+          form1.value.ammeterIndirectType = item.dataTypeType as string
           break
         case '6':
           // 纹波电压
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index 139d89c..116d90b 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -1428,7 +1428,7 @@
       v-show="currentDate === '核查数据' || currentDate === ''"
       :table-data="listRepeatability"
       :table-header="repeatabilityColumns"
-      :merge-rows="[]"
+      :merge-rows="['checkPoint']"
       :need-index="true"
     />
     <!-- 历史日期重复性数据 -->
@@ -1436,7 +1436,7 @@
       v-show="currentDate !== '核查数据' && currentDate !== ''"
       :table-data="listRepeatabilityCheckDate"
       :table-header="repeatabilityColumnsCheckData"
-      :merge-rows="[]"
+      :merge-rows="['checkPoint']"
       :need-index="true"
       max-height="300"
     />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index bd60a37..787b165 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -75,7 +75,7 @@
   { text: '文件编号', value: 'formNo', align: 'center' },
   { text: '文件名称', value: 'formName', align: 'center' },
   { text: '查新结果', value: 'noveltyResult', align: 'center' },
-  { text: '查新比例', value: 'searchRatio', align: 'center' },
+  { text: '更新比例', value: 'searchRatio', align: 'center' },
   { text: '查新人', value: 'createUserName', align: 'center' },
   { text: '查新日期', value: 'noveltyDate', align: 'center' },
 ])
@@ -271,7 +271,7 @@
           <normal-table
             :data="list" :total="total" :columns="columns" :query="listQueryLeft" is-showmulti-select
             :list-loading="loadingTable" :is-multi="props.isMulti" :height="360"
-            :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]" @change="changePage" @rowClick="rowClick"
+            :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]" @change="changePage" @row-click="rowClick"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -300,7 +300,7 @@
           <normal-table
             :data="methodsList" :total="total" :columns="methodsColumns" :query="listQueryRight"
             :list-loading="methodsLoadingTable" :is-multi="false" :height="416" :pagination="false"
-            @multiSelect="rowClickRight"
+            @multi-select="rowClickRight"
           >
             <!-- 序号 -->
             <template #preColumns>
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index c8f158a..009313b 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -292,9 +292,12 @@
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
-
           type.value = 'detail'
           hideAllOpterationButtons()
+          detailMethodNovelty({ id: novelty.value.id }).then((res) => {
+            novelty.value.processId = res.data.processId
+            status.value = '3'
+          })
         }
         else {
           ElMessage.error(`查新记录表 ${novelty.value.formNo} 提交失败：${res.message}`)
@@ -313,6 +316,7 @@
 
             type.value = 'detail'
             hideAllOpterationButtons()
+            status.value = '3'
           }
           else {
             // 提示失败信息
@@ -538,11 +542,13 @@
           fileId: element.id,
           fileNo: element.fileNo,
           fileName: element.fileName,
-          noveltyResult: '',
+          noveltyResult: element.noveltyStatus ? '1' : '2',
           groupCode: element.groupCode,
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
+
+          // 有更新1  无更新2
         })
       })
     })
@@ -918,7 +924,7 @@
                 <template #default="scope">
                   <el-radio-group v-model="scope.row.noveltyResult">
                     <el-radio
-                      v-for="item in noveltyResultDict" :key="item.value" class="radio" :value="item.value"
+                      v-for="item in noveltyResultDict" :key="item.value" class="radio1" :value="item.value"
                       :label="item.value" :disabled="type === 'detail'"
                     >
                       {{ item.name }}
@@ -940,7 +946,7 @@
                 <el-table-column label="操作" align="center" width="90">
                   <template #default="scope">
                     <el-button
-                      v-if="scope.row.noveltyResult !== '0'" size="small" type="primary" link
+                      v-if="scope.row.noveltyResult !== '2' && scope.row.noveltyResult" size="small" type="primary" link
                       @click="searchProcess(scope.row)"
                     >
                       查新进度
@@ -1019,7 +1025,7 @@
     <file-select-dialog ref="refFileSelect" @records-selected="appendFileToList" />
 
     <template v-if="current === 'novelty-approval' && status !== '1'">
-      <approval-record-table :process-id="novelty.processId" />
+      <approval-record-table v-if="current === 'novelty-approval' && status !== '1'" :process-id="novelty.processId" />
     </template>
   </app-container>
 </template>

diff --git a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
index 6bea8c9..dcf2e0c 100644
--- a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
+++ b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
@@ -32,7 +32,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 9870b50..fee23d3 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -31,7 +31,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
@@ -156,6 +156,15 @@
     fetchData()
   })
 }, { immediate: true })
+onMounted (() => {
+  console.log(props.processId, 'props.processId')
+  if (props.processId) {
+    listQuery.value.processId = props.processId
+    getDict().then(() => {
+      fetchData()
+    })
+  }
+})
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index 4d738b9..4291e58 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -50,7 +50,15 @@
   voltageOutputStability: 1, // 输出电压短期稳定性
 })
 watch(() => props.form, (newVal) => {
-  form1.value = newVal
+  form1.value = {
+    ...newVal,
+    voltageRepresentationValueErrorType: form1.value.voltageRepresentationValueErrorType,
+    ammeterDirectType: form1.value.ammeterDirectType,
+    ammeterIndirectType: form1.value.ammeterIndirectType,
+  }
+  // form1.value.voltageRepresentationValueErrorType = '1'
+  // form1.value.ammeterDirectType = '1'
+  // form1.value.ammeterIndirectType = '1'
 })
 // 取消列表把列表置空
 const pageEditFlag = ref(false)
@@ -564,14 +572,17 @@
         case '3':
           // 电压表示值误差
           voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差' })
+          form1.value.voltageRepresentationValueErrorType = item.dataTypeType as string
           break
         case '4':
           // 电流表示值误差(直接测量)
           ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)' })
+          form1.value.ammeterDirectType = item.dataTypeType as string
           break
         case '5':
           // 电流表示值误差(间接测量)
           ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)' })
+          form1.value.ammeterIndirectType = item.dataTypeType as string
           break
         case '6':
           // 纹波电压
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index 139d89c..116d90b 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -1428,7 +1428,7 @@
       v-show="currentDate === '核查数据' || currentDate === ''"
       :table-data="listRepeatability"
       :table-header="repeatabilityColumns"
-      :merge-rows="[]"
+      :merge-rows="['checkPoint']"
       :need-index="true"
     />
     <!-- 历史日期重复性数据 -->
@@ -1436,7 +1436,7 @@
       v-show="currentDate !== '核查数据' && currentDate !== ''"
       :table-data="listRepeatabilityCheckDate"
       :table-header="repeatabilityColumnsCheckData"
-      :merge-rows="[]"
+      :merge-rows="['checkPoint']"
       :need-index="true"
       max-height="300"
     />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index bd60a37..787b165 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -75,7 +75,7 @@
   { text: '文件编号', value: 'formNo', align: 'center' },
   { text: '文件名称', value: 'formName', align: 'center' },
   { text: '查新结果', value: 'noveltyResult', align: 'center' },
-  { text: '查新比例', value: 'searchRatio', align: 'center' },
+  { text: '更新比例', value: 'searchRatio', align: 'center' },
   { text: '查新人', value: 'createUserName', align: 'center' },
   { text: '查新日期', value: 'noveltyDate', align: 'center' },
 ])
@@ -271,7 +271,7 @@
           <normal-table
             :data="list" :total="total" :columns="columns" :query="listQueryLeft" is-showmulti-select
             :list-loading="loadingTable" :is-multi="props.isMulti" :height="360"
-            :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]" @change="changePage" @rowClick="rowClick"
+            :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]" @change="changePage" @row-click="rowClick"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -300,7 +300,7 @@
           <normal-table
             :data="methodsList" :total="total" :columns="methodsColumns" :query="listQueryRight"
             :list-loading="methodsLoadingTable" :is-multi="false" :height="416" :pagination="false"
-            @multiSelect="rowClickRight"
+            @multi-select="rowClickRight"
           >
             <!-- 序号 -->
             <template #preColumns>
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index c8f158a..009313b 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -292,9 +292,12 @@
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
-
           type.value = 'detail'
           hideAllOpterationButtons()
+          detailMethodNovelty({ id: novelty.value.id }).then((res) => {
+            novelty.value.processId = res.data.processId
+            status.value = '3'
+          })
         }
         else {
           ElMessage.error(`查新记录表 ${novelty.value.formNo} 提交失败：${res.message}`)
@@ -313,6 +316,7 @@
 
             type.value = 'detail'
             hideAllOpterationButtons()
+            status.value = '3'
           }
           else {
             // 提示失败信息
@@ -538,11 +542,13 @@
           fileId: element.id,
           fileNo: element.fileNo,
           fileName: element.fileName,
-          noveltyResult: '',
+          noveltyResult: element.noveltyStatus ? '1' : '2',
           groupCode: element.groupCode,
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
+
+          // 有更新1  无更新2
         })
       })
     })
@@ -918,7 +924,7 @@
                 <template #default="scope">
                   <el-radio-group v-model="scope.row.noveltyResult">
                     <el-radio
-                      v-for="item in noveltyResultDict" :key="item.value" class="radio" :value="item.value"
+                      v-for="item in noveltyResultDict" :key="item.value" class="radio1" :value="item.value"
                       :label="item.value" :disabled="type === 'detail'"
                     >
                       {{ item.name }}
@@ -940,7 +946,7 @@
                 <el-table-column label="操作" align="center" width="90">
                   <template #default="scope">
                     <el-button
-                      v-if="scope.row.noveltyResult !== '0'" size="small" type="primary" link
+                      v-if="scope.row.noveltyResult !== '2' && scope.row.noveltyResult" size="small" type="primary" link
                       @click="searchProcess(scope.row)"
                     >
                       查新进度
@@ -1019,7 +1025,7 @@
     <file-select-dialog ref="refFileSelect" @records-selected="appendFileToList" />
 
     <template v-if="current === 'novelty-approval' && status !== '1'">
-      <approval-record-table :process-id="novelty.processId" />
+      <approval-record-table v-if="current === 'novelty-approval' && status !== '1'" :process-id="novelty.processId" />
     </template>
   </app-container>
 </template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index 7bdaa1a..9749d02 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -59,7 +59,7 @@
   { text: '文件名称', value: 'formName', align: 'center' },
   { text: '查新途径', value: 'noveltyWay', align: 'center' },
   { text: '查新结果', value: 'noveltyResult', align: 'center' },
-  { text: '查新比例', value: 'searchRatio', align: 'center', width: '120' },
+  { text: '更新比例', value: 'searchRatio', align: 'center', width: '120' },
   { text: '查新人', value: 'createUserName', align: 'center', width: '120' },
   { text: '查新日期', value: 'noveltyDate', align: 'center', width: '160' },
 ])

diff --git a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
index 6bea8c9..dcf2e0c 100644
--- a/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
+++ b/src/components/ApprovalCustom/ApprovalRecordTableCustom.vue
@@ -32,7 +32,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue
index 9870b50..fee23d3 100644
--- a/src/components/ApprovalRecord/ApprovalRecordTable.vue
+++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue
@@ -31,7 +31,7 @@
   { text: '审批状态', value: 'approvalStatus', align: 'center', width: '120' },
   { text: '意见类别', value: 'type', align: 'center', width: '180' },
   { text: '审批意见', value: 'comment', align: 'center' },
-  { text: '用时', value: 'duration', align: 'center', width: '180' },
+  // { text: '用时', value: 'duration', align: 'center', width: '180' },
   { text: '审批时间', value: 'finishTime', align: 'center', width: '180' },
 ])
 
@@ -156,6 +156,15 @@
     fetchData()
   })
 }, { immediate: true })
+onMounted (() => {
+  console.log(props.processId, 'props.processId')
+  if (props.processId) {
+    listQuery.value.processId = props.processId
+    getDict().then(() => {
+      fetchData()
+    })
+  }
+})
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/second/templateDetail.vue b/src/views/business/measure/item/components/second/templateDetail.vue
index 4d738b9..4291e58 100644
--- a/src/views/business/measure/item/components/second/templateDetail.vue
+++ b/src/views/business/measure/item/components/second/templateDetail.vue
@@ -50,7 +50,15 @@
   voltageOutputStability: 1, // 输出电压短期稳定性
 })
 watch(() => props.form, (newVal) => {
-  form1.value = newVal
+  form1.value = {
+    ...newVal,
+    voltageRepresentationValueErrorType: form1.value.voltageRepresentationValueErrorType,
+    ammeterDirectType: form1.value.ammeterDirectType,
+    ammeterIndirectType: form1.value.ammeterIndirectType,
+  }
+  // form1.value.voltageRepresentationValueErrorType = '1'
+  // form1.value.ammeterDirectType = '1'
+  // form1.value.ammeterIndirectType = '1'
 })
 // 取消列表把列表置空
 const pageEditFlag = ref(false)
@@ -564,14 +572,17 @@
         case '3':
           // 电压表示值误差
           voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差' })
+          form1.value.voltageRepresentationValueErrorType = item.dataTypeType as string
           break
         case '4':
           // 电流表示值误差(直接测量)
           ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)' })
+          form1.value.ammeterDirectType = item.dataTypeType as string
           break
         case '5':
           // 电流表示值误差(间接测量)
           ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)' })
+          form1.value.ammeterIndirectType = item.dataTypeType as string
           break
         case '6':
           // 纹波电压
diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
index 139d89c..116d90b 100644
--- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
+++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue
@@ -1428,7 +1428,7 @@
       v-show="currentDate === '核查数据' || currentDate === ''"
       :table-data="listRepeatability"
       :table-header="repeatabilityColumns"
-      :merge-rows="[]"
+      :merge-rows="['checkPoint']"
       :need-index="true"
     />
     <!-- 历史日期重复性数据 -->
@@ -1436,7 +1436,7 @@
       v-show="currentDate !== '核查数据' && currentDate !== ''"
       :table-data="listRepeatabilityCheckDate"
       :table-header="repeatabilityColumnsCheckData"
-      :merge-rows="[]"
+      :merge-rows="['checkPoint']"
       :need-index="true"
       max-height="300"
     />
diff --git a/src/views/resource/file/methodConfirm/selectMethodDialog.vue b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
index bd60a37..787b165 100644
--- a/src/views/resource/file/methodConfirm/selectMethodDialog.vue
+++ b/src/views/resource/file/methodConfirm/selectMethodDialog.vue
@@ -75,7 +75,7 @@
   { text: '文件编号', value: 'formNo', align: 'center' },
   { text: '文件名称', value: 'formName', align: 'center' },
   { text: '查新结果', value: 'noveltyResult', align: 'center' },
-  { text: '查新比例', value: 'searchRatio', align: 'center' },
+  { text: '更新比例', value: 'searchRatio', align: 'center' },
   { text: '查新人', value: 'createUserName', align: 'center' },
   { text: '查新日期', value: 'noveltyDate', align: 'center' },
 ])
@@ -271,7 +271,7 @@
           <normal-table
             :data="list" :total="total" :columns="columns" :query="listQueryLeft" is-showmulti-select
             :list-loading="loadingTable" :is-multi="props.isMulti" :height="360"
-            :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]" @change="changePage" @rowClick="rowClick"
+            :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]" @change="changePage" @row-click="rowClick"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -300,7 +300,7 @@
           <normal-table
             :data="methodsList" :total="total" :columns="methodsColumns" :query="listQueryRight"
             :list-loading="methodsLoadingTable" :is-multi="false" :height="416" :pagination="false"
-            @multiSelect="rowClickRight"
+            @multi-select="rowClickRight"
           >
             <!-- 序号 -->
             <template #preColumns>
diff --git a/src/views/resource/file/noveltySearch/detail.vue b/src/views/resource/file/noveltySearch/detail.vue
index c8f158a..009313b 100644
--- a/src/views/resource/file/noveltySearch/detail.vue
+++ b/src/views/resource/file/noveltySearch/detail.vue
@@ -292,9 +292,12 @@
       }).then((res) => {
         if (res.code === 200) {
           ElMessage.success(`查新记录表 ${novelty.value.formNo} 提交成功`)
-
           type.value = 'detail'
           hideAllOpterationButtons()
+          detailMethodNovelty({ id: novelty.value.id }).then((res) => {
+            novelty.value.processId = res.data.processId
+            status.value = '3'
+          })
         }
         else {
           ElMessage.error(`查新记录表 ${novelty.value.formNo} 提交失败：${res.message}`)
@@ -313,6 +316,7 @@
 
             type.value = 'detail'
             hideAllOpterationButtons()
+            status.value = '3'
           }
           else {
             // 提示失败信息
@@ -538,11 +542,13 @@
           fileId: element.id,
           fileNo: element.fileNo,
           fileName: element.fileName,
-          noveltyResult: '',
+          noveltyResult: element.noveltyStatus ? '1' : '2',
           groupCode: element.groupCode,
           groupCodeName: element.groupCodeName,
           labCodeName: element.labCodeName,
           labCode: element.labCode,
+
+          // 有更新1  无更新2
         })
       })
     })
@@ -918,7 +924,7 @@
                 <template #default="scope">
                   <el-radio-group v-model="scope.row.noveltyResult">
                     <el-radio
-                      v-for="item in noveltyResultDict" :key="item.value" class="radio" :value="item.value"
+                      v-for="item in noveltyResultDict" :key="item.value" class="radio1" :value="item.value"
                       :label="item.value" :disabled="type === 'detail'"
                     >
                       {{ item.name }}
@@ -940,7 +946,7 @@
                 <el-table-column label="操作" align="center" width="90">
                   <template #default="scope">
                     <el-button
-                      v-if="scope.row.noveltyResult !== '0'" size="small" type="primary" link
+                      v-if="scope.row.noveltyResult !== '2' && scope.row.noveltyResult" size="small" type="primary" link
                       @click="searchProcess(scope.row)"
                     >
                       查新进度
@@ -1019,7 +1025,7 @@
     <file-select-dialog ref="refFileSelect" @records-selected="appendFileToList" />
 
     <template v-if="current === 'novelty-approval' && status !== '1'">
-      <approval-record-table :process-id="novelty.processId" />
+      <approval-record-table v-if="current === 'novelty-approval' && status !== '1'" :process-id="novelty.processId" />
     </template>
   </app-container>
 </template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index 7bdaa1a..9749d02 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -59,7 +59,7 @@
   { text: '文件名称', value: 'formName', align: 'center' },
   { text: '查新途径', value: 'noveltyWay', align: 'center' },
   { text: '查新结果', value: 'noveltyResult', align: 'center' },
-  { text: '查新比例', value: 'searchRatio', align: 'center', width: '120' },
+  { text: '更新比例', value: 'searchRatio', align: 'center', width: '120' },
   { text: '查新人', value: 'createUserName', align: 'center', width: '120' },
   { text: '查新日期', value: 'noveltyDate', align: 'center', width: '160' },
 ])
diff --git a/src/views/resource/technology/method/list.vue b/src/views/resource/technology/method/list.vue
index 7bfe6b2..86b55f0 100644
--- a/src/views/resource/technology/method/list.vue
+++ b/src/views/resource/technology/method/list.vue
@@ -41,8 +41,8 @@
 const columns = ref<TableColumn[]>([
   { text: '实验室', value: 'labCodeName', align: 'center', width: '100' },
   { text: '部门', value: 'groupCodeName', align: 'center', width: '150' },
-  { text: '文件编号', value: 'fileNo', align: 'center', width: '180' },
   { text: '文件发放号', value: 'fileDistributeNo', align: 'center', width: '180' },
+  { text: '文件编号', value: 'fileNo', align: 'center', width: '180' },
   { text: '文件名称', value: 'fileName', align: 'center' },
   { text: '启用时间', value: 'activeDateStr', align: 'center', width: '120' },
   { text: '查新状态', value: 'noveltyStatusName', align: 'center', width: '160' },
@@ -237,10 +237,10 @@
         </el-select>
       </search-item>
       <search-item width="162px">
-        <el-input v-model="searchQuery.fileNo" placeholder="文件编号" clearable />
+        <el-input v-model="searchQuery.fileDistributeNo" placeholder="文件发放号" clearable />
       </search-item>
       <search-item width="162px">
-        <el-input v-model="searchQuery.fileDistributeNo" placeholder="文件发放号" clearable />
+        <el-input v-model="searchQuery.fileNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item width="162px">
         <el-input v-model="searchQuery.fileName" placeholder="文件名称" clearable />