diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 9890c0b..644f8af 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -507,6 +507,8 @@
   }
   else if (form.value.belongStandardEquipment === '15') { // 第15套：小功率
     if (!standardRef.value.checkListBeforeSave()) { params = '未通过校验'; return params }
+    console.log('上传参数77777777777777777', standardRef.value.form)
+
     params = {
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 9890c0b..644f8af 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -507,6 +507,8 @@
   }
   else if (form.value.belongStandardEquipment === '15') { // 第15套：小功率
     if (!standardRef.value.checkListBeforeSave()) { params = '未通过校验'; return params }
+    console.log('上传参数77777777777777777', standardRef.value.form)
+
     params = {
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index a22c0ea..f31615d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -319,7 +319,7 @@
             v-model="listQuery.conclusion"
             placeholder="检定结论"
             filterable
-            class="full-width-input"
+            style="width: 220px;"
             clearable
           >
             <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
@@ -331,6 +331,7 @@
             class="short-input"
             placeholder="计量标识"
             clearable
+            style="width: 220px;"
           >
             <el-option v-for="item of meterIdentifyDict" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 9890c0b..644f8af 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -507,6 +507,8 @@
   }
   else if (form.value.belongStandardEquipment === '15') { // 第15套：小功率
     if (!standardRef.value.checkListBeforeSave()) { params = '未通过校验'; return params }
+    console.log('上传参数77777777777777777', standardRef.value.form)
+
     params = {
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index a22c0ea..f31615d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -319,7 +319,7 @@
             v-model="listQuery.conclusion"
             placeholder="检定结论"
             filterable
-            class="full-width-input"
+            style="width: 220px;"
             clearable
           >
             <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
@@ -331,6 +331,7 @@
             class="short-input"
             placeholder="计量标识"
             clearable
+            style="width: 220px;"
           >
             <el-option v-for="item of meterIdentifyDict" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index aadc6e8..d3d98bd 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -75,6 +75,7 @@
   { text: '计量标识', value: 'meterIdentify', align: 'center', width: '120' },
   { text: '检定证书', value: 'fileArr', align: 'center', width: '240', followLink: true },
   { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' },
+
   // { text: '所使用的测量标准及配套设备名称', value: 'equipmentNameStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备型号', value: 'equipmentModelStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备编号', value: 'equipmentManufactureNoStr', align: 'center' },
@@ -100,7 +101,11 @@
 async function getDict() {
   // 设备名称
   getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
+    deviceNameList.value = res.data.map((item: any) => {
+      return {
+        value: item,
+      }
+    })
   })
   // 计量标识
   getDictByCode('eqptMeterIdentify').then((response) => {
@@ -110,7 +115,17 @@
   getModelAllList({}).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = modelList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    helpList.value = helpList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
   })
 
   // 测试、校准或检定地点
@@ -174,7 +189,7 @@
       return {
         ...item,
         measureValidDate: dayjs(item.measureValidDate).format('YYYY-MM-DD'),
-        followLinkArr: item.certificateFile ? [item.certificateFile] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
+        followLinkArr: item.certificateFile ? [item.certificateFile] : item.dataSource === '康斯特自动检定系统' ? [`${item.sampleName}${item.model}${item.manufactureNo}康斯特证书`] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
         labCodeName: item.labCodeName === '西昌' || item.labCodeName === '海口' ? `${item.labCodeName}实验室` : item.labCodeName,
       }
     })
@@ -476,6 +491,27 @@
 }
 
 // ---------------------------------------钩子-------------------------------------------------------
+// 匹配设备名称输入建议
+const querySearchDeviceName = (queryString: string, cb: any) => {
+  const results = queryString ? deviceNameList.value.filter((item: any) => item.value.includes(queryString)) : deviceNameList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配型号规格输入建议
+const querySearchDeviceModel = (queryString: string, cb: any) => {
+  const results = queryString ? modelList.value.filter((item: any) => item.value.includes(queryString)) : modelList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配辅助字段输入建议
+const querySearchHelpInstruction = (queryString: string, cb: any) => {
+  const results = queryString ? helpList.value.filter((item: any) => item.value.includes(queryString)) : helpList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
 watch(timeRange, (val) => { // 监听检定日期变化
   if (val) {
     listQuery.value.traceDateStart = `${val[0]}`
@@ -554,22 +590,37 @@
         <el-input v-model.trim="listQuery.measureAddress" placeholder="检定地点" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.sampleName" filterable class="short-input" placeholder="受检设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.sampleName"
+          :fetch-suggestions="querySearchDeviceName"
+          placeholder="设备名称"
+          clearable
+        />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable class="short-input" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.model"
+          :fetch-suggestions="querySearchDeviceModel"
+          placeholder="规格型号"
+          clearable
+        />
       </search-item>
+
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" class="short-input" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+        <el-autocomplete
+          v-model="listQuery.helpInstruction"
+          :fetch-suggestions="querySearchHelpInstruction"
+          placeholder="辅助字段"
+          clearable
+        />
       </search-item>
       <!-- <search-item>
+        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+      </search-item> -->
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentModelStr" placeholder="标准设备型号" class="short-input" clearable />
       </search-item>
       <search-item>

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 9890c0b..644f8af 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -507,6 +507,8 @@
   }
   else if (form.value.belongStandardEquipment === '15') { // 第15套：小功率
     if (!standardRef.value.checkListBeforeSave()) { params = '未通过校验'; return params }
+    console.log('上传参数77777777777777777', standardRef.value.form)
+
     params = {
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index a22c0ea..f31615d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -319,7 +319,7 @@
             v-model="listQuery.conclusion"
             placeholder="检定结论"
             filterable
-            class="full-width-input"
+            style="width: 220px;"
             clearable
           >
             <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
@@ -331,6 +331,7 @@
             class="short-input"
             placeholder="计量标识"
             clearable
+            style="width: 220px;"
           >
             <el-option v-for="item of meterIdentifyDict" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index aadc6e8..d3d98bd 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -75,6 +75,7 @@
   { text: '计量标识', value: 'meterIdentify', align: 'center', width: '120' },
   { text: '检定证书', value: 'fileArr', align: 'center', width: '240', followLink: true },
   { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' },
+
   // { text: '所使用的测量标准及配套设备名称', value: 'equipmentNameStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备型号', value: 'equipmentModelStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备编号', value: 'equipmentManufactureNoStr', align: 'center' },
@@ -100,7 +101,11 @@
 async function getDict() {
   // 设备名称
   getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
+    deviceNameList.value = res.data.map((item: any) => {
+      return {
+        value: item,
+      }
+    })
   })
   // 计量标识
   getDictByCode('eqptMeterIdentify').then((response) => {
@@ -110,7 +115,17 @@
   getModelAllList({}).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = modelList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    helpList.value = helpList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
   })
 
   // 测试、校准或检定地点
@@ -174,7 +189,7 @@
       return {
         ...item,
         measureValidDate: dayjs(item.measureValidDate).format('YYYY-MM-DD'),
-        followLinkArr: item.certificateFile ? [item.certificateFile] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
+        followLinkArr: item.certificateFile ? [item.certificateFile] : item.dataSource === '康斯特自动检定系统' ? [`${item.sampleName}${item.model}${item.manufactureNo}康斯特证书`] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
         labCodeName: item.labCodeName === '西昌' || item.labCodeName === '海口' ? `${item.labCodeName}实验室` : item.labCodeName,
       }
     })
@@ -476,6 +491,27 @@
 }
 
 // ---------------------------------------钩子-------------------------------------------------------
+// 匹配设备名称输入建议
+const querySearchDeviceName = (queryString: string, cb: any) => {
+  const results = queryString ? deviceNameList.value.filter((item: any) => item.value.includes(queryString)) : deviceNameList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配型号规格输入建议
+const querySearchDeviceModel = (queryString: string, cb: any) => {
+  const results = queryString ? modelList.value.filter((item: any) => item.value.includes(queryString)) : modelList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配辅助字段输入建议
+const querySearchHelpInstruction = (queryString: string, cb: any) => {
+  const results = queryString ? helpList.value.filter((item: any) => item.value.includes(queryString)) : helpList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
 watch(timeRange, (val) => { // 监听检定日期变化
   if (val) {
     listQuery.value.traceDateStart = `${val[0]}`
@@ -554,22 +590,37 @@
         <el-input v-model.trim="listQuery.measureAddress" placeholder="检定地点" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.sampleName" filterable class="short-input" placeholder="受检设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.sampleName"
+          :fetch-suggestions="querySearchDeviceName"
+          placeholder="设备名称"
+          clearable
+        />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable class="short-input" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.model"
+          :fetch-suggestions="querySearchDeviceModel"
+          placeholder="规格型号"
+          clearable
+        />
       </search-item>
+
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" class="short-input" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+        <el-autocomplete
+          v-model="listQuery.helpInstruction"
+          :fetch-suggestions="querySearchHelpInstruction"
+          placeholder="辅助字段"
+          clearable
+        />
       </search-item>
       <!-- <search-item>
+        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+      </search-item> -->
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentModelStr" placeholder="标准设备型号" class="short-input" clearable />
       </search-item>
       <search-item>
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0f999ea..23e182b 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -171,6 +171,7 @@
 ])
 const addObj = {
   id: '',
+  equipmentId: '', // equipmentId
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -210,6 +211,8 @@
 // 点击选择
 const chooseList = (row: any, index: number) => {
   selectIndex.value = index
+  console.log('888888888888888选择第几行设备', selectIndex.value);
+
   isMulti.value = false
   selectEquipmentDialogRef.value.initDialog()
 }
@@ -285,10 +288,16 @@
     ElMessage.warning('请先选择文件名称的年份')
     return false
   }
+  console.log('o[po[pki[p]]]', row);
+
+  if (!row.equipmentId) {
+    ElMessage.warning('请先选择设备')
+    return false
+  }
   isShowEquipmentInfo.value = true
   editIndex.value = index
   equipmentInfoForm.value = {
-    equipmentId: row.id, // 设备id
+    equipmentId: row.equipmentId, // 设备id
     equipmentNo: row.equipmentNo, // 统一编号
     equipmentName: row.equipmentName, // 设备名称
     model: row.model, // 规格型号
@@ -317,12 +326,12 @@
   }
   sourceNeedlist.value = row.technicalTargetList || []
   // 这里请求所属标准装置的数据
-  getEquipmentInfo({ id: row.id, type: '1' }).then((res) => {
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+  getEquipmentInfo({ id: row.equipmentId, type: '1' }).then((res) => {
+    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;equipmentId: string }) => {
       return {
         standardName: item.standardName,
         standardNo: item.standardNo,
-        id: item.id,
+        id: item.equipmentId,
       }
     })
     haveStandardInfo.value = meterStandardList.length
@@ -338,7 +347,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: any) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: { id: string }) => item.id === i.id)
+      const index = list.value.findIndex((i: { equipmentId: string }) => item.id === i.equipmentId)
       if (index === -1) {
         list.value.push({
           ...item,
@@ -356,14 +365,21 @@
           supplierId: lastSupplierName.value,
           traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
           traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+          id: '',
+          equipmentId: item.id,
         })
       }
     })
   }
   else { // 单选
-    const index = list.value.findIndex((i: { id: string }) => val[0].id === i.id)
+    console.log('-------------', list.value)
+
+    const index = list.value.findIndex((i: { equipmentId: string }) => val[0].id === i.equipmentId)
+    console.log('[[index]]', index)
+    console.log('编辑第几行设备', selectIndex.value)
+
     if (index === -1) {
-      list.value.splice(list.value[index + 1], 1, {
+      list.value.splice(selectIndex.value, 1, {
         ...val[0],
         planTraceTime: val[0].measureValidDate ? dayjs(val[0].measureValidDate).format('YYYY-MM') : val[0].measureValidDate, // 计划溯源时间
         standardName: val[0].meterStandardName, // 所属测量标准名称
@@ -379,7 +395,10 @@
         supplierId: lastSupplierName.value,
         traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
         traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+        id: '',
+        equipmentId: val[0].id,
       })
+      console.log('-------------', list.value)
     }
     else {
       ElMessage.warning('此设备已添加过')
@@ -401,6 +420,7 @@
       list.value[editIndex.value].traceWayName = traceWayMap[`${equipmentInfoForm.value.traceWay}`]
       list.value[editIndex.value].technicalTargetList = sourceNeedlist.value // 溯源需求
       isShowEquipmentInfo.value = false // 隐藏编辑模块
+      console.log('点击确认编辑', list.value)
     }
   })
 }

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 9890c0b..644f8af 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -507,6 +507,8 @@
   }
   else if (form.value.belongStandardEquipment === '15') { // 第15套：小功率
     if (!standardRef.value.checkListBeforeSave()) { params = '未通过校验'; return params }
+    console.log('上传参数77777777777777777', standardRef.value.form)
+
     params = {
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index a22c0ea..f31615d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -319,7 +319,7 @@
             v-model="listQuery.conclusion"
             placeholder="检定结论"
             filterable
-            class="full-width-input"
+            style="width: 220px;"
             clearable
           >
             <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
@@ -331,6 +331,7 @@
             class="short-input"
             placeholder="计量标识"
             clearable
+            style="width: 220px;"
           >
             <el-option v-for="item of meterIdentifyDict" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index aadc6e8..d3d98bd 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -75,6 +75,7 @@
   { text: '计量标识', value: 'meterIdentify', align: 'center', width: '120' },
   { text: '检定证书', value: 'fileArr', align: 'center', width: '240', followLink: true },
   { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' },
+
   // { text: '所使用的测量标准及配套设备名称', value: 'equipmentNameStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备型号', value: 'equipmentModelStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备编号', value: 'equipmentManufactureNoStr', align: 'center' },
@@ -100,7 +101,11 @@
 async function getDict() {
   // 设备名称
   getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
+    deviceNameList.value = res.data.map((item: any) => {
+      return {
+        value: item,
+      }
+    })
   })
   // 计量标识
   getDictByCode('eqptMeterIdentify').then((response) => {
@@ -110,7 +115,17 @@
   getModelAllList({}).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = modelList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    helpList.value = helpList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
   })
 
   // 测试、校准或检定地点
@@ -174,7 +189,7 @@
       return {
         ...item,
         measureValidDate: dayjs(item.measureValidDate).format('YYYY-MM-DD'),
-        followLinkArr: item.certificateFile ? [item.certificateFile] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
+        followLinkArr: item.certificateFile ? [item.certificateFile] : item.dataSource === '康斯特自动检定系统' ? [`${item.sampleName}${item.model}${item.manufactureNo}康斯特证书`] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
         labCodeName: item.labCodeName === '西昌' || item.labCodeName === '海口' ? `${item.labCodeName}实验室` : item.labCodeName,
       }
     })
@@ -476,6 +491,27 @@
 }
 
 // ---------------------------------------钩子-------------------------------------------------------
+// 匹配设备名称输入建议
+const querySearchDeviceName = (queryString: string, cb: any) => {
+  const results = queryString ? deviceNameList.value.filter((item: any) => item.value.includes(queryString)) : deviceNameList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配型号规格输入建议
+const querySearchDeviceModel = (queryString: string, cb: any) => {
+  const results = queryString ? modelList.value.filter((item: any) => item.value.includes(queryString)) : modelList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配辅助字段输入建议
+const querySearchHelpInstruction = (queryString: string, cb: any) => {
+  const results = queryString ? helpList.value.filter((item: any) => item.value.includes(queryString)) : helpList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
 watch(timeRange, (val) => { // 监听检定日期变化
   if (val) {
     listQuery.value.traceDateStart = `${val[0]}`
@@ -554,22 +590,37 @@
         <el-input v-model.trim="listQuery.measureAddress" placeholder="检定地点" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.sampleName" filterable class="short-input" placeholder="受检设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.sampleName"
+          :fetch-suggestions="querySearchDeviceName"
+          placeholder="设备名称"
+          clearable
+        />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable class="short-input" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.model"
+          :fetch-suggestions="querySearchDeviceModel"
+          placeholder="规格型号"
+          clearable
+        />
       </search-item>
+
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" class="short-input" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+        <el-autocomplete
+          v-model="listQuery.helpInstruction"
+          :fetch-suggestions="querySearchHelpInstruction"
+          placeholder="辅助字段"
+          clearable
+        />
       </search-item>
       <!-- <search-item>
+        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+      </search-item> -->
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentModelStr" placeholder="标准设备型号" class="short-input" clearable />
       </search-item>
       <search-item>
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0f999ea..23e182b 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -171,6 +171,7 @@
 ])
 const addObj = {
   id: '',
+  equipmentId: '', // equipmentId
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -210,6 +211,8 @@
 // 点击选择
 const chooseList = (row: any, index: number) => {
   selectIndex.value = index
+  console.log('888888888888888选择第几行设备', selectIndex.value);
+
   isMulti.value = false
   selectEquipmentDialogRef.value.initDialog()
 }
@@ -285,10 +288,16 @@
     ElMessage.warning('请先选择文件名称的年份')
     return false
   }
+  console.log('o[po[pki[p]]]', row);
+
+  if (!row.equipmentId) {
+    ElMessage.warning('请先选择设备')
+    return false
+  }
   isShowEquipmentInfo.value = true
   editIndex.value = index
   equipmentInfoForm.value = {
-    equipmentId: row.id, // 设备id
+    equipmentId: row.equipmentId, // 设备id
     equipmentNo: row.equipmentNo, // 统一编号
     equipmentName: row.equipmentName, // 设备名称
     model: row.model, // 规格型号
@@ -317,12 +326,12 @@
   }
   sourceNeedlist.value = row.technicalTargetList || []
   // 这里请求所属标准装置的数据
-  getEquipmentInfo({ id: row.id, type: '1' }).then((res) => {
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+  getEquipmentInfo({ id: row.equipmentId, type: '1' }).then((res) => {
+    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;equipmentId: string }) => {
       return {
         standardName: item.standardName,
         standardNo: item.standardNo,
-        id: item.id,
+        id: item.equipmentId,
       }
     })
     haveStandardInfo.value = meterStandardList.length
@@ -338,7 +347,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: any) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: { id: string }) => item.id === i.id)
+      const index = list.value.findIndex((i: { equipmentId: string }) => item.id === i.equipmentId)
       if (index === -1) {
         list.value.push({
           ...item,
@@ -356,14 +365,21 @@
           supplierId: lastSupplierName.value,
           traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
           traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+          id: '',
+          equipmentId: item.id,
         })
       }
     })
   }
   else { // 单选
-    const index = list.value.findIndex((i: { id: string }) => val[0].id === i.id)
+    console.log('-------------', list.value)
+
+    const index = list.value.findIndex((i: { equipmentId: string }) => val[0].id === i.equipmentId)
+    console.log('[[index]]', index)
+    console.log('编辑第几行设备', selectIndex.value)
+
     if (index === -1) {
-      list.value.splice(list.value[index + 1], 1, {
+      list.value.splice(selectIndex.value, 1, {
         ...val[0],
         planTraceTime: val[0].measureValidDate ? dayjs(val[0].measureValidDate).format('YYYY-MM') : val[0].measureValidDate, // 计划溯源时间
         standardName: val[0].meterStandardName, // 所属测量标准名称
@@ -379,7 +395,10 @@
         supplierId: lastSupplierName.value,
         traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
         traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+        id: '',
+        equipmentId: val[0].id,
       })
+      console.log('-------------', list.value)
     }
     else {
       ElMessage.warning('此设备已添加过')
@@ -401,6 +420,7 @@
       list.value[editIndex.value].traceWayName = traceWayMap[`${equipmentInfoForm.value.traceWay}`]
       list.value[editIndex.value].technicalTargetList = sourceNeedlist.value // 溯源需求
       isShowEquipmentInfo.value = false // 隐藏编辑模块
+      console.log('点击确认编辑', list.value)
     }
   })
 }
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index c70859b..98a95a0 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结论(计量标识字典code)
+  conclusion: '', // 结果确认结论(输入框)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(输入框)
+  meterIdentifyName: '', // 结论
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -131,8 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
-  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -140,7 +140,7 @@
   validDateCorrect: [{ required: true, message: '有效期是否正确不能为空', trigger: ['blur', 'change'] }],
   signComplete: [{ required: true, message: '签名信息是否齐全不能为空', trigger: ['blur', 'change'] }],
   sealComplete: [{ required: true, message: '是否盖有有效印章不能为空', trigger: ['blur', 'change'] }],
-  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
   certificateFile: [{ required: true, message: '检定证书不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -315,16 +315,16 @@
     })
 
     // ------------------处理所属测量标准名称----------------------
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
-      return {
-        standardName: item.standardName,
-        standardNo: item.standardNo,
-        id: item.id,
-      }
-    })
+    // const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+    //   return {
+    //     standardName: item.standardName,
+    //     standardNo: item.standardNo,
+    //     id: item.id,
+    //   }
+    // })
     // form.value.standardId = meterStandardList.map((item: { id: string }) => item.id).join(',')
-    form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
-    form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
+    // form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
+    // form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
   })
 }
 
@@ -1113,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="conclusion">
+            <el-form-item label="结论:" prop="meterIdentify">
               <el-select
-                v-model="form.conclusion"
+                v-model="form.meterIdentify"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1349,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
+            <el-form-item label="结果确认结论:" prop="conclusion">
               <el-input
-                v-model="form.meterIdentifyName"
+                v-model="form.conclusion"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 9890c0b..644f8af 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -507,6 +507,8 @@
   }
   else if (form.value.belongStandardEquipment === '15') { // 第15套：小功率
     if (!standardRef.value.checkListBeforeSave()) { params = '未通过校验'; return params }
+    console.log('上传参数77777777777777777', standardRef.value.form)
+
     params = {
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index a22c0ea..f31615d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -319,7 +319,7 @@
             v-model="listQuery.conclusion"
             placeholder="检定结论"
             filterable
-            class="full-width-input"
+            style="width: 220px;"
             clearable
           >
             <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
@@ -331,6 +331,7 @@
             class="short-input"
             placeholder="计量标识"
             clearable
+            style="width: 220px;"
           >
             <el-option v-for="item of meterIdentifyDict" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index aadc6e8..d3d98bd 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -75,6 +75,7 @@
   { text: '计量标识', value: 'meterIdentify', align: 'center', width: '120' },
   { text: '检定证书', value: 'fileArr', align: 'center', width: '240', followLink: true },
   { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' },
+
   // { text: '所使用的测量标准及配套设备名称', value: 'equipmentNameStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备型号', value: 'equipmentModelStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备编号', value: 'equipmentManufactureNoStr', align: 'center' },
@@ -100,7 +101,11 @@
 async function getDict() {
   // 设备名称
   getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
+    deviceNameList.value = res.data.map((item: any) => {
+      return {
+        value: item,
+      }
+    })
   })
   // 计量标识
   getDictByCode('eqptMeterIdentify').then((response) => {
@@ -110,7 +115,17 @@
   getModelAllList({}).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = modelList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    helpList.value = helpList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
   })
 
   // 测试、校准或检定地点
@@ -174,7 +189,7 @@
       return {
         ...item,
         measureValidDate: dayjs(item.measureValidDate).format('YYYY-MM-DD'),
-        followLinkArr: item.certificateFile ? [item.certificateFile] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
+        followLinkArr: item.certificateFile ? [item.certificateFile] : item.dataSource === '康斯特自动检定系统' ? [`${item.sampleName}${item.model}${item.manufactureNo}康斯特证书`] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
         labCodeName: item.labCodeName === '西昌' || item.labCodeName === '海口' ? `${item.labCodeName}实验室` : item.labCodeName,
       }
     })
@@ -476,6 +491,27 @@
 }
 
 // ---------------------------------------钩子-------------------------------------------------------
+// 匹配设备名称输入建议
+const querySearchDeviceName = (queryString: string, cb: any) => {
+  const results = queryString ? deviceNameList.value.filter((item: any) => item.value.includes(queryString)) : deviceNameList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配型号规格输入建议
+const querySearchDeviceModel = (queryString: string, cb: any) => {
+  const results = queryString ? modelList.value.filter((item: any) => item.value.includes(queryString)) : modelList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配辅助字段输入建议
+const querySearchHelpInstruction = (queryString: string, cb: any) => {
+  const results = queryString ? helpList.value.filter((item: any) => item.value.includes(queryString)) : helpList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
 watch(timeRange, (val) => { // 监听检定日期变化
   if (val) {
     listQuery.value.traceDateStart = `${val[0]}`
@@ -554,22 +590,37 @@
         <el-input v-model.trim="listQuery.measureAddress" placeholder="检定地点" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.sampleName" filterable class="short-input" placeholder="受检设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.sampleName"
+          :fetch-suggestions="querySearchDeviceName"
+          placeholder="设备名称"
+          clearable
+        />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable class="short-input" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.model"
+          :fetch-suggestions="querySearchDeviceModel"
+          placeholder="规格型号"
+          clearable
+        />
       </search-item>
+
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" class="short-input" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+        <el-autocomplete
+          v-model="listQuery.helpInstruction"
+          :fetch-suggestions="querySearchHelpInstruction"
+          placeholder="辅助字段"
+          clearable
+        />
       </search-item>
       <!-- <search-item>
+        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+      </search-item> -->
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentModelStr" placeholder="标准设备型号" class="short-input" clearable />
       </search-item>
       <search-item>
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0f999ea..23e182b 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -171,6 +171,7 @@
 ])
 const addObj = {
   id: '',
+  equipmentId: '', // equipmentId
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -210,6 +211,8 @@
 // 点击选择
 const chooseList = (row: any, index: number) => {
   selectIndex.value = index
+  console.log('888888888888888选择第几行设备', selectIndex.value);
+
   isMulti.value = false
   selectEquipmentDialogRef.value.initDialog()
 }
@@ -285,10 +288,16 @@
     ElMessage.warning('请先选择文件名称的年份')
     return false
   }
+  console.log('o[po[pki[p]]]', row);
+
+  if (!row.equipmentId) {
+    ElMessage.warning('请先选择设备')
+    return false
+  }
   isShowEquipmentInfo.value = true
   editIndex.value = index
   equipmentInfoForm.value = {
-    equipmentId: row.id, // 设备id
+    equipmentId: row.equipmentId, // 设备id
     equipmentNo: row.equipmentNo, // 统一编号
     equipmentName: row.equipmentName, // 设备名称
     model: row.model, // 规格型号
@@ -317,12 +326,12 @@
   }
   sourceNeedlist.value = row.technicalTargetList || []
   // 这里请求所属标准装置的数据
-  getEquipmentInfo({ id: row.id, type: '1' }).then((res) => {
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+  getEquipmentInfo({ id: row.equipmentId, type: '1' }).then((res) => {
+    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;equipmentId: string }) => {
       return {
         standardName: item.standardName,
         standardNo: item.standardNo,
-        id: item.id,
+        id: item.equipmentId,
       }
     })
     haveStandardInfo.value = meterStandardList.length
@@ -338,7 +347,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: any) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: { id: string }) => item.id === i.id)
+      const index = list.value.findIndex((i: { equipmentId: string }) => item.id === i.equipmentId)
       if (index === -1) {
         list.value.push({
           ...item,
@@ -356,14 +365,21 @@
           supplierId: lastSupplierName.value,
           traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
           traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+          id: '',
+          equipmentId: item.id,
         })
       }
     })
   }
   else { // 单选
-    const index = list.value.findIndex((i: { id: string }) => val[0].id === i.id)
+    console.log('-------------', list.value)
+
+    const index = list.value.findIndex((i: { equipmentId: string }) => val[0].id === i.equipmentId)
+    console.log('[[index]]', index)
+    console.log('编辑第几行设备', selectIndex.value)
+
     if (index === -1) {
-      list.value.splice(list.value[index + 1], 1, {
+      list.value.splice(selectIndex.value, 1, {
         ...val[0],
         planTraceTime: val[0].measureValidDate ? dayjs(val[0].measureValidDate).format('YYYY-MM') : val[0].measureValidDate, // 计划溯源时间
         standardName: val[0].meterStandardName, // 所属测量标准名称
@@ -379,7 +395,10 @@
         supplierId: lastSupplierName.value,
         traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
         traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+        id: '',
+        equipmentId: val[0].id,
       })
+      console.log('-------------', list.value)
     }
     else {
       ElMessage.warning('此设备已添加过')
@@ -401,6 +420,7 @@
       list.value[editIndex.value].traceWayName = traceWayMap[`${equipmentInfoForm.value.traceWay}`]
       list.value[editIndex.value].technicalTargetList = sourceNeedlist.value // 溯源需求
       isShowEquipmentInfo.value = false // 隐藏编辑模块
+      console.log('点击确认编辑', list.value)
     }
   })
 }
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index c70859b..98a95a0 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结论(计量标识字典code)
+  conclusion: '', // 结果确认结论(输入框)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(输入框)
+  meterIdentifyName: '', // 结论
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -131,8 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
-  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -140,7 +140,7 @@
   validDateCorrect: [{ required: true, message: '有效期是否正确不能为空', trigger: ['blur', 'change'] }],
   signComplete: [{ required: true, message: '签名信息是否齐全不能为空', trigger: ['blur', 'change'] }],
   sealComplete: [{ required: true, message: '是否盖有有效印章不能为空', trigger: ['blur', 'change'] }],
-  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
   certificateFile: [{ required: true, message: '检定证书不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -315,16 +315,16 @@
     })
 
     // ------------------处理所属测量标准名称----------------------
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
-      return {
-        standardName: item.standardName,
-        standardNo: item.standardNo,
-        id: item.id,
-      }
-    })
+    // const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+    //   return {
+    //     standardName: item.standardName,
+    //     standardNo: item.standardNo,
+    //     id: item.id,
+    //   }
+    // })
     // form.value.standardId = meterStandardList.map((item: { id: string }) => item.id).join(',')
-    form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
-    form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
+    // form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
+    // form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
   })
 }
 
@@ -1113,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="conclusion">
+            <el-form-item label="结论:" prop="meterIdentify">
               <el-select
-                v-model="form.conclusion"
+                v-model="form.meterIdentify"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1349,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
+            <el-form-item label="结果确认结论:" prop="conclusion">
               <el-input
-                v-model="form.meterIdentifyName"
+                v-model="form.conclusion"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/standard/book/components/config/thirteenth/config.vue b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
index c178dfd..e742373 100644
--- a/src/views/equipement/standard/book/components/config/thirteenth/config.vue
+++ b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
@@ -117,7 +117,7 @@
     case '直流电压(50Ω)':
       checkoutDirectVoltage50ΩList.value = e
       break
-    case '直流电压(1Ω)':
+    case '直流电压(1MΩ)':
       checkoutDirectVoltage1MΩList.value = e
       break
     case '输入阻抗':

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 9890c0b..644f8af 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -507,6 +507,8 @@
   }
   else if (form.value.belongStandardEquipment === '15') { // 第15套：小功率
     if (!standardRef.value.checkListBeforeSave()) { params = '未通过校验'; return params }
+    console.log('上传参数77777777777777777', standardRef.value.form)
+
     params = {
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index a22c0ea..f31615d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -319,7 +319,7 @@
             v-model="listQuery.conclusion"
             placeholder="检定结论"
             filterable
-            class="full-width-input"
+            style="width: 220px;"
             clearable
           >
             <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
@@ -331,6 +331,7 @@
             class="short-input"
             placeholder="计量标识"
             clearable
+            style="width: 220px;"
           >
             <el-option v-for="item of meterIdentifyDict" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index aadc6e8..d3d98bd 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -75,6 +75,7 @@
   { text: '计量标识', value: 'meterIdentify', align: 'center', width: '120' },
   { text: '检定证书', value: 'fileArr', align: 'center', width: '240', followLink: true },
   { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' },
+
   // { text: '所使用的测量标准及配套设备名称', value: 'equipmentNameStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备型号', value: 'equipmentModelStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备编号', value: 'equipmentManufactureNoStr', align: 'center' },
@@ -100,7 +101,11 @@
 async function getDict() {
   // 设备名称
   getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
+    deviceNameList.value = res.data.map((item: any) => {
+      return {
+        value: item,
+      }
+    })
   })
   // 计量标识
   getDictByCode('eqptMeterIdentify').then((response) => {
@@ -110,7 +115,17 @@
   getModelAllList({}).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = modelList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    helpList.value = helpList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
   })
 
   // 测试、校准或检定地点
@@ -174,7 +189,7 @@
       return {
         ...item,
         measureValidDate: dayjs(item.measureValidDate).format('YYYY-MM-DD'),
-        followLinkArr: item.certificateFile ? [item.certificateFile] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
+        followLinkArr: item.certificateFile ? [item.certificateFile] : item.dataSource === '康斯特自动检定系统' ? [`${item.sampleName}${item.model}${item.manufactureNo}康斯特证书`] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
         labCodeName: item.labCodeName === '西昌' || item.labCodeName === '海口' ? `${item.labCodeName}实验室` : item.labCodeName,
       }
     })
@@ -476,6 +491,27 @@
 }
 
 // ---------------------------------------钩子-------------------------------------------------------
+// 匹配设备名称输入建议
+const querySearchDeviceName = (queryString: string, cb: any) => {
+  const results = queryString ? deviceNameList.value.filter((item: any) => item.value.includes(queryString)) : deviceNameList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配型号规格输入建议
+const querySearchDeviceModel = (queryString: string, cb: any) => {
+  const results = queryString ? modelList.value.filter((item: any) => item.value.includes(queryString)) : modelList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配辅助字段输入建议
+const querySearchHelpInstruction = (queryString: string, cb: any) => {
+  const results = queryString ? helpList.value.filter((item: any) => item.value.includes(queryString)) : helpList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
 watch(timeRange, (val) => { // 监听检定日期变化
   if (val) {
     listQuery.value.traceDateStart = `${val[0]}`
@@ -554,22 +590,37 @@
         <el-input v-model.trim="listQuery.measureAddress" placeholder="检定地点" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.sampleName" filterable class="short-input" placeholder="受检设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.sampleName"
+          :fetch-suggestions="querySearchDeviceName"
+          placeholder="设备名称"
+          clearable
+        />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable class="short-input" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.model"
+          :fetch-suggestions="querySearchDeviceModel"
+          placeholder="规格型号"
+          clearable
+        />
       </search-item>
+
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" class="short-input" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+        <el-autocomplete
+          v-model="listQuery.helpInstruction"
+          :fetch-suggestions="querySearchHelpInstruction"
+          placeholder="辅助字段"
+          clearable
+        />
       </search-item>
       <!-- <search-item>
+        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+      </search-item> -->
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentModelStr" placeholder="标准设备型号" class="short-input" clearable />
       </search-item>
       <search-item>
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0f999ea..23e182b 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -171,6 +171,7 @@
 ])
 const addObj = {
   id: '',
+  equipmentId: '', // equipmentId
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -210,6 +211,8 @@
 // 点击选择
 const chooseList = (row: any, index: number) => {
   selectIndex.value = index
+  console.log('888888888888888选择第几行设备', selectIndex.value);
+
   isMulti.value = false
   selectEquipmentDialogRef.value.initDialog()
 }
@@ -285,10 +288,16 @@
     ElMessage.warning('请先选择文件名称的年份')
     return false
   }
+  console.log('o[po[pki[p]]]', row);
+
+  if (!row.equipmentId) {
+    ElMessage.warning('请先选择设备')
+    return false
+  }
   isShowEquipmentInfo.value = true
   editIndex.value = index
   equipmentInfoForm.value = {
-    equipmentId: row.id, // 设备id
+    equipmentId: row.equipmentId, // 设备id
     equipmentNo: row.equipmentNo, // 统一编号
     equipmentName: row.equipmentName, // 设备名称
     model: row.model, // 规格型号
@@ -317,12 +326,12 @@
   }
   sourceNeedlist.value = row.technicalTargetList || []
   // 这里请求所属标准装置的数据
-  getEquipmentInfo({ id: row.id, type: '1' }).then((res) => {
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+  getEquipmentInfo({ id: row.equipmentId, type: '1' }).then((res) => {
+    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;equipmentId: string }) => {
       return {
         standardName: item.standardName,
         standardNo: item.standardNo,
-        id: item.id,
+        id: item.equipmentId,
       }
     })
     haveStandardInfo.value = meterStandardList.length
@@ -338,7 +347,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: any) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: { id: string }) => item.id === i.id)
+      const index = list.value.findIndex((i: { equipmentId: string }) => item.id === i.equipmentId)
       if (index === -1) {
         list.value.push({
           ...item,
@@ -356,14 +365,21 @@
           supplierId: lastSupplierName.value,
           traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
           traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+          id: '',
+          equipmentId: item.id,
         })
       }
     })
   }
   else { // 单选
-    const index = list.value.findIndex((i: { id: string }) => val[0].id === i.id)
+    console.log('-------------', list.value)
+
+    const index = list.value.findIndex((i: { equipmentId: string }) => val[0].id === i.equipmentId)
+    console.log('[[index]]', index)
+    console.log('编辑第几行设备', selectIndex.value)
+
     if (index === -1) {
-      list.value.splice(list.value[index + 1], 1, {
+      list.value.splice(selectIndex.value, 1, {
         ...val[0],
         planTraceTime: val[0].measureValidDate ? dayjs(val[0].measureValidDate).format('YYYY-MM') : val[0].measureValidDate, // 计划溯源时间
         standardName: val[0].meterStandardName, // 所属测量标准名称
@@ -379,7 +395,10 @@
         supplierId: lastSupplierName.value,
         traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
         traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+        id: '',
+        equipmentId: val[0].id,
       })
+      console.log('-------------', list.value)
     }
     else {
       ElMessage.warning('此设备已添加过')
@@ -401,6 +420,7 @@
       list.value[editIndex.value].traceWayName = traceWayMap[`${equipmentInfoForm.value.traceWay}`]
       list.value[editIndex.value].technicalTargetList = sourceNeedlist.value // 溯源需求
       isShowEquipmentInfo.value = false // 隐藏编辑模块
+      console.log('点击确认编辑', list.value)
     }
   })
 }
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index c70859b..98a95a0 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结论(计量标识字典code)
+  conclusion: '', // 结果确认结论(输入框)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(输入框)
+  meterIdentifyName: '', // 结论
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -131,8 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
-  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -140,7 +140,7 @@
   validDateCorrect: [{ required: true, message: '有效期是否正确不能为空', trigger: ['blur', 'change'] }],
   signComplete: [{ required: true, message: '签名信息是否齐全不能为空', trigger: ['blur', 'change'] }],
   sealComplete: [{ required: true, message: '是否盖有有效印章不能为空', trigger: ['blur', 'change'] }],
-  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
   certificateFile: [{ required: true, message: '检定证书不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -315,16 +315,16 @@
     })
 
     // ------------------处理所属测量标准名称----------------------
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
-      return {
-        standardName: item.standardName,
-        standardNo: item.standardNo,
-        id: item.id,
-      }
-    })
+    // const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+    //   return {
+    //     standardName: item.standardName,
+    //     standardNo: item.standardNo,
+    //     id: item.id,
+    //   }
+    // })
     // form.value.standardId = meterStandardList.map((item: { id: string }) => item.id).join(',')
-    form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
-    form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
+    // form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
+    // form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
   })
 }
 
@@ -1113,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="conclusion">
+            <el-form-item label="结论:" prop="meterIdentify">
               <el-select
-                v-model="form.conclusion"
+                v-model="form.meterIdentify"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1349,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
+            <el-form-item label="结果确认结论:" prop="conclusion">
               <el-input
-                v-model="form.meterIdentifyName"
+                v-model="form.conclusion"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/standard/book/components/config/thirteenth/config.vue b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
index c178dfd..e742373 100644
--- a/src/views/equipement/standard/book/components/config/thirteenth/config.vue
+++ b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
@@ -117,7 +117,7 @@
     case '直流电压(50Ω)':
       checkoutDirectVoltage50ΩList.value = e
       break
-    case '直流电压(1Ω)':
+    case '直流电压(1MΩ)':
       checkoutDirectVoltage1MΩList.value = e
       break
     case '输入阻抗':
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 55435fd..42053f7 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -255,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
+    technologyFile.value = response.data.rows.filter((i: { pdfUrl: string }) => i.pdfUrl).map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -1107,7 +1107,7 @@
               <div v-for="(item, index) in technologyFile" :key="index" style="display: flex;">
                 <show-photo v-if="technologyFile.length" :minio-file-name="item" style="margin-right: 10px;" />
               </div>
-              <span v-if="pageType === 'detail' && !technologyFile.length">无</span>
+              <span v-if="!technologyFile.length">无</span>
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 9890c0b..644f8af 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -507,6 +507,8 @@
   }
   else if (form.value.belongStandardEquipment === '15') { // 第15套：小功率
     if (!standardRef.value.checkListBeforeSave()) { params = '未通过校验'; return params }
+    console.log('上传参数77777777777777777', standardRef.value.form)
+
     params = {
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index a22c0ea..f31615d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -319,7 +319,7 @@
             v-model="listQuery.conclusion"
             placeholder="检定结论"
             filterable
-            class="full-width-input"
+            style="width: 220px;"
             clearable
           >
             <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
@@ -331,6 +331,7 @@
             class="short-input"
             placeholder="计量标识"
             clearable
+            style="width: 220px;"
           >
             <el-option v-for="item of meterIdentifyDict" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index aadc6e8..d3d98bd 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -75,6 +75,7 @@
   { text: '计量标识', value: 'meterIdentify', align: 'center', width: '120' },
   { text: '检定证书', value: 'fileArr', align: 'center', width: '240', followLink: true },
   { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' },
+
   // { text: '所使用的测量标准及配套设备名称', value: 'equipmentNameStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备型号', value: 'equipmentModelStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备编号', value: 'equipmentManufactureNoStr', align: 'center' },
@@ -100,7 +101,11 @@
 async function getDict() {
   // 设备名称
   getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
+    deviceNameList.value = res.data.map((item: any) => {
+      return {
+        value: item,
+      }
+    })
   })
   // 计量标识
   getDictByCode('eqptMeterIdentify').then((response) => {
@@ -110,7 +115,17 @@
   getModelAllList({}).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = modelList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    helpList.value = helpList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
   })
 
   // 测试、校准或检定地点
@@ -174,7 +189,7 @@
       return {
         ...item,
         measureValidDate: dayjs(item.measureValidDate).format('YYYY-MM-DD'),
-        followLinkArr: item.certificateFile ? [item.certificateFile] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
+        followLinkArr: item.certificateFile ? [item.certificateFile] : item.dataSource === '康斯特自动检定系统' ? [`${item.sampleName}${item.model}${item.manufactureNo}康斯特证书`] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
         labCodeName: item.labCodeName === '西昌' || item.labCodeName === '海口' ? `${item.labCodeName}实验室` : item.labCodeName,
       }
     })
@@ -476,6 +491,27 @@
 }
 
 // ---------------------------------------钩子-------------------------------------------------------
+// 匹配设备名称输入建议
+const querySearchDeviceName = (queryString: string, cb: any) => {
+  const results = queryString ? deviceNameList.value.filter((item: any) => item.value.includes(queryString)) : deviceNameList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配型号规格输入建议
+const querySearchDeviceModel = (queryString: string, cb: any) => {
+  const results = queryString ? modelList.value.filter((item: any) => item.value.includes(queryString)) : modelList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配辅助字段输入建议
+const querySearchHelpInstruction = (queryString: string, cb: any) => {
+  const results = queryString ? helpList.value.filter((item: any) => item.value.includes(queryString)) : helpList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
 watch(timeRange, (val) => { // 监听检定日期变化
   if (val) {
     listQuery.value.traceDateStart = `${val[0]}`
@@ -554,22 +590,37 @@
         <el-input v-model.trim="listQuery.measureAddress" placeholder="检定地点" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.sampleName" filterable class="short-input" placeholder="受检设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.sampleName"
+          :fetch-suggestions="querySearchDeviceName"
+          placeholder="设备名称"
+          clearable
+        />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable class="short-input" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.model"
+          :fetch-suggestions="querySearchDeviceModel"
+          placeholder="规格型号"
+          clearable
+        />
       </search-item>
+
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" class="short-input" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+        <el-autocomplete
+          v-model="listQuery.helpInstruction"
+          :fetch-suggestions="querySearchHelpInstruction"
+          placeholder="辅助字段"
+          clearable
+        />
       </search-item>
       <!-- <search-item>
+        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+      </search-item> -->
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentModelStr" placeholder="标准设备型号" class="short-input" clearable />
       </search-item>
       <search-item>
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0f999ea..23e182b 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -171,6 +171,7 @@
 ])
 const addObj = {
   id: '',
+  equipmentId: '', // equipmentId
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -210,6 +211,8 @@
 // 点击选择
 const chooseList = (row: any, index: number) => {
   selectIndex.value = index
+  console.log('888888888888888选择第几行设备', selectIndex.value);
+
   isMulti.value = false
   selectEquipmentDialogRef.value.initDialog()
 }
@@ -285,10 +288,16 @@
     ElMessage.warning('请先选择文件名称的年份')
     return false
   }
+  console.log('o[po[pki[p]]]', row);
+
+  if (!row.equipmentId) {
+    ElMessage.warning('请先选择设备')
+    return false
+  }
   isShowEquipmentInfo.value = true
   editIndex.value = index
   equipmentInfoForm.value = {
-    equipmentId: row.id, // 设备id
+    equipmentId: row.equipmentId, // 设备id
     equipmentNo: row.equipmentNo, // 统一编号
     equipmentName: row.equipmentName, // 设备名称
     model: row.model, // 规格型号
@@ -317,12 +326,12 @@
   }
   sourceNeedlist.value = row.technicalTargetList || []
   // 这里请求所属标准装置的数据
-  getEquipmentInfo({ id: row.id, type: '1' }).then((res) => {
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+  getEquipmentInfo({ id: row.equipmentId, type: '1' }).then((res) => {
+    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;equipmentId: string }) => {
       return {
         standardName: item.standardName,
         standardNo: item.standardNo,
-        id: item.id,
+        id: item.equipmentId,
       }
     })
     haveStandardInfo.value = meterStandardList.length
@@ -338,7 +347,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: any) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: { id: string }) => item.id === i.id)
+      const index = list.value.findIndex((i: { equipmentId: string }) => item.id === i.equipmentId)
       if (index === -1) {
         list.value.push({
           ...item,
@@ -356,14 +365,21 @@
           supplierId: lastSupplierName.value,
           traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
           traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+          id: '',
+          equipmentId: item.id,
         })
       }
     })
   }
   else { // 单选
-    const index = list.value.findIndex((i: { id: string }) => val[0].id === i.id)
+    console.log('-------------', list.value)
+
+    const index = list.value.findIndex((i: { equipmentId: string }) => val[0].id === i.equipmentId)
+    console.log('[[index]]', index)
+    console.log('编辑第几行设备', selectIndex.value)
+
     if (index === -1) {
-      list.value.splice(list.value[index + 1], 1, {
+      list.value.splice(selectIndex.value, 1, {
         ...val[0],
         planTraceTime: val[0].measureValidDate ? dayjs(val[0].measureValidDate).format('YYYY-MM') : val[0].measureValidDate, // 计划溯源时间
         standardName: val[0].meterStandardName, // 所属测量标准名称
@@ -379,7 +395,10 @@
         supplierId: lastSupplierName.value,
         traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
         traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+        id: '',
+        equipmentId: val[0].id,
       })
+      console.log('-------------', list.value)
     }
     else {
       ElMessage.warning('此设备已添加过')
@@ -401,6 +420,7 @@
       list.value[editIndex.value].traceWayName = traceWayMap[`${equipmentInfoForm.value.traceWay}`]
       list.value[editIndex.value].technicalTargetList = sourceNeedlist.value // 溯源需求
       isShowEquipmentInfo.value = false // 隐藏编辑模块
+      console.log('点击确认编辑', list.value)
     }
   })
 }
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index c70859b..98a95a0 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结论(计量标识字典code)
+  conclusion: '', // 结果确认结论(输入框)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(输入框)
+  meterIdentifyName: '', // 结论
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -131,8 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
-  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -140,7 +140,7 @@
   validDateCorrect: [{ required: true, message: '有效期是否正确不能为空', trigger: ['blur', 'change'] }],
   signComplete: [{ required: true, message: '签名信息是否齐全不能为空', trigger: ['blur', 'change'] }],
   sealComplete: [{ required: true, message: '是否盖有有效印章不能为空', trigger: ['blur', 'change'] }],
-  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
   certificateFile: [{ required: true, message: '检定证书不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -315,16 +315,16 @@
     })
 
     // ------------------处理所属测量标准名称----------------------
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
-      return {
-        standardName: item.standardName,
-        standardNo: item.standardNo,
-        id: item.id,
-      }
-    })
+    // const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+    //   return {
+    //     standardName: item.standardName,
+    //     standardNo: item.standardNo,
+    //     id: item.id,
+    //   }
+    // })
     // form.value.standardId = meterStandardList.map((item: { id: string }) => item.id).join(',')
-    form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
-    form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
+    // form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
+    // form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
   })
 }
 
@@ -1113,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="conclusion">
+            <el-form-item label="结论:" prop="meterIdentify">
               <el-select
-                v-model="form.conclusion"
+                v-model="form.meterIdentify"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1349,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
+            <el-form-item label="结果确认结论:" prop="conclusion">
               <el-input
-                v-model="form.meterIdentifyName"
+                v-model="form.conclusion"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/standard/book/components/config/thirteenth/config.vue b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
index c178dfd..e742373 100644
--- a/src/views/equipement/standard/book/components/config/thirteenth/config.vue
+++ b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
@@ -117,7 +117,7 @@
     case '直流电压(50Ω)':
       checkoutDirectVoltage50ΩList.value = e
       break
-    case '直流电压(1Ω)':
+    case '直流电压(1MΩ)':
       checkoutDirectVoltage1MΩList.value = e
       break
     case '输入阻抗':
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 55435fd..42053f7 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -255,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
+    technologyFile.value = response.data.rows.filter((i: { pdfUrl: string }) => i.pdfUrl).map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -1107,7 +1107,7 @@
               <div v-for="(item, index) in technologyFile" :key="index" style="display: flex;">
                 <show-photo v-if="technologyFile.length" :minio-file-name="item" style="margin-right: 10px;" />
               </div>
-              <span v-if="pageType === 'detail' && !technologyFile.length">无</span>
+              <span v-if="!technologyFile.length">无</span>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index df15760..9fdd004 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -388,7 +388,7 @@
     </detail-block>
   </el-form>
   <!-- 选择要求、委托书及合同评审表组件 -->
-  <select-customer-examine-list ref="selectCustomerExamineListRef" :is-multi="false" @confirm="confirmSelectFile" />
+  <select-customer-examine-list ref="selectCustomerExamineListRef" send-flag="1" :is-multi="false" @confirm="confirmSelectFile" />
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 9890c0b..644f8af 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -507,6 +507,8 @@
   }
   else if (form.value.belongStandardEquipment === '15') { // 第15套：小功率
     if (!standardRef.value.checkListBeforeSave()) { params = '未通过校验'; return params }
+    console.log('上传参数77777777777777777', standardRef.value.form)
+
     params = {
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index a22c0ea..f31615d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -319,7 +319,7 @@
             v-model="listQuery.conclusion"
             placeholder="检定结论"
             filterable
-            class="full-width-input"
+            style="width: 220px;"
             clearable
           >
             <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
@@ -331,6 +331,7 @@
             class="short-input"
             placeholder="计量标识"
             clearable
+            style="width: 220px;"
           >
             <el-option v-for="item of meterIdentifyDict" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index aadc6e8..d3d98bd 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -75,6 +75,7 @@
   { text: '计量标识', value: 'meterIdentify', align: 'center', width: '120' },
   { text: '检定证书', value: 'fileArr', align: 'center', width: '240', followLink: true },
   { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' },
+
   // { text: '所使用的测量标准及配套设备名称', value: 'equipmentNameStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备型号', value: 'equipmentModelStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备编号', value: 'equipmentManufactureNoStr', align: 'center' },
@@ -100,7 +101,11 @@
 async function getDict() {
   // 设备名称
   getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
+    deviceNameList.value = res.data.map((item: any) => {
+      return {
+        value: item,
+      }
+    })
   })
   // 计量标识
   getDictByCode('eqptMeterIdentify').then((response) => {
@@ -110,7 +115,17 @@
   getModelAllList({}).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = modelList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    helpList.value = helpList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
   })
 
   // 测试、校准或检定地点
@@ -174,7 +189,7 @@
       return {
         ...item,
         measureValidDate: dayjs(item.measureValidDate).format('YYYY-MM-DD'),
-        followLinkArr: item.certificateFile ? [item.certificateFile] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
+        followLinkArr: item.certificateFile ? [item.certificateFile] : item.dataSource === '康斯特自动检定系统' ? [`${item.sampleName}${item.model}${item.manufactureNo}康斯特证书`] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
         labCodeName: item.labCodeName === '西昌' || item.labCodeName === '海口' ? `${item.labCodeName}实验室` : item.labCodeName,
       }
     })
@@ -476,6 +491,27 @@
 }
 
 // ---------------------------------------钩子-------------------------------------------------------
+// 匹配设备名称输入建议
+const querySearchDeviceName = (queryString: string, cb: any) => {
+  const results = queryString ? deviceNameList.value.filter((item: any) => item.value.includes(queryString)) : deviceNameList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配型号规格输入建议
+const querySearchDeviceModel = (queryString: string, cb: any) => {
+  const results = queryString ? modelList.value.filter((item: any) => item.value.includes(queryString)) : modelList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配辅助字段输入建议
+const querySearchHelpInstruction = (queryString: string, cb: any) => {
+  const results = queryString ? helpList.value.filter((item: any) => item.value.includes(queryString)) : helpList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
 watch(timeRange, (val) => { // 监听检定日期变化
   if (val) {
     listQuery.value.traceDateStart = `${val[0]}`
@@ -554,22 +590,37 @@
         <el-input v-model.trim="listQuery.measureAddress" placeholder="检定地点" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.sampleName" filterable class="short-input" placeholder="受检设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.sampleName"
+          :fetch-suggestions="querySearchDeviceName"
+          placeholder="设备名称"
+          clearable
+        />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable class="short-input" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.model"
+          :fetch-suggestions="querySearchDeviceModel"
+          placeholder="规格型号"
+          clearable
+        />
       </search-item>
+
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" class="short-input" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+        <el-autocomplete
+          v-model="listQuery.helpInstruction"
+          :fetch-suggestions="querySearchHelpInstruction"
+          placeholder="辅助字段"
+          clearable
+        />
       </search-item>
       <!-- <search-item>
+        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+      </search-item> -->
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentModelStr" placeholder="标准设备型号" class="short-input" clearable />
       </search-item>
       <search-item>
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0f999ea..23e182b 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -171,6 +171,7 @@
 ])
 const addObj = {
   id: '',
+  equipmentId: '', // equipmentId
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -210,6 +211,8 @@
 // 点击选择
 const chooseList = (row: any, index: number) => {
   selectIndex.value = index
+  console.log('888888888888888选择第几行设备', selectIndex.value);
+
   isMulti.value = false
   selectEquipmentDialogRef.value.initDialog()
 }
@@ -285,10 +288,16 @@
     ElMessage.warning('请先选择文件名称的年份')
     return false
   }
+  console.log('o[po[pki[p]]]', row);
+
+  if (!row.equipmentId) {
+    ElMessage.warning('请先选择设备')
+    return false
+  }
   isShowEquipmentInfo.value = true
   editIndex.value = index
   equipmentInfoForm.value = {
-    equipmentId: row.id, // 设备id
+    equipmentId: row.equipmentId, // 设备id
     equipmentNo: row.equipmentNo, // 统一编号
     equipmentName: row.equipmentName, // 设备名称
     model: row.model, // 规格型号
@@ -317,12 +326,12 @@
   }
   sourceNeedlist.value = row.technicalTargetList || []
   // 这里请求所属标准装置的数据
-  getEquipmentInfo({ id: row.id, type: '1' }).then((res) => {
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+  getEquipmentInfo({ id: row.equipmentId, type: '1' }).then((res) => {
+    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;equipmentId: string }) => {
       return {
         standardName: item.standardName,
         standardNo: item.standardNo,
-        id: item.id,
+        id: item.equipmentId,
       }
     })
     haveStandardInfo.value = meterStandardList.length
@@ -338,7 +347,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: any) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: { id: string }) => item.id === i.id)
+      const index = list.value.findIndex((i: { equipmentId: string }) => item.id === i.equipmentId)
       if (index === -1) {
         list.value.push({
           ...item,
@@ -356,14 +365,21 @@
           supplierId: lastSupplierName.value,
           traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
           traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+          id: '',
+          equipmentId: item.id,
         })
       }
     })
   }
   else { // 单选
-    const index = list.value.findIndex((i: { id: string }) => val[0].id === i.id)
+    console.log('-------------', list.value)
+
+    const index = list.value.findIndex((i: { equipmentId: string }) => val[0].id === i.equipmentId)
+    console.log('[[index]]', index)
+    console.log('编辑第几行设备', selectIndex.value)
+
     if (index === -1) {
-      list.value.splice(list.value[index + 1], 1, {
+      list.value.splice(selectIndex.value, 1, {
         ...val[0],
         planTraceTime: val[0].measureValidDate ? dayjs(val[0].measureValidDate).format('YYYY-MM') : val[0].measureValidDate, // 计划溯源时间
         standardName: val[0].meterStandardName, // 所属测量标准名称
@@ -379,7 +395,10 @@
         supplierId: lastSupplierName.value,
         traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
         traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+        id: '',
+        equipmentId: val[0].id,
       })
+      console.log('-------------', list.value)
     }
     else {
       ElMessage.warning('此设备已添加过')
@@ -401,6 +420,7 @@
       list.value[editIndex.value].traceWayName = traceWayMap[`${equipmentInfoForm.value.traceWay}`]
       list.value[editIndex.value].technicalTargetList = sourceNeedlist.value // 溯源需求
       isShowEquipmentInfo.value = false // 隐藏编辑模块
+      console.log('点击确认编辑', list.value)
     }
   })
 }
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index c70859b..98a95a0 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结论(计量标识字典code)
+  conclusion: '', // 结果确认结论(输入框)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(输入框)
+  meterIdentifyName: '', // 结论
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -131,8 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
-  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -140,7 +140,7 @@
   validDateCorrect: [{ required: true, message: '有效期是否正确不能为空', trigger: ['blur', 'change'] }],
   signComplete: [{ required: true, message: '签名信息是否齐全不能为空', trigger: ['blur', 'change'] }],
   sealComplete: [{ required: true, message: '是否盖有有效印章不能为空', trigger: ['blur', 'change'] }],
-  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
   certificateFile: [{ required: true, message: '检定证书不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -315,16 +315,16 @@
     })
 
     // ------------------处理所属测量标准名称----------------------
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
-      return {
-        standardName: item.standardName,
-        standardNo: item.standardNo,
-        id: item.id,
-      }
-    })
+    // const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+    //   return {
+    //     standardName: item.standardName,
+    //     standardNo: item.standardNo,
+    //     id: item.id,
+    //   }
+    // })
     // form.value.standardId = meterStandardList.map((item: { id: string }) => item.id).join(',')
-    form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
-    form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
+    // form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
+    // form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
   })
 }
 
@@ -1113,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="conclusion">
+            <el-form-item label="结论:" prop="meterIdentify">
               <el-select
-                v-model="form.conclusion"
+                v-model="form.meterIdentify"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1349,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
+            <el-form-item label="结果确认结论:" prop="conclusion">
               <el-input
-                v-model="form.meterIdentifyName"
+                v-model="form.conclusion"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/standard/book/components/config/thirteenth/config.vue b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
index c178dfd..e742373 100644
--- a/src/views/equipement/standard/book/components/config/thirteenth/config.vue
+++ b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
@@ -117,7 +117,7 @@
     case '直流电压(50Ω)':
       checkoutDirectVoltage50ΩList.value = e
       break
-    case '直流电压(1Ω)':
+    case '直流电压(1MΩ)':
       checkoutDirectVoltage1MΩList.value = e
       break
     case '输入阻抗':
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 55435fd..42053f7 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -255,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
+    technologyFile.value = response.data.rows.filter((i: { pdfUrl: string }) => i.pdfUrl).map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -1107,7 +1107,7 @@
               <div v-for="(item, index) in technologyFile" :key="index" style="display: flex;">
                 <show-photo v-if="technologyFile.length" :minio-file-name="item" style="margin-right: 10px;" />
               </div>
-              <span v-if="pageType === 'detail' && !technologyFile.length">无</span>
+              <span v-if="!technologyFile.length">无</span>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index df15760..9fdd004 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -388,7 +388,7 @@
     </detail-block>
   </el-form>
   <!-- 选择要求、委托书及合同评审表组件 -->
-  <select-customer-examine-list ref="selectCustomerExamineListRef" :is-multi="false" @confirm="confirmSelectFile" />
+  <select-customer-examine-list ref="selectCustomerExamineListRef" send-flag="1" :is-multi="false" @confirm="confirmSelectFile" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 89acb2f..99b9472 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -5,8 +5,9 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import { getBase64 } from '@/utils/download'
-import { getStream } from '@/api/resource/examine'
-import { getPdfStream } from '@/api/file'
+import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+import { getStream, sendTo } from '@/api/resource/examine'
+
 const infoId = ref('') // id
 const $route = useRoute()
 const $router = useRouter()
@@ -50,8 +51,8 @@
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
-  });
-  ($route.query.examineFormFile ? getPdfStream($route.query.examineFormFile as string) : getStream({ id: infoId.value, pdf: true })).then((res) => {
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
     pdfStream.value = new Blob([res.data])
     getBase64(res.data).then((res) => {
       pdfUrl.value = res as string
@@ -101,7 +102,6 @@
           发送给委托方
         </el-button>
         <el-button type="primary" @click="exportWord">
-          <!-- <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord"> -->
           导出word
         </el-button>
         <el-button type="primary" @click="exportPdf">

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 9890c0b..644f8af 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -507,6 +507,8 @@
   }
   else if (form.value.belongStandardEquipment === '15') { // 第15套：小功率
     if (!standardRef.value.checkListBeforeSave()) { params = '未通过校验'; return params }
+    console.log('上传参数77777777777777777', standardRef.value.form)
+
     params = {
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index a22c0ea..f31615d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -319,7 +319,7 @@
             v-model="listQuery.conclusion"
             placeholder="检定结论"
             filterable
-            class="full-width-input"
+            style="width: 220px;"
             clearable
           >
             <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
@@ -331,6 +331,7 @@
             class="short-input"
             placeholder="计量标识"
             clearable
+            style="width: 220px;"
           >
             <el-option v-for="item of meterIdentifyDict" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index aadc6e8..d3d98bd 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -75,6 +75,7 @@
   { text: '计量标识', value: 'meterIdentify', align: 'center', width: '120' },
   { text: '检定证书', value: 'fileArr', align: 'center', width: '240', followLink: true },
   { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' },
+
   // { text: '所使用的测量标准及配套设备名称', value: 'equipmentNameStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备型号', value: 'equipmentModelStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备编号', value: 'equipmentManufactureNoStr', align: 'center' },
@@ -100,7 +101,11 @@
 async function getDict() {
   // 设备名称
   getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
+    deviceNameList.value = res.data.map((item: any) => {
+      return {
+        value: item,
+      }
+    })
   })
   // 计量标识
   getDictByCode('eqptMeterIdentify').then((response) => {
@@ -110,7 +115,17 @@
   getModelAllList({}).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = modelList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    helpList.value = helpList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
   })
 
   // 测试、校准或检定地点
@@ -174,7 +189,7 @@
       return {
         ...item,
         measureValidDate: dayjs(item.measureValidDate).format('YYYY-MM-DD'),
-        followLinkArr: item.certificateFile ? [item.certificateFile] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
+        followLinkArr: item.certificateFile ? [item.certificateFile] : item.dataSource === '康斯特自动检定系统' ? [`${item.sampleName}${item.model}${item.manufactureNo}康斯特证书`] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
         labCodeName: item.labCodeName === '西昌' || item.labCodeName === '海口' ? `${item.labCodeName}实验室` : item.labCodeName,
       }
     })
@@ -476,6 +491,27 @@
 }
 
 // ---------------------------------------钩子-------------------------------------------------------
+// 匹配设备名称输入建议
+const querySearchDeviceName = (queryString: string, cb: any) => {
+  const results = queryString ? deviceNameList.value.filter((item: any) => item.value.includes(queryString)) : deviceNameList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配型号规格输入建议
+const querySearchDeviceModel = (queryString: string, cb: any) => {
+  const results = queryString ? modelList.value.filter((item: any) => item.value.includes(queryString)) : modelList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配辅助字段输入建议
+const querySearchHelpInstruction = (queryString: string, cb: any) => {
+  const results = queryString ? helpList.value.filter((item: any) => item.value.includes(queryString)) : helpList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
 watch(timeRange, (val) => { // 监听检定日期变化
   if (val) {
     listQuery.value.traceDateStart = `${val[0]}`
@@ -554,22 +590,37 @@
         <el-input v-model.trim="listQuery.measureAddress" placeholder="检定地点" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.sampleName" filterable class="short-input" placeholder="受检设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.sampleName"
+          :fetch-suggestions="querySearchDeviceName"
+          placeholder="设备名称"
+          clearable
+        />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable class="short-input" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.model"
+          :fetch-suggestions="querySearchDeviceModel"
+          placeholder="规格型号"
+          clearable
+        />
       </search-item>
+
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" class="short-input" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+        <el-autocomplete
+          v-model="listQuery.helpInstruction"
+          :fetch-suggestions="querySearchHelpInstruction"
+          placeholder="辅助字段"
+          clearable
+        />
       </search-item>
       <!-- <search-item>
+        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+      </search-item> -->
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentModelStr" placeholder="标准设备型号" class="short-input" clearable />
       </search-item>
       <search-item>
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0f999ea..23e182b 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -171,6 +171,7 @@
 ])
 const addObj = {
   id: '',
+  equipmentId: '', // equipmentId
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -210,6 +211,8 @@
 // 点击选择
 const chooseList = (row: any, index: number) => {
   selectIndex.value = index
+  console.log('888888888888888选择第几行设备', selectIndex.value);
+
   isMulti.value = false
   selectEquipmentDialogRef.value.initDialog()
 }
@@ -285,10 +288,16 @@
     ElMessage.warning('请先选择文件名称的年份')
     return false
   }
+  console.log('o[po[pki[p]]]', row);
+
+  if (!row.equipmentId) {
+    ElMessage.warning('请先选择设备')
+    return false
+  }
   isShowEquipmentInfo.value = true
   editIndex.value = index
   equipmentInfoForm.value = {
-    equipmentId: row.id, // 设备id
+    equipmentId: row.equipmentId, // 设备id
     equipmentNo: row.equipmentNo, // 统一编号
     equipmentName: row.equipmentName, // 设备名称
     model: row.model, // 规格型号
@@ -317,12 +326,12 @@
   }
   sourceNeedlist.value = row.technicalTargetList || []
   // 这里请求所属标准装置的数据
-  getEquipmentInfo({ id: row.id, type: '1' }).then((res) => {
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+  getEquipmentInfo({ id: row.equipmentId, type: '1' }).then((res) => {
+    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;equipmentId: string }) => {
       return {
         standardName: item.standardName,
         standardNo: item.standardNo,
-        id: item.id,
+        id: item.equipmentId,
       }
     })
     haveStandardInfo.value = meterStandardList.length
@@ -338,7 +347,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: any) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: { id: string }) => item.id === i.id)
+      const index = list.value.findIndex((i: { equipmentId: string }) => item.id === i.equipmentId)
       if (index === -1) {
         list.value.push({
           ...item,
@@ -356,14 +365,21 @@
           supplierId: lastSupplierName.value,
           traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
           traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+          id: '',
+          equipmentId: item.id,
         })
       }
     })
   }
   else { // 单选
-    const index = list.value.findIndex((i: { id: string }) => val[0].id === i.id)
+    console.log('-------------', list.value)
+
+    const index = list.value.findIndex((i: { equipmentId: string }) => val[0].id === i.equipmentId)
+    console.log('[[index]]', index)
+    console.log('编辑第几行设备', selectIndex.value)
+
     if (index === -1) {
-      list.value.splice(list.value[index + 1], 1, {
+      list.value.splice(selectIndex.value, 1, {
         ...val[0],
         planTraceTime: val[0].measureValidDate ? dayjs(val[0].measureValidDate).format('YYYY-MM') : val[0].measureValidDate, // 计划溯源时间
         standardName: val[0].meterStandardName, // 所属测量标准名称
@@ -379,7 +395,10 @@
         supplierId: lastSupplierName.value,
         traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
         traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+        id: '',
+        equipmentId: val[0].id,
       })
+      console.log('-------------', list.value)
     }
     else {
       ElMessage.warning('此设备已添加过')
@@ -401,6 +420,7 @@
       list.value[editIndex.value].traceWayName = traceWayMap[`${equipmentInfoForm.value.traceWay}`]
       list.value[editIndex.value].technicalTargetList = sourceNeedlist.value // 溯源需求
       isShowEquipmentInfo.value = false // 隐藏编辑模块
+      console.log('点击确认编辑', list.value)
     }
   })
 }
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index c70859b..98a95a0 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结论(计量标识字典code)
+  conclusion: '', // 结果确认结论(输入框)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(输入框)
+  meterIdentifyName: '', // 结论
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -131,8 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
-  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -140,7 +140,7 @@
   validDateCorrect: [{ required: true, message: '有效期是否正确不能为空', trigger: ['blur', 'change'] }],
   signComplete: [{ required: true, message: '签名信息是否齐全不能为空', trigger: ['blur', 'change'] }],
   sealComplete: [{ required: true, message: '是否盖有有效印章不能为空', trigger: ['blur', 'change'] }],
-  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
   certificateFile: [{ required: true, message: '检定证书不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -315,16 +315,16 @@
     })
 
     // ------------------处理所属测量标准名称----------------------
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
-      return {
-        standardName: item.standardName,
-        standardNo: item.standardNo,
-        id: item.id,
-      }
-    })
+    // const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+    //   return {
+    //     standardName: item.standardName,
+    //     standardNo: item.standardNo,
+    //     id: item.id,
+    //   }
+    // })
     // form.value.standardId = meterStandardList.map((item: { id: string }) => item.id).join(',')
-    form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
-    form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
+    // form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
+    // form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
   })
 }
 
@@ -1113,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="conclusion">
+            <el-form-item label="结论:" prop="meterIdentify">
               <el-select
-                v-model="form.conclusion"
+                v-model="form.meterIdentify"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1349,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
+            <el-form-item label="结果确认结论:" prop="conclusion">
               <el-input
-                v-model="form.meterIdentifyName"
+                v-model="form.conclusion"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/standard/book/components/config/thirteenth/config.vue b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
index c178dfd..e742373 100644
--- a/src/views/equipement/standard/book/components/config/thirteenth/config.vue
+++ b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
@@ -117,7 +117,7 @@
     case '直流电压(50Ω)':
       checkoutDirectVoltage50ΩList.value = e
       break
-    case '直流电压(1Ω)':
+    case '直流电压(1MΩ)':
       checkoutDirectVoltage1MΩList.value = e
       break
     case '输入阻抗':
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 55435fd..42053f7 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -255,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
+    technologyFile.value = response.data.rows.filter((i: { pdfUrl: string }) => i.pdfUrl).map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -1107,7 +1107,7 @@
               <div v-for="(item, index) in technologyFile" :key="index" style="display: flex;">
                 <show-photo v-if="technologyFile.length" :minio-file-name="item" style="margin-right: 10px;" />
               </div>
-              <span v-if="pageType === 'detail' && !technologyFile.length">无</span>
+              <span v-if="!technologyFile.length">无</span>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index df15760..9fdd004 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -388,7 +388,7 @@
     </detail-block>
   </el-form>
   <!-- 选择要求、委托书及合同评审表组件 -->
-  <select-customer-examine-list ref="selectCustomerExamineListRef" :is-multi="false" @confirm="confirmSelectFile" />
+  <select-customer-examine-list ref="selectCustomerExamineListRef" send-flag="1" :is-multi="false" @confirm="confirmSelectFile" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 89acb2f..99b9472 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -5,8 +5,9 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import { getBase64 } from '@/utils/download'
-import { getStream } from '@/api/resource/examine'
-import { getPdfStream } from '@/api/file'
+import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+import { getStream, sendTo } from '@/api/resource/examine'
+
 const infoId = ref('') // id
 const $route = useRoute()
 const $router = useRouter()
@@ -50,8 +51,8 @@
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
-  });
-  ($route.query.examineFormFile ? getPdfStream($route.query.examineFormFile as string) : getStream({ id: infoId.value, pdf: true })).then((res) => {
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
     pdfStream.value = new Blob([res.data])
     getBase64(res.data).then((res) => {
       pdfUrl.value = res as string
@@ -101,7 +102,6 @@
           发送给委托方
         </el-button>
         <el-button type="primary" @click="exportWord">
-          <!-- <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord"> -->
           导出word
         </el-button>
         <el-button type="primary" @click="exportPdf">
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 8dcf9e3..035a858 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -91,18 +91,18 @@
   createUserName: '',
   createTime: '',
 })
-const measureMethodTypeArray = ref<Array<string>>([])
+// const measureMethodTypeArray = ref<Array<string>>([])
 
 // 校验方法
-const methodTypeValidator = (rule: any, value: string, callback: any) => {
-  if (measureMethodTypeArray.value.length === 0) {
-    return callback(new Error('测试、校准或检定方法类型不能为空，请勾选'))
-  }
-  else {
-    examineInfo.value.measureMethodType = measureMethodTypeArray.value.join(',')
-    callback()
-  }
-}
+// const methodTypeValidator = (rule: any, value: string, callback: any) => {
+//   if (measureMethodTypeArray.value.length === 0) {
+//     return callback(new Error('测试、校准或检定方法类型不能为空，请勾选'))
+//   }
+//   else {
+//     examineInfo.value.measureMethodType = measureMethodTypeArray.value.join(',')
+//     callback()
+//   }
+// }
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
@@ -116,7 +116,8 @@
   numberOfPeople: [{ required: true, message: '检定人员人数不能为空', trigger: 'blur' }],
   staffCert: [{ required: true, message: '人员持证情况不能为空', trigger: 'blur' }],
   measureMethodName: [{ required: true, message: '方法名称不能为空', trigger: 'blur' }],
-  measureMethodType: [{ required: true, trigger: ['change', 'blur'], validator: methodTypeValidator }],
+  measureMethodType: [{ required: true, message: '测试、校准或检定方法类型不能为空', trigger: 'blur' }],
+  // measureMethodType: [{ required: true, trigger: ['change', 'blur'], validator: methodTypeValidator }],
   measureMethodControlled: [{ required: true, message: '方法是否受控不能为空', trigger: ['change', 'blur'] }],
   measureMethodConfirm: [{ required: true, message: '方法是否确认不能为空', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
@@ -408,7 +409,7 @@
   }
   if (row.measureMethodType !== undefined && row.measureMethodType !== null && row.measureMethodType !== '') {
     examineInfo.value.measureMethodType = row.measureMethodType
-    measureMethodTypeArray.value = row.measureMethodType.split(',')
+    // measureMethodTypeArray.value = row.measureMethodType.split(',')
     examineMethodForm.value.validateField('measureMethodType')
   }
   if (row.measureMethodControlled !== undefined && row.measureMethodControlled !== null && `${row.measureMethodControlled}` !== '') {
@@ -593,7 +594,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
-    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
+    // measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -923,11 +924,16 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
+                  <!-- <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
-                  </el-checkbox-group>
+                  </el-checkbox-group> -->
+                  <el-radio-group v-model="examineInfo.measureMethodType" style="margin-bottom: 20px;">
+                    <el-radio v-for="item in methodTypeDict" :key="item.id" :label="item.value">
+                      {{ item.name }}
+                    </el-radio>
+                  </el-radio-group>
                   <el-input v-model="examineInfo.measureMethodType" type="hidden" />
                   <el-input v-model="examineInfo.measureMethodTypeName" type="hidden" />
                 </el-form-item>

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 9890c0b..644f8af 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -507,6 +507,8 @@
   }
   else if (form.value.belongStandardEquipment === '15') { // 第15套：小功率
     if (!standardRef.value.checkListBeforeSave()) { params = '未通过校验'; return params }
+    console.log('上传参数77777777777777777', standardRef.value.form)
+
     params = {
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index a22c0ea..f31615d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -319,7 +319,7 @@
             v-model="listQuery.conclusion"
             placeholder="检定结论"
             filterable
-            class="full-width-input"
+            style="width: 220px;"
             clearable
           >
             <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
@@ -331,6 +331,7 @@
             class="short-input"
             placeholder="计量标识"
             clearable
+            style="width: 220px;"
           >
             <el-option v-for="item of meterIdentifyDict" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index aadc6e8..d3d98bd 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -75,6 +75,7 @@
   { text: '计量标识', value: 'meterIdentify', align: 'center', width: '120' },
   { text: '检定证书', value: 'fileArr', align: 'center', width: '240', followLink: true },
   { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' },
+
   // { text: '所使用的测量标准及配套设备名称', value: 'equipmentNameStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备型号', value: 'equipmentModelStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备编号', value: 'equipmentManufactureNoStr', align: 'center' },
@@ -100,7 +101,11 @@
 async function getDict() {
   // 设备名称
   getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
+    deviceNameList.value = res.data.map((item: any) => {
+      return {
+        value: item,
+      }
+    })
   })
   // 计量标识
   getDictByCode('eqptMeterIdentify').then((response) => {
@@ -110,7 +115,17 @@
   getModelAllList({}).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = modelList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    helpList.value = helpList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
   })
 
   // 测试、校准或检定地点
@@ -174,7 +189,7 @@
       return {
         ...item,
         measureValidDate: dayjs(item.measureValidDate).format('YYYY-MM-DD'),
-        followLinkArr: item.certificateFile ? [item.certificateFile] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
+        followLinkArr: item.certificateFile ? [item.certificateFile] : item.dataSource === '康斯特自动检定系统' ? [`${item.sampleName}${item.model}${item.manufactureNo}康斯特证书`] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
         labCodeName: item.labCodeName === '西昌' || item.labCodeName === '海口' ? `${item.labCodeName}实验室` : item.labCodeName,
       }
     })
@@ -476,6 +491,27 @@
 }
 
 // ---------------------------------------钩子-------------------------------------------------------
+// 匹配设备名称输入建议
+const querySearchDeviceName = (queryString: string, cb: any) => {
+  const results = queryString ? deviceNameList.value.filter((item: any) => item.value.includes(queryString)) : deviceNameList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配型号规格输入建议
+const querySearchDeviceModel = (queryString: string, cb: any) => {
+  const results = queryString ? modelList.value.filter((item: any) => item.value.includes(queryString)) : modelList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配辅助字段输入建议
+const querySearchHelpInstruction = (queryString: string, cb: any) => {
+  const results = queryString ? helpList.value.filter((item: any) => item.value.includes(queryString)) : helpList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
 watch(timeRange, (val) => { // 监听检定日期变化
   if (val) {
     listQuery.value.traceDateStart = `${val[0]}`
@@ -554,22 +590,37 @@
         <el-input v-model.trim="listQuery.measureAddress" placeholder="检定地点" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.sampleName" filterable class="short-input" placeholder="受检设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.sampleName"
+          :fetch-suggestions="querySearchDeviceName"
+          placeholder="设备名称"
+          clearable
+        />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable class="short-input" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.model"
+          :fetch-suggestions="querySearchDeviceModel"
+          placeholder="规格型号"
+          clearable
+        />
       </search-item>
+
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" class="short-input" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+        <el-autocomplete
+          v-model="listQuery.helpInstruction"
+          :fetch-suggestions="querySearchHelpInstruction"
+          placeholder="辅助字段"
+          clearable
+        />
       </search-item>
       <!-- <search-item>
+        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+      </search-item> -->
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentModelStr" placeholder="标准设备型号" class="short-input" clearable />
       </search-item>
       <search-item>
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0f999ea..23e182b 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -171,6 +171,7 @@
 ])
 const addObj = {
   id: '',
+  equipmentId: '', // equipmentId
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -210,6 +211,8 @@
 // 点击选择
 const chooseList = (row: any, index: number) => {
   selectIndex.value = index
+  console.log('888888888888888选择第几行设备', selectIndex.value);
+
   isMulti.value = false
   selectEquipmentDialogRef.value.initDialog()
 }
@@ -285,10 +288,16 @@
     ElMessage.warning('请先选择文件名称的年份')
     return false
   }
+  console.log('o[po[pki[p]]]', row);
+
+  if (!row.equipmentId) {
+    ElMessage.warning('请先选择设备')
+    return false
+  }
   isShowEquipmentInfo.value = true
   editIndex.value = index
   equipmentInfoForm.value = {
-    equipmentId: row.id, // 设备id
+    equipmentId: row.equipmentId, // 设备id
     equipmentNo: row.equipmentNo, // 统一编号
     equipmentName: row.equipmentName, // 设备名称
     model: row.model, // 规格型号
@@ -317,12 +326,12 @@
   }
   sourceNeedlist.value = row.technicalTargetList || []
   // 这里请求所属标准装置的数据
-  getEquipmentInfo({ id: row.id, type: '1' }).then((res) => {
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+  getEquipmentInfo({ id: row.equipmentId, type: '1' }).then((res) => {
+    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;equipmentId: string }) => {
       return {
         standardName: item.standardName,
         standardNo: item.standardNo,
-        id: item.id,
+        id: item.equipmentId,
       }
     })
     haveStandardInfo.value = meterStandardList.length
@@ -338,7 +347,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: any) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: { id: string }) => item.id === i.id)
+      const index = list.value.findIndex((i: { equipmentId: string }) => item.id === i.equipmentId)
       if (index === -1) {
         list.value.push({
           ...item,
@@ -356,14 +365,21 @@
           supplierId: lastSupplierName.value,
           traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
           traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+          id: '',
+          equipmentId: item.id,
         })
       }
     })
   }
   else { // 单选
-    const index = list.value.findIndex((i: { id: string }) => val[0].id === i.id)
+    console.log('-------------', list.value)
+
+    const index = list.value.findIndex((i: { equipmentId: string }) => val[0].id === i.equipmentId)
+    console.log('[[index]]', index)
+    console.log('编辑第几行设备', selectIndex.value)
+
     if (index === -1) {
-      list.value.splice(list.value[index + 1], 1, {
+      list.value.splice(selectIndex.value, 1, {
         ...val[0],
         planTraceTime: val[0].measureValidDate ? dayjs(val[0].measureValidDate).format('YYYY-MM') : val[0].measureValidDate, // 计划溯源时间
         standardName: val[0].meterStandardName, // 所属测量标准名称
@@ -379,7 +395,10 @@
         supplierId: lastSupplierName.value,
         traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
         traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+        id: '',
+        equipmentId: val[0].id,
       })
+      console.log('-------------', list.value)
     }
     else {
       ElMessage.warning('此设备已添加过')
@@ -401,6 +420,7 @@
       list.value[editIndex.value].traceWayName = traceWayMap[`${equipmentInfoForm.value.traceWay}`]
       list.value[editIndex.value].technicalTargetList = sourceNeedlist.value // 溯源需求
       isShowEquipmentInfo.value = false // 隐藏编辑模块
+      console.log('点击确认编辑', list.value)
     }
   })
 }
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index c70859b..98a95a0 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结论(计量标识字典code)
+  conclusion: '', // 结果确认结论(输入框)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(输入框)
+  meterIdentifyName: '', // 结论
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -131,8 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
-  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -140,7 +140,7 @@
   validDateCorrect: [{ required: true, message: '有效期是否正确不能为空', trigger: ['blur', 'change'] }],
   signComplete: [{ required: true, message: '签名信息是否齐全不能为空', trigger: ['blur', 'change'] }],
   sealComplete: [{ required: true, message: '是否盖有有效印章不能为空', trigger: ['blur', 'change'] }],
-  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
   certificateFile: [{ required: true, message: '检定证书不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -315,16 +315,16 @@
     })
 
     // ------------------处理所属测量标准名称----------------------
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
-      return {
-        standardName: item.standardName,
-        standardNo: item.standardNo,
-        id: item.id,
-      }
-    })
+    // const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+    //   return {
+    //     standardName: item.standardName,
+    //     standardNo: item.standardNo,
+    //     id: item.id,
+    //   }
+    // })
     // form.value.standardId = meterStandardList.map((item: { id: string }) => item.id).join(',')
-    form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
-    form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
+    // form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
+    // form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
   })
 }
 
@@ -1113,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="conclusion">
+            <el-form-item label="结论:" prop="meterIdentify">
               <el-select
-                v-model="form.conclusion"
+                v-model="form.meterIdentify"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1349,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
+            <el-form-item label="结果确认结论:" prop="conclusion">
               <el-input
-                v-model="form.meterIdentifyName"
+                v-model="form.conclusion"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/standard/book/components/config/thirteenth/config.vue b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
index c178dfd..e742373 100644
--- a/src/views/equipement/standard/book/components/config/thirteenth/config.vue
+++ b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
@@ -117,7 +117,7 @@
     case '直流电压(50Ω)':
       checkoutDirectVoltage50ΩList.value = e
       break
-    case '直流电压(1Ω)':
+    case '直流电压(1MΩ)':
       checkoutDirectVoltage1MΩList.value = e
       break
     case '输入阻抗':
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 55435fd..42053f7 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -255,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
+    technologyFile.value = response.data.rows.filter((i: { pdfUrl: string }) => i.pdfUrl).map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -1107,7 +1107,7 @@
               <div v-for="(item, index) in technologyFile" :key="index" style="display: flex;">
                 <show-photo v-if="technologyFile.length" :minio-file-name="item" style="margin-right: 10px;" />
               </div>
-              <span v-if="pageType === 'detail' && !technologyFile.length">无</span>
+              <span v-if="!technologyFile.length">无</span>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index df15760..9fdd004 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -388,7 +388,7 @@
     </detail-block>
   </el-form>
   <!-- 选择要求、委托书及合同评审表组件 -->
-  <select-customer-examine-list ref="selectCustomerExamineListRef" :is-multi="false" @confirm="confirmSelectFile" />
+  <select-customer-examine-list ref="selectCustomerExamineListRef" send-flag="1" :is-multi="false" @confirm="confirmSelectFile" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 89acb2f..99b9472 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -5,8 +5,9 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import { getBase64 } from '@/utils/download'
-import { getStream } from '@/api/resource/examine'
-import { getPdfStream } from '@/api/file'
+import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+import { getStream, sendTo } from '@/api/resource/examine'
+
 const infoId = ref('') // id
 const $route = useRoute()
 const $router = useRouter()
@@ -50,8 +51,8 @@
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
-  });
-  ($route.query.examineFormFile ? getPdfStream($route.query.examineFormFile as string) : getStream({ id: infoId.value, pdf: true })).then((res) => {
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
     pdfStream.value = new Blob([res.data])
     getBase64(res.data).then((res) => {
       pdfUrl.value = res as string
@@ -101,7 +102,6 @@
           发送给委托方
         </el-button>
         <el-button type="primary" @click="exportWord">
-          <!-- <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord"> -->
           导出word
         </el-button>
         <el-button type="primary" @click="exportPdf">
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 8dcf9e3..035a858 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -91,18 +91,18 @@
   createUserName: '',
   createTime: '',
 })
-const measureMethodTypeArray = ref<Array<string>>([])
+// const measureMethodTypeArray = ref<Array<string>>([])
 
 // 校验方法
-const methodTypeValidator = (rule: any, value: string, callback: any) => {
-  if (measureMethodTypeArray.value.length === 0) {
-    return callback(new Error('测试、校准或检定方法类型不能为空，请勾选'))
-  }
-  else {
-    examineInfo.value.measureMethodType = measureMethodTypeArray.value.join(',')
-    callback()
-  }
-}
+// const methodTypeValidator = (rule: any, value: string, callback: any) => {
+//   if (measureMethodTypeArray.value.length === 0) {
+//     return callback(new Error('测试、校准或检定方法类型不能为空，请勾选'))
+//   }
+//   else {
+//     examineInfo.value.measureMethodType = measureMethodTypeArray.value.join(',')
+//     callback()
+//   }
+// }
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
@@ -116,7 +116,8 @@
   numberOfPeople: [{ required: true, message: '检定人员人数不能为空', trigger: 'blur' }],
   staffCert: [{ required: true, message: '人员持证情况不能为空', trigger: 'blur' }],
   measureMethodName: [{ required: true, message: '方法名称不能为空', trigger: 'blur' }],
-  measureMethodType: [{ required: true, trigger: ['change', 'blur'], validator: methodTypeValidator }],
+  measureMethodType: [{ required: true, message: '测试、校准或检定方法类型不能为空', trigger: 'blur' }],
+  // measureMethodType: [{ required: true, trigger: ['change', 'blur'], validator: methodTypeValidator }],
   measureMethodControlled: [{ required: true, message: '方法是否受控不能为空', trigger: ['change', 'blur'] }],
   measureMethodConfirm: [{ required: true, message: '方法是否确认不能为空', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
@@ -408,7 +409,7 @@
   }
   if (row.measureMethodType !== undefined && row.measureMethodType !== null && row.measureMethodType !== '') {
     examineInfo.value.measureMethodType = row.measureMethodType
-    measureMethodTypeArray.value = row.measureMethodType.split(',')
+    // measureMethodTypeArray.value = row.measureMethodType.split(',')
     examineMethodForm.value.validateField('measureMethodType')
   }
   if (row.measureMethodControlled !== undefined && row.measureMethodControlled !== null && `${row.measureMethodControlled}` !== '') {
@@ -593,7 +594,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
-    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
+    // measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -923,11 +924,16 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
+                  <!-- <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
-                  </el-checkbox-group>
+                  </el-checkbox-group> -->
+                  <el-radio-group v-model="examineInfo.measureMethodType" style="margin-bottom: 20px;">
+                    <el-radio v-for="item in methodTypeDict" :key="item.id" :label="item.value">
+                      {{ item.name }}
+                    </el-radio>
+                  </el-radio-group>
                   <el-input v-model="examineInfo.measureMethodType" type="hidden" />
                   <el-input v-model="examineInfo.measureMethodTypeName" type="hidden" />
                 </el-form-item>
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerExamineList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerExamineList.vue
index ec03ff7..6765a23 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerExamineList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerExamineList.vue
@@ -16,6 +16,9 @@
     type: Boolean,
     default: true,
   },
+  sendFlag: {
+    type: String,
+  },
 })
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制对话框显隐
@@ -29,6 +32,7 @@
   createTimeStart: '', // 创建时间-起始
   createTimeEnd: '', // 创建时间-结束
   approvalStatus: '0', // 审批状态
+  sendFlag: props.sendFlag,
   formId: SCHEDULE.CONTRACT_REVIEW_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
   offset: 1,
   limit: 20,
@@ -96,6 +100,7 @@
     createTimeStart: '', // 创建时间-起始
     createTimeEnd: '', // 创建时间-结束
     approvalStatus: '0', // 审批状态
+    sendFlag: props.sendFlag,
     formId: SCHEDULE.CONTRACT_REVIEW_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
     offset: 1,
     limit: 20,

diff --git a/src/components/buttonBox/useBridgeCount.ts b/src/components/buttonBox/useBridgeCount.ts
index 21bab47..a6e2e98 100644
--- a/src/components/buttonBox/useBridgeCount.ts
+++ b/src/components/buttonBox/useBridgeCount.ts
@@ -8,7 +8,7 @@
 import { getCheckRecordList } from '@/api/equipment/standard/checkRecords'
 import { getBuildList } from '@/api/equipment/standard/build'
 import { getSourcePlanList } from '@/api/equipment/source/plan'
-import { getResultToConfirmList } from '@/api/equipment/source/resultConfirm'
+import { getResultConfirmList } from '@/api/equipment/source/resultConfirm'
 import { getResultCompleteList } from '@/api/equipment/source/resultComplete'
 import { getChangeList } from '@/api/equipment/source/change'
 import { getStateMaintenanceList as getStandardStateMaintenanceList } from '@/api/equipment/standardStateMaintenance/stateMaintenance'
@@ -79,7 +79,7 @@
   sbyzzfcsq: getStandardStateMaintenanceList, // 复查申请
   sbyzzcxsq: getStandardStateMaintenanceList, // 撤销申请
   sbyzzsyjhgl: getSourcePlanList, // 溯源计划管理
-  sbyzzsyjgqr: getResultToConfirmList, // 溯源结果确认
+  sbyzzsyjgqr: getResultConfirmList, // 溯源结果确认
   sbyzzsyjgwcqk: getResultCompleteList, // 溯源结果完成情况
   sbyzzsybggl: getChangeList, // 溯源变更管理
   sbyzzkxysgl: getResumeUnpackList, // 开箱验收管理
diff --git a/src/views/business/measure/item/components/fifteenth/templateDetail.vue b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
index 0df7893..95dfbc1 100644
--- a/src/views/business/measure/item/components/fifteenth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fifteenth/templateDetail.vue
@@ -268,7 +268,7 @@
   list.value = []
 }
 
-defineExpose({ list, checkListBeforeSave, clearConfig })
+defineExpose({ list, checkListBeforeSave, clearConfig, form })
 </script>
 
 <template>
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 8c65b43..9a1cc1e 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -375,6 +375,7 @@
     })
     if (list.value.length) {
       form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
     }
   }
 })
@@ -388,6 +389,10 @@
     form.value.division = Number(newVal.division) // 分度值的1/5
     form.value.supplyVoltage = Number(getDataNum(newVal.supplyVoltage)) // 供电电压
     form.value.supplyVoltageUnit = getDataUnit(newVal.supplyVoltage) // 供电电压单位
+    if (props.itemCategoryName === '压力变送器' && list.value.length) { // 理论输出值单位
+      form.value.theoreticalOutputValueUnit = list.value[0].theoreticalOutputValueUnit // 理论输出值单位
+      changeTheoreticalOutputValueUnit(form.value.theoreticalOutputValueUnit)
+    }
     if (form.value.displayValueTwo) { // 设定标准器示值2
       showValueTwo.value = true
     }
@@ -399,8 +404,8 @@
 }, { deep: true, immediate: true })
 
 // 监听切换理论输出值单位
-const changeTheoreticalOutputValueUnit = (val: string) => {
-  console.log(val)
+function changeTheoreticalOutputValueUnit(val: string) {
+  console.log('理论输出值单位', val)
   columns_pressure_transmitter.value[1].text = `理论输出值（${val}）`
 }
 
diff --git a/src/views/business/measure/item/detail.vue b/src/views/business/measure/item/detail.vue
index 9890c0b..644f8af 100644
--- a/src/views/business/measure/item/detail.vue
+++ b/src/views/business/measure/item/detail.vue
@@ -507,6 +507,8 @@
   }
   else if (form.value.belongStandardEquipment === '15') { // 第15套：小功率
     if (!standardRef.value.checkListBeforeSave()) { params = '未通过校验'; return params }
+    console.log('上传参数77777777777777777', standardRef.value.form)
+
     params = {
       helpFieldInstruction: form.value.helpFieldInstruction, // 辅助字段说明
       itemRemark: form.value.itemRemark, // 检定项备注
diff --git a/src/views/business/subpackage/certificate/list.vue b/src/views/business/subpackage/certificate/list.vue
index a22c0ea..f31615d 100644
--- a/src/views/business/subpackage/certificate/list.vue
+++ b/src/views/business/subpackage/certificate/list.vue
@@ -319,7 +319,7 @@
             v-model="listQuery.conclusion"
             placeholder="检定结论"
             filterable
-            class="full-width-input"
+            style="width: 220px;"
             clearable
           >
             <el-option v-for="item in conclusionList" :key="item.id" :label="item.name" :value="item.name" />
@@ -331,6 +331,7 @@
             class="short-input"
             placeholder="计量标识"
             clearable
+            style="width: 220px;"
           >
             <el-option v-for="item of meterIdentifyDict" :key="item.value" :label="item.name" :value="item.value" />
           </el-select>
diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue
index aadc6e8..d3d98bd 100644
--- a/src/views/business/taskMeasure/measureData/list.vue
+++ b/src/views/business/taskMeasure/measureData/list.vue
@@ -75,6 +75,7 @@
   { text: '计量标识', value: 'meterIdentify', align: 'center', width: '120' },
   { text: '检定证书', value: 'fileArr', align: 'center', width: '240', followLink: true },
   { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' },
+
   // { text: '所使用的测量标准及配套设备名称', value: 'equipmentNameStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备型号', value: 'equipmentModelStr', align: 'center' },
   // { text: '所使用的测量标准及配套设备编号', value: 'equipmentManufactureNoStr', align: 'center' },
@@ -100,7 +101,11 @@
 async function getDict() {
   // 设备名称
   getDeviceNameList().then((res) => {
-    deviceNameList.value = res.data
+    deviceNameList.value = res.data.map((item: any) => {
+      return {
+        value: item,
+      }
+    })
   })
   // 计量标识
   getDictByCode('eqptMeterIdentify').then((response) => {
@@ -110,7 +115,17 @@
   getModelAllList({}).then((res) => {
     allList.value = res.data
     modelList.value = Array.from(new Set(res.data.filter((item: any) => item.model).map((item: any) => item.model)))
+    modelList.value = modelList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
     helpList.value = Array.from(new Set(res.data.filter((item: any) => item.helpInstruction).map((item: any) => item.helpInstruction)))
+    helpList.value = helpList.value.map((item) => {
+      return {
+        value: item,
+      }
+    })
   })
 
   // 测试、校准或检定地点
@@ -174,7 +189,7 @@
       return {
         ...item,
         measureValidDate: dayjs(item.measureValidDate).format('YYYY-MM-DD'),
-        followLinkArr: item.certificateFile ? [item.certificateFile] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
+        followLinkArr: item.certificateFile ? [item.certificateFile] : item.dataSource === '康斯特自动检定系统' ? [`${item.sampleName}${item.model}${item.manufactureNo}康斯特证书`] : item.constCertificateExcelData ? [item.constCertificateExcelData] : '',
         labCodeName: item.labCodeName === '西昌' || item.labCodeName === '海口' ? `${item.labCodeName}实验室` : item.labCodeName,
       }
     })
@@ -476,6 +491,27 @@
 }
 
 // ---------------------------------------钩子-------------------------------------------------------
+// 匹配设备名称输入建议
+const querySearchDeviceName = (queryString: string, cb: any) => {
+  const results = queryString ? deviceNameList.value.filter((item: any) => item.value.includes(queryString)) : deviceNameList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配型号规格输入建议
+const querySearchDeviceModel = (queryString: string, cb: any) => {
+  const results = queryString ? modelList.value.filter((item: any) => item.value.includes(queryString)) : modelList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
+// 匹配辅助字段输入建议
+const querySearchHelpInstruction = (queryString: string, cb: any) => {
+  const results = queryString ? helpList.value.filter((item: any) => item.value.includes(queryString)) : helpList.value
+  // 调用 callback 返回建议列表的数据
+  cb(results)
+}
+
 watch(timeRange, (val) => { // 监听检定日期变化
   if (val) {
     listQuery.value.traceDateStart = `${val[0]}`
@@ -554,22 +590,37 @@
         <el-input v-model.trim="listQuery.measureAddress" placeholder="检定地点" clearable />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.sampleName" filterable class="short-input" placeholder="受检设备名称" clearable>
-          <el-option v-for="item in deviceNameList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.sampleName"
+          :fetch-suggestions="querySearchDeviceName"
+          placeholder="设备名称"
+          clearable
+        />
       </search-item>
       <search-item>
-        <el-select v-model.trim="listQuery.model" filterable class="short-input" placeholder="规格型号" clearable>
-          <el-option v-for="item in modelList" :key="item" :label="item" :value="item" />
-        </el-select>
+        <el-autocomplete
+          v-model="listQuery.model"
+          :fetch-suggestions="querySearchDeviceModel"
+          placeholder="规格型号"
+          clearable
+        />
       </search-item>
+
       <search-item>
         <el-input v-model.trim="listQuery.manufactureNo" placeholder="出厂编号" class="short-input" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+        <el-autocomplete
+          v-model="listQuery.helpInstruction"
+          :fetch-suggestions="querySearchHelpInstruction"
+          placeholder="辅助字段"
+          clearable
+        />
       </search-item>
       <!-- <search-item>
+        <el-input v-model.trim="listQuery.helpInstruction" placeholder="辅助字段" class="short-input" clearable />
+      </search-item> -->
+      <!-- <search-item>
         <el-input v-model.trim="listQuery.equipmentModelStr" placeholder="标准设备型号" class="short-input" clearable />
       </search-item>
       <search-item>
diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue
index 0f999ea..23e182b 100644
--- a/src/views/equipement/source/plan/components/basic.vue
+++ b/src/views/equipement/source/plan/components/basic.vue
@@ -171,6 +171,7 @@
 ])
 const addObj = {
   id: '',
+  equipmentId: '', // equipmentId
   equipmentNo: '', // 统一编号
   equipmentName: '', // 设备名称
   model: '', // 规格型号
@@ -210,6 +211,8 @@
 // 点击选择
 const chooseList = (row: any, index: number) => {
   selectIndex.value = index
+  console.log('888888888888888选择第几行设备', selectIndex.value);
+
   isMulti.value = false
   selectEquipmentDialogRef.value.initDialog()
 }
@@ -285,10 +288,16 @@
     ElMessage.warning('请先选择文件名称的年份')
     return false
   }
+  console.log('o[po[pki[p]]]', row);
+
+  if (!row.equipmentId) {
+    ElMessage.warning('请先选择设备')
+    return false
+  }
   isShowEquipmentInfo.value = true
   editIndex.value = index
   equipmentInfoForm.value = {
-    equipmentId: row.id, // 设备id
+    equipmentId: row.equipmentId, // 设备id
     equipmentNo: row.equipmentNo, // 统一编号
     equipmentName: row.equipmentName, // 设备名称
     model: row.model, // 规格型号
@@ -317,12 +326,12 @@
   }
   sourceNeedlist.value = row.technicalTargetList || []
   // 这里请求所属标准装置的数据
-  getEquipmentInfo({ id: row.id, type: '1' }).then((res) => {
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+  getEquipmentInfo({ id: row.equipmentId, type: '1' }).then((res) => {
+    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;equipmentId: string }) => {
       return {
         standardName: item.standardName,
         standardNo: item.standardNo,
-        id: item.id,
+        id: item.equipmentId,
       }
     })
     haveStandardInfo.value = meterStandardList.length
@@ -338,7 +347,7 @@
   if (isMulti.value) { // 多选
     val.forEach((item: any) => {
       // 只添加列表里不存在的
-      const index = list.value.findIndex((i: { id: string }) => item.id === i.id)
+      const index = list.value.findIndex((i: { equipmentId: string }) => item.id === i.equipmentId)
       if (index === -1) {
         list.value.push({
           ...item,
@@ -356,14 +365,21 @@
           supplierId: lastSupplierName.value,
           traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
           traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+          id: '',
+          equipmentId: item.id,
         })
       }
     })
   }
   else { // 单选
-    const index = list.value.findIndex((i: { id: string }) => val[0].id === i.id)
+    console.log('-------------', list.value)
+
+    const index = list.value.findIndex((i: { equipmentId: string }) => val[0].id === i.equipmentId)
+    console.log('[[index]]', index)
+    console.log('编辑第几行设备', selectIndex.value)
+
     if (index === -1) {
-      list.value.splice(list.value[index + 1], 1, {
+      list.value.splice(selectIndex.value, 1, {
         ...val[0],
         planTraceTime: val[0].measureValidDate ? dayjs(val[0].measureValidDate).format('YYYY-MM') : val[0].measureValidDate, // 计划溯源时间
         standardName: val[0].meterStandardName, // 所属测量标准名称
@@ -379,7 +395,10 @@
         supplierId: lastSupplierName.value,
         traceWay: lastTraceWay.value, // 溯源方式(字典code) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
         traceWayName: lastTraceWayName.value, // 溯源方式(字典value) 使用的是上一年的溯源机构名称，不使用从设备带出来的溯源机构名称
+        id: '',
+        equipmentId: val[0].id,
       })
+      console.log('-------------', list.value)
     }
     else {
       ElMessage.warning('此设备已添加过')
@@ -401,6 +420,7 @@
       list.value[editIndex.value].traceWayName = traceWayMap[`${equipmentInfoForm.value.traceWay}`]
       list.value[editIndex.value].technicalTargetList = sourceNeedlist.value // 溯源需求
       isShowEquipmentInfo.value = false // 隐藏编辑模块
+      console.log('点击确认编辑', list.value)
     }
   })
 }
diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue
index c70859b..98a95a0 100644
--- a/src/views/equipement/source/resultConfirm/components/basic.vue
+++ b/src/views/equipement/source/resultConfirm/components/basic.vue
@@ -86,9 +86,9 @@
   signComplete: 0, // 签名信息是否齐全
   sealComplete: 0, // 是否盖有有效印章
 
-  conclusion: '', // 结论(计量标识字典code)
+  conclusion: '', // 结果确认结论(输入框)
   limitScope: '', // 限用范围
-  meterIdentifyName: '', // 结果确认结论(输入框)
+  meterIdentifyName: '', // 结论
   remark: '', // 备注
 
   quantityTargetItem: '', // 量传指标检定项目
@@ -131,8 +131,8 @@
   fileNoNameThree: [{ required: true, message: '依据文件名称3不能为空', trigger: ['blur', 'change'] }],
   fileNoFour: [{ required: true, message: '依据文件编号4不能为空', trigger: ['blur', 'change'] }],
   fileNoNameFour: [{ required: true, message: '依据文件名称4不能为空', trigger: ['blur', 'change'] }],
-  conclusion: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
-  meterIdentifyName: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
+  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  conclusion: [{ required: true, message: '结果确认结论不能为空', trigger: ['blur', 'change'] }],
   resultCorrect: [{ required: true, message: '结论是否与数据结果一致不能为空', trigger: ['blur', 'change'] }],
   traceDate: [{ required: true, message: '测试、校准或检定日期不能为空', trigger: ['blur', 'change'] }],
   dateCorrect: [{ required: true, message: '日期是否与粘贴标识一致不能为空', trigger: ['blur', 'change'] }],
@@ -140,7 +140,7 @@
   validDateCorrect: [{ required: true, message: '有效期是否正确不能为空', trigger: ['blur', 'change'] }],
   signComplete: [{ required: true, message: '签名信息是否齐全不能为空', trigger: ['blur', 'change'] }],
   sealComplete: [{ required: true, message: '是否盖有有效印章不能为空', trigger: ['blur', 'change'] }],
-  meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
+  // meterIdentify: [{ required: true, message: '结论不能为空', trigger: ['blur', 'change'] }],
   certificateFile: [{ required: true, message: '检定证书不能为空', trigger: ['blur', 'change'] }],
 })
 
@@ -315,16 +315,16 @@
     })
 
     // ------------------处理所属测量标准名称----------------------
-    const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
-      return {
-        standardName: item.standardName,
-        standardNo: item.standardNo,
-        id: item.id,
-      }
-    })
+    // const meterStandardList = res.data.standardInfoList.map((item: { standardName: string;standardNo: string;id: string }) => {
+    //   return {
+    //     standardName: item.standardName,
+    //     standardNo: item.standardNo,
+    //     id: item.id,
+    //   }
+    // })
     // form.value.standardId = meterStandardList.map((item: { id: string }) => item.id).join(',')
-    form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
-    form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
+    // form.value.standardNo = meterStandardList.map((item: { standardNo: string }) => item.standardNo).join(',')
+    // form.value.standardName = meterStandardList.map((item: { standardName: string }) => item.standardName).join(',')
   })
 }
 
@@ -1113,9 +1113,9 @@
             <span style="font-weight: 600;">结论</span>
           </el-divider>
           <el-col :span="8">
-            <el-form-item label="结论:" prop="conclusion">
+            <el-form-item label="结论:" prop="meterIdentify">
               <el-select
-                v-model="form.conclusion"
+                v-model="form.meterIdentify"
                 :placeholder="pageType === 'detail' ? ' ' : '请选择结论'"
                 :disabled="pageType === 'detail'"
                 class="full-width-input"
@@ -1349,9 +1349,9 @@
       >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="结果确认结论:" prop="meterIdentifyName">
+            <el-form-item label="结果确认结论:" prop="conclusion">
               <el-input
-                v-model="form.meterIdentifyName"
+                v-model="form.conclusion"
                 type="textarea"
                 autosize
                 :placeholder="pageType === 'detail' ? '' : '请输入结果确认结论'"
diff --git a/src/views/equipement/standard/book/components/config/thirteenth/config.vue b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
index c178dfd..e742373 100644
--- a/src/views/equipement/standard/book/components/config/thirteenth/config.vue
+++ b/src/views/equipement/standard/book/components/config/thirteenth/config.vue
@@ -117,7 +117,7 @@
     case '直流电压(50Ω)':
       checkoutDirectVoltage50ΩList.value = e
       break
-    case '直流电压(1Ω)':
+    case '直流电压(1MΩ)':
       checkoutDirectVoltage1MΩList.value = e
       break
     case '输入阻抗':
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index 55435fd..42053f7 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -255,7 +255,7 @@
   }
   listQueryJobInstruction.value.id = StandardId // 标准装置id
   getJobInstructionList(listQueryJobInstruction.value).then((response) => {
-    technologyFile.value = response.data.rows.map((item: { pdfUrl: string }) => item.pdfUrl)
+    technologyFile.value = response.data.rows.filter((i: { pdfUrl: string }) => i.pdfUrl).map((item: { pdfUrl: string }) => item.pdfUrl)
   })
 }
 
@@ -1107,7 +1107,7 @@
               <div v-for="(item, index) in technologyFile" :key="index" style="display: flex;">
                 <show-photo v-if="technologyFile.length" :minio-file-name="item" style="margin-right: 10px;" />
               </div>
-              <span v-if="pageType === 'detail' && !technologyFile.length">无</span>
+              <span v-if="!technologyFile.length">无</span>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/resource/customer/contract/components/basic.vue b/src/views/resource/customer/contract/components/basic.vue
index df15760..9fdd004 100644
--- a/src/views/resource/customer/contract/components/basic.vue
+++ b/src/views/resource/customer/contract/components/basic.vue
@@ -388,7 +388,7 @@
     </detail-block>
   </el-form>
   <!-- 选择要求、委托书及合同评审表组件 -->
-  <select-customer-examine-list ref="selectCustomerExamineListRef" :is-multi="false" @confirm="confirmSelectFile" />
+  <select-customer-examine-list ref="selectCustomerExamineListRef" send-flag="1" :is-multi="false" @confirm="confirmSelectFile" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 89acb2f..99b9472 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -5,8 +5,9 @@
 import { exportFile } from '@/utils/exportUtils'
 import { printPdf } from '@/utils/printUtils'
 import { getBase64 } from '@/utils/download'
-import { getStream } from '@/api/resource/examine'
-import { getPdfStream } from '@/api/file'
+import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+import { getStream, sendTo } from '@/api/resource/examine'
+
 const infoId = ref('') // id
 const $route = useRoute()
 const $router = useRouter()
@@ -50,8 +51,8 @@
     lock: true,
     text: '加载中...',
     background: 'rgba(255, 255, 255, 0.6)',
-  });
-  ($route.query.examineFormFile ? getPdfStream($route.query.examineFormFile as string) : getStream({ id: infoId.value, pdf: true })).then((res) => {
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
     pdfStream.value = new Blob([res.data])
     getBase64(res.data).then((res) => {
       pdfUrl.value = res as string
@@ -101,7 +102,6 @@
           发送给委托方
         </el-button>
         <el-button type="primary" @click="exportWord">
-          <!-- <el-button v-if="!$route.query.examineFormFile" type="primary" @click="exportWord"> -->
           导出word
         </el-button>
         <el-button type="primary" @click="exportPdf">
diff --git a/src/views/resource/customer/examine/detail.vue b/src/views/resource/customer/examine/detail.vue
index 8dcf9e3..035a858 100644
--- a/src/views/resource/customer/examine/detail.vue
+++ b/src/views/resource/customer/examine/detail.vue
@@ -91,18 +91,18 @@
   createUserName: '',
   createTime: '',
 })
-const measureMethodTypeArray = ref<Array<string>>([])
+// const measureMethodTypeArray = ref<Array<string>>([])
 
 // 校验方法
-const methodTypeValidator = (rule: any, value: string, callback: any) => {
-  if (measureMethodTypeArray.value.length === 0) {
-    return callback(new Error('测试、校准或检定方法类型不能为空，请勾选'))
-  }
-  else {
-    examineInfo.value.measureMethodType = measureMethodTypeArray.value.join(',')
-    callback()
-  }
-}
+// const methodTypeValidator = (rule: any, value: string, callback: any) => {
+//   if (measureMethodTypeArray.value.length === 0) {
+//     return callback(new Error('测试、校准或检定方法类型不能为空，请勾选'))
+//   }
+//   else {
+//     examineInfo.value.measureMethodType = measureMethodTypeArray.value.join(',')
+//     callback()
+//   }
+// }
 
 const examineRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空', trigger: ['change', 'blur'] }],
@@ -116,7 +116,8 @@
   numberOfPeople: [{ required: true, message: '检定人员人数不能为空', trigger: 'blur' }],
   staffCert: [{ required: true, message: '人员持证情况不能为空', trigger: 'blur' }],
   measureMethodName: [{ required: true, message: '方法名称不能为空', trigger: 'blur' }],
-  measureMethodType: [{ required: true, trigger: ['change', 'blur'], validator: methodTypeValidator }],
+  measureMethodType: [{ required: true, message: '测试、校准或检定方法类型不能为空', trigger: 'blur' }],
+  // measureMethodType: [{ required: true, trigger: ['change', 'blur'], validator: methodTypeValidator }],
   measureMethodControlled: [{ required: true, message: '方法是否受控不能为空', trigger: ['change', 'blur'] }],
   measureMethodConfirm: [{ required: true, message: '方法是否确认不能为空', trigger: ['change', 'blur'] }],
 }) // 表单验证规则
@@ -408,7 +409,7 @@
   }
   if (row.measureMethodType !== undefined && row.measureMethodType !== null && row.measureMethodType !== '') {
     examineInfo.value.measureMethodType = row.measureMethodType
-    measureMethodTypeArray.value = row.measureMethodType.split(',')
+    // measureMethodTypeArray.value = row.measureMethodType.split(',')
     examineMethodForm.value.validateField('measureMethodType')
   }
   if (row.measureMethodControlled !== undefined && row.measureMethodControlled !== null && `${row.measureMethodControlled}` !== '') {
@@ -593,7 +594,7 @@
   })
   getExamineDetail({ id: id.value }).then((res) => {
     examineInfo.value = res.data
-    measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
+    // measureMethodTypeArray.value = examineInfo.value.measureMethodType.split(',')
     loading.close()
   }).catch(() => {
     loading.close()
@@ -923,11 +924,16 @@
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item label="测试、校准或检定方法类型" prop="measureMethodType">
-                  <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
+                  <!-- <el-checkbox-group v-model="measureMethodTypeArray" :disabled="type === 'detail'">
                     <el-checkbox v-for="dict in methodTypeDict" :key="dict.id" :label="dict.value">
                       {{ dict.name }}
                     </el-checkbox>
-                  </el-checkbox-group>
+                  </el-checkbox-group> -->
+                  <el-radio-group v-model="examineInfo.measureMethodType" style="margin-bottom: 20px;">
+                    <el-radio v-for="item in methodTypeDict" :key="item.id" :label="item.value">
+                      {{ item.name }}
+                    </el-radio>
+                  </el-radio-group>
                   <el-input v-model="examineInfo.measureMethodType" type="hidden" />
                   <el-input v-model="examineInfo.measureMethodTypeName" type="hidden" />
                 </el-form-item>
diff --git a/src/views/resource/file/grantNotice/dialog/selectCustomerExamineList.vue b/src/views/resource/file/grantNotice/dialog/selectCustomerExamineList.vue
index ec03ff7..6765a23 100644
--- a/src/views/resource/file/grantNotice/dialog/selectCustomerExamineList.vue
+++ b/src/views/resource/file/grantNotice/dialog/selectCustomerExamineList.vue
@@ -16,6 +16,9 @@
     type: Boolean,
     default: true,
   },
+  sendFlag: {
+    type: String,
+  },
 })
 const emits = defineEmits(['confirm'])
 const dialogFormVisible = ref(false) // 控制对话框显隐
@@ -29,6 +32,7 @@
   createTimeStart: '', // 创建时间-起始
   createTimeEnd: '', // 创建时间-结束
   approvalStatus: '0', // 审批状态
+  sendFlag: props.sendFlag,
   formId: SCHEDULE.CONTRACT_REVIEW_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
   offset: 1,
   limit: 20,
@@ -96,6 +100,7 @@
     createTimeStart: '', // 创建时间-起始
     createTimeEnd: '', // 创建时间-结束
     approvalStatus: '0', // 审批状态
+    sendFlag: props.sendFlag,
     formId: SCHEDULE.CONTRACT_REVIEW_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），此处为固定值
     offset: 1,
     limit: 20,
diff --git a/src/views/system/baseInfo/templateRegister/detail.vue b/src/views/system/baseInfo/templateRegister/detail.vue
index 2041333..9ce5745 100644
--- a/src/views/system/baseInfo/templateRegister/detail.vue
+++ b/src/views/system/baseInfo/templateRegister/detail.vue
@@ -332,7 +332,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container class="system-baseInfo-templateRegister">
     <detail-page :title="`文件模板注册管理-${textMap[pageType]}`">
       <template #btns>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
@@ -581,3 +581,12 @@
     <select-module-name-dialog ref="selectModuleNameDialogRef" @confirm="confirmSelectModuleName" />
   </app-container>
 </template>
+
+<style lang="scss">
+.system-baseInfo-templateRegister {
+  // 单元格样式
+  .el-table__cell {
+    position: static !important; // 解决el-image 和 el-table冲突层级冲突问题
+  }
+}
+</style>