diff --git a/src/commonMethods/useCheckList.ts b/src/commonMethods/useCheckList.ts
index 2497127..d661202 100644
--- a/src/commonMethods/useCheckList.ts
+++ b/src/commonMethods/useCheckList.ts
@@ -11,7 +11,7 @@
  * @param dependedValue // 被依赖项条件
  * @param requireLength // 要检查的表格数据长度是否大于0
  */
-export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false) {
+export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {

diff --git a/src/commonMethods/useCheckList.ts b/src/commonMethods/useCheckList.ts
index 2497127..d661202 100644
--- a/src/commonMethods/useCheckList.ts
+++ b/src/commonMethods/useCheckList.ts
@@ -11,7 +11,7 @@
  * @param dependedValue // 被依赖项条件
  * @param requireLength // 要检查的表格数据长度是否大于0
  */
-export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false) {
+export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
diff --git a/src/views/equipement/standard/book/components/config/eighth/config.vue b/src/views/equipement/standard/book/components/config/eighth/config.vue
index fb7bacb..3b2a79e 100644
--- a/src/views/equipement/standard/book/components/config/eighth/config.vue
+++ b/src/views/equipement/standard/book/components/config/eighth/config.vue
@@ -2,13 +2,13 @@
 <script name="StandardBookEquipmentConfig" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList } from './eighth-interface'
-import TemplateTable from './templateTable.vue'
 import type { dictType } from '@/global'
 import { useCheckList } from '@/commonMethods/useCheckList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { config, getCheckItemDetail } from '@/api/equipment/standard/book'
-import { calc } from '@/utils/useCalc'
 import { getDictByCode } from '@/api/system/dict'
+import SelectByDict from '@/components/SelectByDict/index.vue'
+import SelectEquipmentDialog from '@/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue'
 
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,69 +42,89 @@
   }
   console.log('pageType.value', pageType.value)
 }
+// ------------------------------------------字典----------------------------------------------
+const checkTypeList = ref<dictType[]>([]) // 核查类型
+const checkPointList = ref<dictType[]>([]) // 核查类型
+
+/**
+ * 获取字典
+ */
+function getDict() {
+  // 核查类型
+  getDictByCode('bizFirstStandardCheckType').then((response) => {
+    checkTypeList.value = response.data
+  })
+  // 核查点
+  getDictByCode('Standard8CheckPoint').then((response) => {
+    checkPointList.value = response.data
+  })
+}
+getDict()
 // -------------------------------------------核查项-----------------------------------------------
 const list = ref<IList[]>([])
 const checkoutList = ref<IList[]>([])
 const columns = ref<TableColumn[]>([
-  { text: '核查点', value: 'params', align: 'center', required: true },
-  { text: '项目', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
-  { text: '核查类型', value: 'resolution', align: 'center', required: true },
-  { text: '扩展不确定度U', value: 'cycleNumber', align: 'center', required: true },
-  { text: '示值设备名称', value: 'checkType', align: 'center', required: true },
-  { text: '型号规格', value: 'checkType', align: 'center', required: true },
-  { text: '出厂编号', value: 'checkType', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
+  { text: '示值设备名称', value: 'valueEquipmentName', align: 'center', required: true, width: '220' },
+  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '180' },
+  { text: '核查类型', value: 'checkType', align: 'center', required: true, width: '180' },
+  { text: 'U(k=2)', value: 'urel', align: 'center', required: true, width: '180' },
 ])
 
-// 温度值多选
+// 多选
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
 
 // 校验表格（点击保存的时候、增加行用）
-const checkList = (list: any, title: string) => {
-  // return useCheckList(list, columns.value, title)
+const checkList = (list: any) => {
+  return useCheckList(list, columns.value, '核查项表格')
 }
 
 /**
- * 增加行公共方法
+ * 增加行
  * @param list 要操作的数组
  * @param title 操作的表格
  */
-const addRow = (list: IList[], title: string) => {
-  // if (checkList(list, `${title}表格`)) {
-  //   if (list.length) { // 增加行时默认上一行数据
-  //     list.push({
-  //       id: '',
-  //       checkPoint: list[list.length - 1].checkPoint, //	核查点(直接存字典value)
-  //       checkType: list[list.length - 1].checkType, //	核查类型
-  //       cycleNumber: list[list.length - 1].cycleNumber, //	循环次数
-  //       equipmentId: list[list.length - 1].equipmentId, //	配套设备id
-  //       itemCategoryId: list[list.length - 1].itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
-  //       params: list[list.length - 1].params, //	核查项目(直接存字典value)
-  //       remark: list[list.length - 1].remark, //	核查项备注(每个数据存储的核查项备注相同，前端取列表中一个即可)
-  //       resolution: list[list.length - 1].resolution, //		分辨力
-  //       testType: list[list.length - 1].testType, // 核查点类型(直接存字典value)
-  //       unit: list[list.length - 1].unit, //	单位(直接存字典value)
-  //       urel: list[list.length - 1].urel, //	测量标准相对扩展不确定度urel
-  //     })
-  //   }
-  //   else {
-  //     list.push({
-  //       checkPoint: '', //	核查点
-  //       checkType: '', //	核查类型(直接存字典value，多个逗号分隔)
-  //       cycleNumber: 6, //	循环次数
-  //       equipmentId: infoId.value, //	配套设备id
-  //       itemCategoryId: form.value.itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
-  //       params: '', //	核查项目(直接存字典value)
-  //       remark: '', //	核查项备注
-  //       resolution: 0.0001, //	分辨力
-  //       testType: title, //	核查点类型(直接存字典value)
-  //       unit: '', //	单位(直接存字典value)
-  //       urel: 0, //	测量标准相对扩展不确定度urel
-  //     })
-  //   }
-  // }
+const addRow = () => {
+  if (checkList(list.value)) {
+    if (list.value.length) { // 增加行时默认上一行数据
+      list.value.push({
+        id: '', //	id，更新/删除使用参数
+        checkPoint: list.value[list.value.length - 1].checkPoint, //	核查点
+        checkType: list.value[list.value.length - 1].checkType, //	核查类型(直接存字典value)
+        cycleNumber: list.value[list.value.length - 1].cycleNumber, //	循环次数
+        manufactureNo: list.value[list.value.length - 1].manufactureNo, //	出厂编号
+        model: list.value[list.value.length - 1].model, //	型号规格
+        params: list.value[list.value.length - 1].params, //	核查项目(直接存字典value)
+        remark: list.value[list.value.length - 1].remark, //	核查项备注
+        urel: list.value[list.value.length - 1].urel, //	U(k=2)
+        valueEquipmentId: list.value[list.value.length - 1].valueEquipmentId, //	设备台账id
+        valueEquipmentName: list.value[list.value.length - 1].valueEquipmentName, //	示值设备名称
+        equipmentId: list.value[list.value.length - 1].equipmentId, //	配套设备id
+        itemCategoryId: list.value[list.value.length - 1].itemCategoryId, // 核查项分类id(能够确定是哪个标准装置)
+      })
+    }
+    else {
+      list.value.push({
+        id: '', //	id，更新/删除使用参数
+        checkPoint: '', //	核查点
+        checkType: ['重复性', '稳定性'], //	核查类型(直接存字典value)
+        cycleNumber: '6', //	循环次数
+        manufactureNo: '', //	出厂编号
+        model: '', //	型号规格
+        params: '', //	核查项目(直接存字典value)
+        remark: '', //	核查项备注
+        urel: undefined, //	U(k=2)
+        valueEquipmentId: '', //	设备台账id
+        valueEquipmentName: '', //	示值设备名称
+        equipmentId: infoId.value, //	配套设备id
+        itemCategoryId: form.value.itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
+      })
+    }
+  }
 }
 /**
  * 删除行公共方法
@@ -121,6 +141,24 @@
     })
   }
 }
+// --------------------------------------选择设备-------------------------------------------------
+const selectEquipmentDialogRef = ref() // 选择设备组件ref
+const selectIndex = ref() // 选择设备的行数
+// 点击选择设备
+const selectEquipment = (index: number) => {
+  selectIndex.value = index
+  selectEquipmentDialogRef.value.initDialog()
+}
+
+// 确定选择设备
+const confirmSelectEquipment = (value: any) => {
+  if (value.length) {
+    list.value[selectIndex.value].valueEquipmentId = value[0].id //	设备台账id
+    list.value[selectIndex.value].model = value[0].model //	型号规格
+    list.value[selectIndex.value].manufactureNo = value[0].manufactureNo //	出厂编号
+    list.value[selectIndex.value].valueEquipmentName = value[0].equipmentName //	示值设备名称
+  }
+}
 
 // ---------------------------------------按钮-----------------------------------------------------
 // 点击关闭
@@ -145,46 +183,59 @@
 
 // 点击保存
 const save = () => {
-  // if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
-  // if (!checkList(list.value, '核查项表格')) { return false }
-  // const params = {
-  //   itemCategoryId: form.value.itemCategoryId, // 核查项分类id
-  //   checkItemDataPistonGaugeList: list.value,
-  // }
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
-  // config(params).then((res) => {
-  //   ElMessage.success('已保存')
-  //   pageType.value = 'detail'
-  //   loading.close()
-  // })
+  if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
+  if (!checkList(list.value)) { return false }
+  if (!checkArrayDataUnique()) { return false }
+  const params = {
+    itemCategoryId: form.value.itemCategoryId, // 核查项分类id
+    checkItemDataETwoList: list.value,
+    equipmentId: infoId.value, // 配套设备id
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  config(params).then((res) => {
+    ElMessage.success('已保存')
+    pageType.value = 'detail'
+    loading.close()
+  })
+}
+
+// 校验表格中不能同时存在核查点两个属性的两条数据
+function checkArrayDataUnique() {
+  for (let i = 0; i < list.value.length; i++) {
+    const j = i + 1
+    for (let j = 0; j < list.value.length; j++) {
+      if (i !== j && list.value[i].checkPoint === list.value[j].checkPoint) {
+        ElMessage.warning(`核查项表格第${i + 1}行和第${j + 1}行的核查点重复了`)
+        return false
+      }
+    }
+  }
+  return true
 }
 
 // 获取详情
 const getInfo = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   const params = {
     equipmentId: equipmentId.value, // 设备id
     belongStandardEquipment: form.value.belongStandardEquipment, // 检校标准装置code
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     itemCategoryName: form.value.itemCategoryName, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   list.value = res.data.checkItemDataPistonGaugeList.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       resolution: Number(item.resolution),
-  //     }
-  //   })
-  //   loading.close()
-  // })
+  getCheckItemDetail(params).then((res) => {
+    if (res && res.data && res.data.checkItemDataETwoList && res.data.checkItemDataETwoList.length) {
+      list.value = res.data.checkItemDataETwoList
+    }
+    loading.close()
+  })
 }
 
 // ------------------------------------------钩子--------------------------------------------------
@@ -201,7 +252,7 @@
   form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 核查项标准装置id
   form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 核查项标准装置id
   equipmentId.value = $route.query.equipmentId as string // 设备id
-  // getInfo()
+  getInfo()
 })
 </script>
 
@@ -299,7 +350,7 @@
 
     <detail-block title="核查项" style="padding-bottom: 20px;">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow(list)">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
         <el-button type="info" @click="delRow(checkoutList, list)">
@@ -325,6 +376,57 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
+          <template #default="scope">
+            <!-- 核查点 -->
+            <el-select
+              v-if="item.value === 'checkPoint' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              filterable
+              :placeholder="pageType === 'detail' ? ' ' : `${item.text}`"
+            >
+              <el-option v-for="i of checkPointList" :key="i.id" :label="i.name" :value="i.value" />
+            </el-select>
+            <!-- 设备名称 -->
+            <el-input v-if="item.value === 'valueEquipmentName' && pageType !== 'detail'" v-model="scope.row[item.value]" :placeholder="pageType === 'detail' ? ' ' : `${item.text}`" disabled>
+              <template #append>
+                <el-button size="small" @click="selectEquipment(scope.$index)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+            <el-input
+              v-if="(item.value === 'model' || item.value === 'manufactureNo') && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              :placeholder="pageType === 'detail' ? ' ' : `${item.text}`"
+              disabled
+            />
+            <!-- 循环次数 -->
+            <el-input-number
+              v-if="item.value === 'cycleNumber' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+              :step="1"
+              :precision="0"
+              disabled
+            />
+            <!-- U(k=2) -->
+            <select-by-dict
+              v-if="item.value === 'urel' && pageType !== 'detail'"
+              v-model:model-value="scope.row[item.value]"
+              placeholder="U(k=2)"
+              dict-code="standard8U"
+            />
+            <!-- 核查类型 -->
+            <el-select v-if="pageType !== 'detail' && item.value === 'checkType'" v-model="scope.row[item.value]" disabled clearable multiple placeholder="请选择">
+              <el-option
+                v-for="item in checkTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
         </el-table-column>
       </el-table>
     </detail-block>
@@ -352,5 +454,8 @@
       </el-row>
     </el-form>
   </app-container>
+
+  <!-- 选择设备台账 -->
+  <select-equipment-dialog ref="selectEquipmentDialogRef" :is-multi="false" @confirm="confirmSelectEquipment" />
 </template>
 

diff --git a/src/commonMethods/useCheckList.ts b/src/commonMethods/useCheckList.ts
index 2497127..d661202 100644
--- a/src/commonMethods/useCheckList.ts
+++ b/src/commonMethods/useCheckList.ts
@@ -11,7 +11,7 @@
  * @param dependedValue // 被依赖项条件
  * @param requireLength // 要检查的表格数据长度是否大于0
  */
-export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false) {
+export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
diff --git a/src/views/equipement/standard/book/components/config/eighth/config.vue b/src/views/equipement/standard/book/components/config/eighth/config.vue
index fb7bacb..3b2a79e 100644
--- a/src/views/equipement/standard/book/components/config/eighth/config.vue
+++ b/src/views/equipement/standard/book/components/config/eighth/config.vue
@@ -2,13 +2,13 @@
 <script name="StandardBookEquipmentConfig" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList } from './eighth-interface'
-import TemplateTable from './templateTable.vue'
 import type { dictType } from '@/global'
 import { useCheckList } from '@/commonMethods/useCheckList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { config, getCheckItemDetail } from '@/api/equipment/standard/book'
-import { calc } from '@/utils/useCalc'
 import { getDictByCode } from '@/api/system/dict'
+import SelectByDict from '@/components/SelectByDict/index.vue'
+import SelectEquipmentDialog from '@/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue'
 
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,69 +42,89 @@
   }
   console.log('pageType.value', pageType.value)
 }
+// ------------------------------------------字典----------------------------------------------
+const checkTypeList = ref<dictType[]>([]) // 核查类型
+const checkPointList = ref<dictType[]>([]) // 核查类型
+
+/**
+ * 获取字典
+ */
+function getDict() {
+  // 核查类型
+  getDictByCode('bizFirstStandardCheckType').then((response) => {
+    checkTypeList.value = response.data
+  })
+  // 核查点
+  getDictByCode('Standard8CheckPoint').then((response) => {
+    checkPointList.value = response.data
+  })
+}
+getDict()
 // -------------------------------------------核查项-----------------------------------------------
 const list = ref<IList[]>([])
 const checkoutList = ref<IList[]>([])
 const columns = ref<TableColumn[]>([
-  { text: '核查点', value: 'params', align: 'center', required: true },
-  { text: '项目', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
-  { text: '核查类型', value: 'resolution', align: 'center', required: true },
-  { text: '扩展不确定度U', value: 'cycleNumber', align: 'center', required: true },
-  { text: '示值设备名称', value: 'checkType', align: 'center', required: true },
-  { text: '型号规格', value: 'checkType', align: 'center', required: true },
-  { text: '出厂编号', value: 'checkType', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
+  { text: '示值设备名称', value: 'valueEquipmentName', align: 'center', required: true, width: '220' },
+  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '180' },
+  { text: '核查类型', value: 'checkType', align: 'center', required: true, width: '180' },
+  { text: 'U(k=2)', value: 'urel', align: 'center', required: true, width: '180' },
 ])
 
-// 温度值多选
+// 多选
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
 
 // 校验表格（点击保存的时候、增加行用）
-const checkList = (list: any, title: string) => {
-  // return useCheckList(list, columns.value, title)
+const checkList = (list: any) => {
+  return useCheckList(list, columns.value, '核查项表格')
 }
 
 /**
- * 增加行公共方法
+ * 增加行
  * @param list 要操作的数组
  * @param title 操作的表格
  */
-const addRow = (list: IList[], title: string) => {
-  // if (checkList(list, `${title}表格`)) {
-  //   if (list.length) { // 增加行时默认上一行数据
-  //     list.push({
-  //       id: '',
-  //       checkPoint: list[list.length - 1].checkPoint, //	核查点(直接存字典value)
-  //       checkType: list[list.length - 1].checkType, //	核查类型
-  //       cycleNumber: list[list.length - 1].cycleNumber, //	循环次数
-  //       equipmentId: list[list.length - 1].equipmentId, //	配套设备id
-  //       itemCategoryId: list[list.length - 1].itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
-  //       params: list[list.length - 1].params, //	核查项目(直接存字典value)
-  //       remark: list[list.length - 1].remark, //	核查项备注(每个数据存储的核查项备注相同，前端取列表中一个即可)
-  //       resolution: list[list.length - 1].resolution, //		分辨力
-  //       testType: list[list.length - 1].testType, // 核查点类型(直接存字典value)
-  //       unit: list[list.length - 1].unit, //	单位(直接存字典value)
-  //       urel: list[list.length - 1].urel, //	测量标准相对扩展不确定度urel
-  //     })
-  //   }
-  //   else {
-  //     list.push({
-  //       checkPoint: '', //	核查点
-  //       checkType: '', //	核查类型(直接存字典value，多个逗号分隔)
-  //       cycleNumber: 6, //	循环次数
-  //       equipmentId: infoId.value, //	配套设备id
-  //       itemCategoryId: form.value.itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
-  //       params: '', //	核查项目(直接存字典value)
-  //       remark: '', //	核查项备注
-  //       resolution: 0.0001, //	分辨力
-  //       testType: title, //	核查点类型(直接存字典value)
-  //       unit: '', //	单位(直接存字典value)
-  //       urel: 0, //	测量标准相对扩展不确定度urel
-  //     })
-  //   }
-  // }
+const addRow = () => {
+  if (checkList(list.value)) {
+    if (list.value.length) { // 增加行时默认上一行数据
+      list.value.push({
+        id: '', //	id，更新/删除使用参数
+        checkPoint: list.value[list.value.length - 1].checkPoint, //	核查点
+        checkType: list.value[list.value.length - 1].checkType, //	核查类型(直接存字典value)
+        cycleNumber: list.value[list.value.length - 1].cycleNumber, //	循环次数
+        manufactureNo: list.value[list.value.length - 1].manufactureNo, //	出厂编号
+        model: list.value[list.value.length - 1].model, //	型号规格
+        params: list.value[list.value.length - 1].params, //	核查项目(直接存字典value)
+        remark: list.value[list.value.length - 1].remark, //	核查项备注
+        urel: list.value[list.value.length - 1].urel, //	U(k=2)
+        valueEquipmentId: list.value[list.value.length - 1].valueEquipmentId, //	设备台账id
+        valueEquipmentName: list.value[list.value.length - 1].valueEquipmentName, //	示值设备名称
+        equipmentId: list.value[list.value.length - 1].equipmentId, //	配套设备id
+        itemCategoryId: list.value[list.value.length - 1].itemCategoryId, // 核查项分类id(能够确定是哪个标准装置)
+      })
+    }
+    else {
+      list.value.push({
+        id: '', //	id，更新/删除使用参数
+        checkPoint: '', //	核查点
+        checkType: ['重复性', '稳定性'], //	核查类型(直接存字典value)
+        cycleNumber: '6', //	循环次数
+        manufactureNo: '', //	出厂编号
+        model: '', //	型号规格
+        params: '', //	核查项目(直接存字典value)
+        remark: '', //	核查项备注
+        urel: undefined, //	U(k=2)
+        valueEquipmentId: '', //	设备台账id
+        valueEquipmentName: '', //	示值设备名称
+        equipmentId: infoId.value, //	配套设备id
+        itemCategoryId: form.value.itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
+      })
+    }
+  }
 }
 /**
  * 删除行公共方法
@@ -121,6 +141,24 @@
     })
   }
 }
+// --------------------------------------选择设备-------------------------------------------------
+const selectEquipmentDialogRef = ref() // 选择设备组件ref
+const selectIndex = ref() // 选择设备的行数
+// 点击选择设备
+const selectEquipment = (index: number) => {
+  selectIndex.value = index
+  selectEquipmentDialogRef.value.initDialog()
+}
+
+// 确定选择设备
+const confirmSelectEquipment = (value: any) => {
+  if (value.length) {
+    list.value[selectIndex.value].valueEquipmentId = value[0].id //	设备台账id
+    list.value[selectIndex.value].model = value[0].model //	型号规格
+    list.value[selectIndex.value].manufactureNo = value[0].manufactureNo //	出厂编号
+    list.value[selectIndex.value].valueEquipmentName = value[0].equipmentName //	示值设备名称
+  }
+}
 
 // ---------------------------------------按钮-----------------------------------------------------
 // 点击关闭
@@ -145,46 +183,59 @@
 
 // 点击保存
 const save = () => {
-  // if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
-  // if (!checkList(list.value, '核查项表格')) { return false }
-  // const params = {
-  //   itemCategoryId: form.value.itemCategoryId, // 核查项分类id
-  //   checkItemDataPistonGaugeList: list.value,
-  // }
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
-  // config(params).then((res) => {
-  //   ElMessage.success('已保存')
-  //   pageType.value = 'detail'
-  //   loading.close()
-  // })
+  if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
+  if (!checkList(list.value)) { return false }
+  if (!checkArrayDataUnique()) { return false }
+  const params = {
+    itemCategoryId: form.value.itemCategoryId, // 核查项分类id
+    checkItemDataETwoList: list.value,
+    equipmentId: infoId.value, // 配套设备id
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  config(params).then((res) => {
+    ElMessage.success('已保存')
+    pageType.value = 'detail'
+    loading.close()
+  })
+}
+
+// 校验表格中不能同时存在核查点两个属性的两条数据
+function checkArrayDataUnique() {
+  for (let i = 0; i < list.value.length; i++) {
+    const j = i + 1
+    for (let j = 0; j < list.value.length; j++) {
+      if (i !== j && list.value[i].checkPoint === list.value[j].checkPoint) {
+        ElMessage.warning(`核查项表格第${i + 1}行和第${j + 1}行的核查点重复了`)
+        return false
+      }
+    }
+  }
+  return true
 }
 
 // 获取详情
 const getInfo = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   const params = {
     equipmentId: equipmentId.value, // 设备id
     belongStandardEquipment: form.value.belongStandardEquipment, // 检校标准装置code
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     itemCategoryName: form.value.itemCategoryName, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   list.value = res.data.checkItemDataPistonGaugeList.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       resolution: Number(item.resolution),
-  //     }
-  //   })
-  //   loading.close()
-  // })
+  getCheckItemDetail(params).then((res) => {
+    if (res && res.data && res.data.checkItemDataETwoList && res.data.checkItemDataETwoList.length) {
+      list.value = res.data.checkItemDataETwoList
+    }
+    loading.close()
+  })
 }
 
 // ------------------------------------------钩子--------------------------------------------------
@@ -201,7 +252,7 @@
   form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 核查项标准装置id
   form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 核查项标准装置id
   equipmentId.value = $route.query.equipmentId as string // 设备id
-  // getInfo()
+  getInfo()
 })
 </script>
 
@@ -299,7 +350,7 @@
 
     <detail-block title="核查项" style="padding-bottom: 20px;">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow(list)">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
         <el-button type="info" @click="delRow(checkoutList, list)">
@@ -325,6 +376,57 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
+          <template #default="scope">
+            <!-- 核查点 -->
+            <el-select
+              v-if="item.value === 'checkPoint' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              filterable
+              :placeholder="pageType === 'detail' ? ' ' : `${item.text}`"
+            >
+              <el-option v-for="i of checkPointList" :key="i.id" :label="i.name" :value="i.value" />
+            </el-select>
+            <!-- 设备名称 -->
+            <el-input v-if="item.value === 'valueEquipmentName' && pageType !== 'detail'" v-model="scope.row[item.value]" :placeholder="pageType === 'detail' ? ' ' : `${item.text}`" disabled>
+              <template #append>
+                <el-button size="small" @click="selectEquipment(scope.$index)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+            <el-input
+              v-if="(item.value === 'model' || item.value === 'manufactureNo') && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              :placeholder="pageType === 'detail' ? ' ' : `${item.text}`"
+              disabled
+            />
+            <!-- 循环次数 -->
+            <el-input-number
+              v-if="item.value === 'cycleNumber' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+              :step="1"
+              :precision="0"
+              disabled
+            />
+            <!-- U(k=2) -->
+            <select-by-dict
+              v-if="item.value === 'urel' && pageType !== 'detail'"
+              v-model:model-value="scope.row[item.value]"
+              placeholder="U(k=2)"
+              dict-code="standard8U"
+            />
+            <!-- 核查类型 -->
+            <el-select v-if="pageType !== 'detail' && item.value === 'checkType'" v-model="scope.row[item.value]" disabled clearable multiple placeholder="请选择">
+              <el-option
+                v-for="item in checkTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
         </el-table-column>
       </el-table>
     </detail-block>
@@ -352,5 +454,8 @@
       </el-row>
     </el-form>
   </app-container>
+
+  <!-- 选择设备台账 -->
+  <select-equipment-dialog ref="selectEquipmentDialogRef" :is-multi="false" @confirm="confirmSelectEquipment" />
 </template>
 
diff --git a/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts b/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
index 44dc61a..8ac3b00 100644
--- a/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
+++ b/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
@@ -1,3 +1,15 @@
 export interface IList {
-  id?: string //	id，更新/删除使用参数
+  id: string //	id，更新/删除使用参数
+  checkPoint: string //	核查点
+  checkType: string[] //	核查类型(直接存字典value)
+  cycleNumber: string //	循环次数
+  equipmentId: string //	配套设备id
+  itemCategoryId: string //	核查项分类id(能够确定是哪个标准装置)
+  manufactureNo: string //	出厂编号
+  model: string //	型号规格
+  params: string //	核查项目(直接存字典value)
+  remark: string //	核查项备注
+  urel: number | undefined //	U(k=2)
+  valueEquipmentId: string //	设备台账id
+  valueEquipmentName: string //	示值设备名称
 }

diff --git a/src/commonMethods/useCheckList.ts b/src/commonMethods/useCheckList.ts
index 2497127..d661202 100644
--- a/src/commonMethods/useCheckList.ts
+++ b/src/commonMethods/useCheckList.ts
@@ -11,7 +11,7 @@
  * @param dependedValue // 被依赖项条件
  * @param requireLength // 要检查的表格数据长度是否大于0
  */
-export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false) {
+export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
diff --git a/src/views/equipement/standard/book/components/config/eighth/config.vue b/src/views/equipement/standard/book/components/config/eighth/config.vue
index fb7bacb..3b2a79e 100644
--- a/src/views/equipement/standard/book/components/config/eighth/config.vue
+++ b/src/views/equipement/standard/book/components/config/eighth/config.vue
@@ -2,13 +2,13 @@
 <script name="StandardBookEquipmentConfig" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList } from './eighth-interface'
-import TemplateTable from './templateTable.vue'
 import type { dictType } from '@/global'
 import { useCheckList } from '@/commonMethods/useCheckList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { config, getCheckItemDetail } from '@/api/equipment/standard/book'
-import { calc } from '@/utils/useCalc'
 import { getDictByCode } from '@/api/system/dict'
+import SelectByDict from '@/components/SelectByDict/index.vue'
+import SelectEquipmentDialog from '@/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue'
 
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,69 +42,89 @@
   }
   console.log('pageType.value', pageType.value)
 }
+// ------------------------------------------字典----------------------------------------------
+const checkTypeList = ref<dictType[]>([]) // 核查类型
+const checkPointList = ref<dictType[]>([]) // 核查类型
+
+/**
+ * 获取字典
+ */
+function getDict() {
+  // 核查类型
+  getDictByCode('bizFirstStandardCheckType').then((response) => {
+    checkTypeList.value = response.data
+  })
+  // 核查点
+  getDictByCode('Standard8CheckPoint').then((response) => {
+    checkPointList.value = response.data
+  })
+}
+getDict()
 // -------------------------------------------核查项-----------------------------------------------
 const list = ref<IList[]>([])
 const checkoutList = ref<IList[]>([])
 const columns = ref<TableColumn[]>([
-  { text: '核查点', value: 'params', align: 'center', required: true },
-  { text: '项目', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
-  { text: '核查类型', value: 'resolution', align: 'center', required: true },
-  { text: '扩展不确定度U', value: 'cycleNumber', align: 'center', required: true },
-  { text: '示值设备名称', value: 'checkType', align: 'center', required: true },
-  { text: '型号规格', value: 'checkType', align: 'center', required: true },
-  { text: '出厂编号', value: 'checkType', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
+  { text: '示值设备名称', value: 'valueEquipmentName', align: 'center', required: true, width: '220' },
+  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '180' },
+  { text: '核查类型', value: 'checkType', align: 'center', required: true, width: '180' },
+  { text: 'U(k=2)', value: 'urel', align: 'center', required: true, width: '180' },
 ])
 
-// 温度值多选
+// 多选
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
 
 // 校验表格（点击保存的时候、增加行用）
-const checkList = (list: any, title: string) => {
-  // return useCheckList(list, columns.value, title)
+const checkList = (list: any) => {
+  return useCheckList(list, columns.value, '核查项表格')
 }
 
 /**
- * 增加行公共方法
+ * 增加行
  * @param list 要操作的数组
  * @param title 操作的表格
  */
-const addRow = (list: IList[], title: string) => {
-  // if (checkList(list, `${title}表格`)) {
-  //   if (list.length) { // 增加行时默认上一行数据
-  //     list.push({
-  //       id: '',
-  //       checkPoint: list[list.length - 1].checkPoint, //	核查点(直接存字典value)
-  //       checkType: list[list.length - 1].checkType, //	核查类型
-  //       cycleNumber: list[list.length - 1].cycleNumber, //	循环次数
-  //       equipmentId: list[list.length - 1].equipmentId, //	配套设备id
-  //       itemCategoryId: list[list.length - 1].itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
-  //       params: list[list.length - 1].params, //	核查项目(直接存字典value)
-  //       remark: list[list.length - 1].remark, //	核查项备注(每个数据存储的核查项备注相同，前端取列表中一个即可)
-  //       resolution: list[list.length - 1].resolution, //		分辨力
-  //       testType: list[list.length - 1].testType, // 核查点类型(直接存字典value)
-  //       unit: list[list.length - 1].unit, //	单位(直接存字典value)
-  //       urel: list[list.length - 1].urel, //	测量标准相对扩展不确定度urel
-  //     })
-  //   }
-  //   else {
-  //     list.push({
-  //       checkPoint: '', //	核查点
-  //       checkType: '', //	核查类型(直接存字典value，多个逗号分隔)
-  //       cycleNumber: 6, //	循环次数
-  //       equipmentId: infoId.value, //	配套设备id
-  //       itemCategoryId: form.value.itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
-  //       params: '', //	核查项目(直接存字典value)
-  //       remark: '', //	核查项备注
-  //       resolution: 0.0001, //	分辨力
-  //       testType: title, //	核查点类型(直接存字典value)
-  //       unit: '', //	单位(直接存字典value)
-  //       urel: 0, //	测量标准相对扩展不确定度urel
-  //     })
-  //   }
-  // }
+const addRow = () => {
+  if (checkList(list.value)) {
+    if (list.value.length) { // 增加行时默认上一行数据
+      list.value.push({
+        id: '', //	id，更新/删除使用参数
+        checkPoint: list.value[list.value.length - 1].checkPoint, //	核查点
+        checkType: list.value[list.value.length - 1].checkType, //	核查类型(直接存字典value)
+        cycleNumber: list.value[list.value.length - 1].cycleNumber, //	循环次数
+        manufactureNo: list.value[list.value.length - 1].manufactureNo, //	出厂编号
+        model: list.value[list.value.length - 1].model, //	型号规格
+        params: list.value[list.value.length - 1].params, //	核查项目(直接存字典value)
+        remark: list.value[list.value.length - 1].remark, //	核查项备注
+        urel: list.value[list.value.length - 1].urel, //	U(k=2)
+        valueEquipmentId: list.value[list.value.length - 1].valueEquipmentId, //	设备台账id
+        valueEquipmentName: list.value[list.value.length - 1].valueEquipmentName, //	示值设备名称
+        equipmentId: list.value[list.value.length - 1].equipmentId, //	配套设备id
+        itemCategoryId: list.value[list.value.length - 1].itemCategoryId, // 核查项分类id(能够确定是哪个标准装置)
+      })
+    }
+    else {
+      list.value.push({
+        id: '', //	id，更新/删除使用参数
+        checkPoint: '', //	核查点
+        checkType: ['重复性', '稳定性'], //	核查类型(直接存字典value)
+        cycleNumber: '6', //	循环次数
+        manufactureNo: '', //	出厂编号
+        model: '', //	型号规格
+        params: '', //	核查项目(直接存字典value)
+        remark: '', //	核查项备注
+        urel: undefined, //	U(k=2)
+        valueEquipmentId: '', //	设备台账id
+        valueEquipmentName: '', //	示值设备名称
+        equipmentId: infoId.value, //	配套设备id
+        itemCategoryId: form.value.itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
+      })
+    }
+  }
 }
 /**
  * 删除行公共方法
@@ -121,6 +141,24 @@
     })
   }
 }
+// --------------------------------------选择设备-------------------------------------------------
+const selectEquipmentDialogRef = ref() // 选择设备组件ref
+const selectIndex = ref() // 选择设备的行数
+// 点击选择设备
+const selectEquipment = (index: number) => {
+  selectIndex.value = index
+  selectEquipmentDialogRef.value.initDialog()
+}
+
+// 确定选择设备
+const confirmSelectEquipment = (value: any) => {
+  if (value.length) {
+    list.value[selectIndex.value].valueEquipmentId = value[0].id //	设备台账id
+    list.value[selectIndex.value].model = value[0].model //	型号规格
+    list.value[selectIndex.value].manufactureNo = value[0].manufactureNo //	出厂编号
+    list.value[selectIndex.value].valueEquipmentName = value[0].equipmentName //	示值设备名称
+  }
+}
 
 // ---------------------------------------按钮-----------------------------------------------------
 // 点击关闭
@@ -145,46 +183,59 @@
 
 // 点击保存
 const save = () => {
-  // if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
-  // if (!checkList(list.value, '核查项表格')) { return false }
-  // const params = {
-  //   itemCategoryId: form.value.itemCategoryId, // 核查项分类id
-  //   checkItemDataPistonGaugeList: list.value,
-  // }
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
-  // config(params).then((res) => {
-  //   ElMessage.success('已保存')
-  //   pageType.value = 'detail'
-  //   loading.close()
-  // })
+  if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
+  if (!checkList(list.value)) { return false }
+  if (!checkArrayDataUnique()) { return false }
+  const params = {
+    itemCategoryId: form.value.itemCategoryId, // 核查项分类id
+    checkItemDataETwoList: list.value,
+    equipmentId: infoId.value, // 配套设备id
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  config(params).then((res) => {
+    ElMessage.success('已保存')
+    pageType.value = 'detail'
+    loading.close()
+  })
+}
+
+// 校验表格中不能同时存在核查点两个属性的两条数据
+function checkArrayDataUnique() {
+  for (let i = 0; i < list.value.length; i++) {
+    const j = i + 1
+    for (let j = 0; j < list.value.length; j++) {
+      if (i !== j && list.value[i].checkPoint === list.value[j].checkPoint) {
+        ElMessage.warning(`核查项表格第${i + 1}行和第${j + 1}行的核查点重复了`)
+        return false
+      }
+    }
+  }
+  return true
 }
 
 // 获取详情
 const getInfo = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   const params = {
     equipmentId: equipmentId.value, // 设备id
     belongStandardEquipment: form.value.belongStandardEquipment, // 检校标准装置code
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     itemCategoryName: form.value.itemCategoryName, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   list.value = res.data.checkItemDataPistonGaugeList.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       resolution: Number(item.resolution),
-  //     }
-  //   })
-  //   loading.close()
-  // })
+  getCheckItemDetail(params).then((res) => {
+    if (res && res.data && res.data.checkItemDataETwoList && res.data.checkItemDataETwoList.length) {
+      list.value = res.data.checkItemDataETwoList
+    }
+    loading.close()
+  })
 }
 
 // ------------------------------------------钩子--------------------------------------------------
@@ -201,7 +252,7 @@
   form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 核查项标准装置id
   form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 核查项标准装置id
   equipmentId.value = $route.query.equipmentId as string // 设备id
-  // getInfo()
+  getInfo()
 })
 </script>
 
@@ -299,7 +350,7 @@
 
     <detail-block title="核查项" style="padding-bottom: 20px;">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow(list)">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
         <el-button type="info" @click="delRow(checkoutList, list)">
@@ -325,6 +376,57 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
+          <template #default="scope">
+            <!-- 核查点 -->
+            <el-select
+              v-if="item.value === 'checkPoint' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              filterable
+              :placeholder="pageType === 'detail' ? ' ' : `${item.text}`"
+            >
+              <el-option v-for="i of checkPointList" :key="i.id" :label="i.name" :value="i.value" />
+            </el-select>
+            <!-- 设备名称 -->
+            <el-input v-if="item.value === 'valueEquipmentName' && pageType !== 'detail'" v-model="scope.row[item.value]" :placeholder="pageType === 'detail' ? ' ' : `${item.text}`" disabled>
+              <template #append>
+                <el-button size="small" @click="selectEquipment(scope.$index)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+            <el-input
+              v-if="(item.value === 'model' || item.value === 'manufactureNo') && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              :placeholder="pageType === 'detail' ? ' ' : `${item.text}`"
+              disabled
+            />
+            <!-- 循环次数 -->
+            <el-input-number
+              v-if="item.value === 'cycleNumber' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+              :step="1"
+              :precision="0"
+              disabled
+            />
+            <!-- U(k=2) -->
+            <select-by-dict
+              v-if="item.value === 'urel' && pageType !== 'detail'"
+              v-model:model-value="scope.row[item.value]"
+              placeholder="U(k=2)"
+              dict-code="standard8U"
+            />
+            <!-- 核查类型 -->
+            <el-select v-if="pageType !== 'detail' && item.value === 'checkType'" v-model="scope.row[item.value]" disabled clearable multiple placeholder="请选择">
+              <el-option
+                v-for="item in checkTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
         </el-table-column>
       </el-table>
     </detail-block>
@@ -352,5 +454,8 @@
       </el-row>
     </el-form>
   </app-container>
+
+  <!-- 选择设备台账 -->
+  <select-equipment-dialog ref="selectEquipmentDialogRef" :is-multi="false" @confirm="confirmSelectEquipment" />
 </template>
 
diff --git a/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts b/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
index 44dc61a..8ac3b00 100644
--- a/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
+++ b/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
@@ -1,3 +1,15 @@
 export interface IList {
-  id?: string //	id，更新/删除使用参数
+  id: string //	id，更新/删除使用参数
+  checkPoint: string //	核查点
+  checkType: string[] //	核查类型(直接存字典value)
+  cycleNumber: string //	循环次数
+  equipmentId: string //	配套设备id
+  itemCategoryId: string //	核查项分类id(能够确定是哪个标准装置)
+  manufactureNo: string //	出厂编号
+  model: string //	型号规格
+  params: string //	核查项目(直接存字典value)
+  remark: string //	核查项备注
+  urel: number | undefined //	U(k=2)
+  valueEquipmentId: string //	设备台账id
+  valueEquipmentName: string //	示值设备名称
 }
diff --git a/src/views/equipement/standard/checkData/checkData-readMe.md b/src/views/equipement/standard/checkData/checkData-readMe.md
index 5e9598f..d5ac177 100644
--- a/src/views/equipement/standard/checkData/checkData-readMe.md
+++ b/src/views/equipement/standard/checkData/checkData-readMe.md
@@ -3,6 +3,6 @@
 1. 通用--稳定性：如果日期小于4个，那结论都是合格，反之，通过计算的结果去判断合格还是不合格
 2. 通用--稳定性：新建核查数据的时候，在保存之前要先校验一下本次核查日期有没有数据，没有不允许保存
           原因：如果保存成功，且结论为合格的话，那下一次新建核查会把这次的数据查出来（通过查询历史日期核查数据接口），则下一次的稳定性计算就会报错
-3. 二等铂标准装置：如果是否进行此项核查为否，则保存的时候不存本次数据，并且列表列表置灰不可编 辑。
+3. 二等铂标准装置：如果是否进行此项核查为否，则保存的时候不存本次数据，并且列表列表置灰不可编辑。
 4. 通用--根据核查配置项去影响核查数据的tab，无论是新建还是编辑都需要从核查配置中去判断展示哪些tab
 

diff --git a/src/commonMethods/useCheckList.ts b/src/commonMethods/useCheckList.ts
index 2497127..d661202 100644
--- a/src/commonMethods/useCheckList.ts
+++ b/src/commonMethods/useCheckList.ts
@@ -11,7 +11,7 @@
  * @param dependedValue // 被依赖项条件
  * @param requireLength // 要检查的表格数据长度是否大于0
  */
-export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false) {
+export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
diff --git a/src/views/equipement/standard/book/components/config/eighth/config.vue b/src/views/equipement/standard/book/components/config/eighth/config.vue
index fb7bacb..3b2a79e 100644
--- a/src/views/equipement/standard/book/components/config/eighth/config.vue
+++ b/src/views/equipement/standard/book/components/config/eighth/config.vue
@@ -2,13 +2,13 @@
 <script name="StandardBookEquipmentConfig" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList } from './eighth-interface'
-import TemplateTable from './templateTable.vue'
 import type { dictType } from '@/global'
 import { useCheckList } from '@/commonMethods/useCheckList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { config, getCheckItemDetail } from '@/api/equipment/standard/book'
-import { calc } from '@/utils/useCalc'
 import { getDictByCode } from '@/api/system/dict'
+import SelectByDict from '@/components/SelectByDict/index.vue'
+import SelectEquipmentDialog from '@/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue'
 
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,69 +42,89 @@
   }
   console.log('pageType.value', pageType.value)
 }
+// ------------------------------------------字典----------------------------------------------
+const checkTypeList = ref<dictType[]>([]) // 核查类型
+const checkPointList = ref<dictType[]>([]) // 核查类型
+
+/**
+ * 获取字典
+ */
+function getDict() {
+  // 核查类型
+  getDictByCode('bizFirstStandardCheckType').then((response) => {
+    checkTypeList.value = response.data
+  })
+  // 核查点
+  getDictByCode('Standard8CheckPoint').then((response) => {
+    checkPointList.value = response.data
+  })
+}
+getDict()
 // -------------------------------------------核查项-----------------------------------------------
 const list = ref<IList[]>([])
 const checkoutList = ref<IList[]>([])
 const columns = ref<TableColumn[]>([
-  { text: '核查点', value: 'params', align: 'center', required: true },
-  { text: '项目', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
-  { text: '核查类型', value: 'resolution', align: 'center', required: true },
-  { text: '扩展不确定度U', value: 'cycleNumber', align: 'center', required: true },
-  { text: '示值设备名称', value: 'checkType', align: 'center', required: true },
-  { text: '型号规格', value: 'checkType', align: 'center', required: true },
-  { text: '出厂编号', value: 'checkType', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
+  { text: '示值设备名称', value: 'valueEquipmentName', align: 'center', required: true, width: '220' },
+  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '180' },
+  { text: '核查类型', value: 'checkType', align: 'center', required: true, width: '180' },
+  { text: 'U(k=2)', value: 'urel', align: 'center', required: true, width: '180' },
 ])
 
-// 温度值多选
+// 多选
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
 
 // 校验表格（点击保存的时候、增加行用）
-const checkList = (list: any, title: string) => {
-  // return useCheckList(list, columns.value, title)
+const checkList = (list: any) => {
+  return useCheckList(list, columns.value, '核查项表格')
 }
 
 /**
- * 增加行公共方法
+ * 增加行
  * @param list 要操作的数组
  * @param title 操作的表格
  */
-const addRow = (list: IList[], title: string) => {
-  // if (checkList(list, `${title}表格`)) {
-  //   if (list.length) { // 增加行时默认上一行数据
-  //     list.push({
-  //       id: '',
-  //       checkPoint: list[list.length - 1].checkPoint, //	核查点(直接存字典value)
-  //       checkType: list[list.length - 1].checkType, //	核查类型
-  //       cycleNumber: list[list.length - 1].cycleNumber, //	循环次数
-  //       equipmentId: list[list.length - 1].equipmentId, //	配套设备id
-  //       itemCategoryId: list[list.length - 1].itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
-  //       params: list[list.length - 1].params, //	核查项目(直接存字典value)
-  //       remark: list[list.length - 1].remark, //	核查项备注(每个数据存储的核查项备注相同，前端取列表中一个即可)
-  //       resolution: list[list.length - 1].resolution, //		分辨力
-  //       testType: list[list.length - 1].testType, // 核查点类型(直接存字典value)
-  //       unit: list[list.length - 1].unit, //	单位(直接存字典value)
-  //       urel: list[list.length - 1].urel, //	测量标准相对扩展不确定度urel
-  //     })
-  //   }
-  //   else {
-  //     list.push({
-  //       checkPoint: '', //	核查点
-  //       checkType: '', //	核查类型(直接存字典value，多个逗号分隔)
-  //       cycleNumber: 6, //	循环次数
-  //       equipmentId: infoId.value, //	配套设备id
-  //       itemCategoryId: form.value.itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
-  //       params: '', //	核查项目(直接存字典value)
-  //       remark: '', //	核查项备注
-  //       resolution: 0.0001, //	分辨力
-  //       testType: title, //	核查点类型(直接存字典value)
-  //       unit: '', //	单位(直接存字典value)
-  //       urel: 0, //	测量标准相对扩展不确定度urel
-  //     })
-  //   }
-  // }
+const addRow = () => {
+  if (checkList(list.value)) {
+    if (list.value.length) { // 增加行时默认上一行数据
+      list.value.push({
+        id: '', //	id，更新/删除使用参数
+        checkPoint: list.value[list.value.length - 1].checkPoint, //	核查点
+        checkType: list.value[list.value.length - 1].checkType, //	核查类型(直接存字典value)
+        cycleNumber: list.value[list.value.length - 1].cycleNumber, //	循环次数
+        manufactureNo: list.value[list.value.length - 1].manufactureNo, //	出厂编号
+        model: list.value[list.value.length - 1].model, //	型号规格
+        params: list.value[list.value.length - 1].params, //	核查项目(直接存字典value)
+        remark: list.value[list.value.length - 1].remark, //	核查项备注
+        urel: list.value[list.value.length - 1].urel, //	U(k=2)
+        valueEquipmentId: list.value[list.value.length - 1].valueEquipmentId, //	设备台账id
+        valueEquipmentName: list.value[list.value.length - 1].valueEquipmentName, //	示值设备名称
+        equipmentId: list.value[list.value.length - 1].equipmentId, //	配套设备id
+        itemCategoryId: list.value[list.value.length - 1].itemCategoryId, // 核查项分类id(能够确定是哪个标准装置)
+      })
+    }
+    else {
+      list.value.push({
+        id: '', //	id，更新/删除使用参数
+        checkPoint: '', //	核查点
+        checkType: ['重复性', '稳定性'], //	核查类型(直接存字典value)
+        cycleNumber: '6', //	循环次数
+        manufactureNo: '', //	出厂编号
+        model: '', //	型号规格
+        params: '', //	核查项目(直接存字典value)
+        remark: '', //	核查项备注
+        urel: undefined, //	U(k=2)
+        valueEquipmentId: '', //	设备台账id
+        valueEquipmentName: '', //	示值设备名称
+        equipmentId: infoId.value, //	配套设备id
+        itemCategoryId: form.value.itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
+      })
+    }
+  }
 }
 /**
  * 删除行公共方法
@@ -121,6 +141,24 @@
     })
   }
 }
+// --------------------------------------选择设备-------------------------------------------------
+const selectEquipmentDialogRef = ref() // 选择设备组件ref
+const selectIndex = ref() // 选择设备的行数
+// 点击选择设备
+const selectEquipment = (index: number) => {
+  selectIndex.value = index
+  selectEquipmentDialogRef.value.initDialog()
+}
+
+// 确定选择设备
+const confirmSelectEquipment = (value: any) => {
+  if (value.length) {
+    list.value[selectIndex.value].valueEquipmentId = value[0].id //	设备台账id
+    list.value[selectIndex.value].model = value[0].model //	型号规格
+    list.value[selectIndex.value].manufactureNo = value[0].manufactureNo //	出厂编号
+    list.value[selectIndex.value].valueEquipmentName = value[0].equipmentName //	示值设备名称
+  }
+}
 
 // ---------------------------------------按钮-----------------------------------------------------
 // 点击关闭
@@ -145,46 +183,59 @@
 
 // 点击保存
 const save = () => {
-  // if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
-  // if (!checkList(list.value, '核查项表格')) { return false }
-  // const params = {
-  //   itemCategoryId: form.value.itemCategoryId, // 核查项分类id
-  //   checkItemDataPistonGaugeList: list.value,
-  // }
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
-  // config(params).then((res) => {
-  //   ElMessage.success('已保存')
-  //   pageType.value = 'detail'
-  //   loading.close()
-  // })
+  if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
+  if (!checkList(list.value)) { return false }
+  if (!checkArrayDataUnique()) { return false }
+  const params = {
+    itemCategoryId: form.value.itemCategoryId, // 核查项分类id
+    checkItemDataETwoList: list.value,
+    equipmentId: infoId.value, // 配套设备id
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  config(params).then((res) => {
+    ElMessage.success('已保存')
+    pageType.value = 'detail'
+    loading.close()
+  })
+}
+
+// 校验表格中不能同时存在核查点两个属性的两条数据
+function checkArrayDataUnique() {
+  for (let i = 0; i < list.value.length; i++) {
+    const j = i + 1
+    for (let j = 0; j < list.value.length; j++) {
+      if (i !== j && list.value[i].checkPoint === list.value[j].checkPoint) {
+        ElMessage.warning(`核查项表格第${i + 1}行和第${j + 1}行的核查点重复了`)
+        return false
+      }
+    }
+  }
+  return true
 }
 
 // 获取详情
 const getInfo = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   const params = {
     equipmentId: equipmentId.value, // 设备id
     belongStandardEquipment: form.value.belongStandardEquipment, // 检校标准装置code
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     itemCategoryName: form.value.itemCategoryName, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   list.value = res.data.checkItemDataPistonGaugeList.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       resolution: Number(item.resolution),
-  //     }
-  //   })
-  //   loading.close()
-  // })
+  getCheckItemDetail(params).then((res) => {
+    if (res && res.data && res.data.checkItemDataETwoList && res.data.checkItemDataETwoList.length) {
+      list.value = res.data.checkItemDataETwoList
+    }
+    loading.close()
+  })
 }
 
 // ------------------------------------------钩子--------------------------------------------------
@@ -201,7 +252,7 @@
   form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 核查项标准装置id
   form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 核查项标准装置id
   equipmentId.value = $route.query.equipmentId as string // 设备id
-  // getInfo()
+  getInfo()
 })
 </script>
 
@@ -299,7 +350,7 @@
 
     <detail-block title="核查项" style="padding-bottom: 20px;">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow(list)">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
         <el-button type="info" @click="delRow(checkoutList, list)">
@@ -325,6 +376,57 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
+          <template #default="scope">
+            <!-- 核查点 -->
+            <el-select
+              v-if="item.value === 'checkPoint' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              filterable
+              :placeholder="pageType === 'detail' ? ' ' : `${item.text}`"
+            >
+              <el-option v-for="i of checkPointList" :key="i.id" :label="i.name" :value="i.value" />
+            </el-select>
+            <!-- 设备名称 -->
+            <el-input v-if="item.value === 'valueEquipmentName' && pageType !== 'detail'" v-model="scope.row[item.value]" :placeholder="pageType === 'detail' ? ' ' : `${item.text}`" disabled>
+              <template #append>
+                <el-button size="small" @click="selectEquipment(scope.$index)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+            <el-input
+              v-if="(item.value === 'model' || item.value === 'manufactureNo') && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              :placeholder="pageType === 'detail' ? ' ' : `${item.text}`"
+              disabled
+            />
+            <!-- 循环次数 -->
+            <el-input-number
+              v-if="item.value === 'cycleNumber' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+              :step="1"
+              :precision="0"
+              disabled
+            />
+            <!-- U(k=2) -->
+            <select-by-dict
+              v-if="item.value === 'urel' && pageType !== 'detail'"
+              v-model:model-value="scope.row[item.value]"
+              placeholder="U(k=2)"
+              dict-code="standard8U"
+            />
+            <!-- 核查类型 -->
+            <el-select v-if="pageType !== 'detail' && item.value === 'checkType'" v-model="scope.row[item.value]" disabled clearable multiple placeholder="请选择">
+              <el-option
+                v-for="item in checkTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
         </el-table-column>
       </el-table>
     </detail-block>
@@ -352,5 +454,8 @@
       </el-row>
     </el-form>
   </app-container>
+
+  <!-- 选择设备台账 -->
+  <select-equipment-dialog ref="selectEquipmentDialogRef" :is-multi="false" @confirm="confirmSelectEquipment" />
 </template>
 
diff --git a/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts b/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
index 44dc61a..8ac3b00 100644
--- a/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
+++ b/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
@@ -1,3 +1,15 @@
 export interface IList {
-  id?: string //	id，更新/删除使用参数
+  id: string //	id，更新/删除使用参数
+  checkPoint: string //	核查点
+  checkType: string[] //	核查类型(直接存字典value)
+  cycleNumber: string //	循环次数
+  equipmentId: string //	配套设备id
+  itemCategoryId: string //	核查项分类id(能够确定是哪个标准装置)
+  manufactureNo: string //	出厂编号
+  model: string //	型号规格
+  params: string //	核查项目(直接存字典value)
+  remark: string //	核查项备注
+  urel: number | undefined //	U(k=2)
+  valueEquipmentId: string //	设备台账id
+  valueEquipmentName: string //	示值设备名称
 }
diff --git a/src/views/equipement/standard/checkData/checkData-readMe.md b/src/views/equipement/standard/checkData/checkData-readMe.md
index 5e9598f..d5ac177 100644
--- a/src/views/equipement/standard/checkData/checkData-readMe.md
+++ b/src/views/equipement/standard/checkData/checkData-readMe.md
@@ -3,6 +3,6 @@
 1. 通用--稳定性：如果日期小于4个，那结论都是合格，反之，通过计算的结果去判断合格还是不合格
 2. 通用--稳定性：新建核查数据的时候，在保存之前要先校验一下本次核查日期有没有数据，没有不允许保存
           原因：如果保存成功，且结论为合格的话，那下一次新建核查会把这次的数据查出来（通过查询历史日期核查数据接口），则下一次的稳定性计算就会报错
-3. 二等铂标准装置：如果是否进行此项核查为否，则保存的时候不存本次数据，并且列表列表置灰不可编 辑。
+3. 二等铂标准装置：如果是否进行此项核查为否，则保存的时候不存本次数据，并且列表列表置灰不可编辑。
 4. 通用--根据核查配置项去影响核查数据的tab，无论是新建还是编辑都需要从核查配置中去判断展示哪些tab
 
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index f339d6e..a73988e 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -627,7 +627,7 @@
                 :disabled="pageType === 'detail'"
                 @change="handleChangeAddress"
               >
-                <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>

diff --git a/src/commonMethods/useCheckList.ts b/src/commonMethods/useCheckList.ts
index 2497127..d661202 100644
--- a/src/commonMethods/useCheckList.ts
+++ b/src/commonMethods/useCheckList.ts
@@ -11,7 +11,7 @@
  * @param dependedValue // 被依赖项条件
  * @param requireLength // 要检查的表格数据长度是否大于0
  */
-export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false) {
+export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
diff --git a/src/views/equipement/standard/book/components/config/eighth/config.vue b/src/views/equipement/standard/book/components/config/eighth/config.vue
index fb7bacb..3b2a79e 100644
--- a/src/views/equipement/standard/book/components/config/eighth/config.vue
+++ b/src/views/equipement/standard/book/components/config/eighth/config.vue
@@ -2,13 +2,13 @@
 <script name="StandardBookEquipmentConfig" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList } from './eighth-interface'
-import TemplateTable from './templateTable.vue'
 import type { dictType } from '@/global'
 import { useCheckList } from '@/commonMethods/useCheckList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { config, getCheckItemDetail } from '@/api/equipment/standard/book'
-import { calc } from '@/utils/useCalc'
 import { getDictByCode } from '@/api/system/dict'
+import SelectByDict from '@/components/SelectByDict/index.vue'
+import SelectEquipmentDialog from '@/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue'
 
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,69 +42,89 @@
   }
   console.log('pageType.value', pageType.value)
 }
+// ------------------------------------------字典----------------------------------------------
+const checkTypeList = ref<dictType[]>([]) // 核查类型
+const checkPointList = ref<dictType[]>([]) // 核查类型
+
+/**
+ * 获取字典
+ */
+function getDict() {
+  // 核查类型
+  getDictByCode('bizFirstStandardCheckType').then((response) => {
+    checkTypeList.value = response.data
+  })
+  // 核查点
+  getDictByCode('Standard8CheckPoint').then((response) => {
+    checkPointList.value = response.data
+  })
+}
+getDict()
 // -------------------------------------------核查项-----------------------------------------------
 const list = ref<IList[]>([])
 const checkoutList = ref<IList[]>([])
 const columns = ref<TableColumn[]>([
-  { text: '核查点', value: 'params', align: 'center', required: true },
-  { text: '项目', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
-  { text: '核查类型', value: 'resolution', align: 'center', required: true },
-  { text: '扩展不确定度U', value: 'cycleNumber', align: 'center', required: true },
-  { text: '示值设备名称', value: 'checkType', align: 'center', required: true },
-  { text: '型号规格', value: 'checkType', align: 'center', required: true },
-  { text: '出厂编号', value: 'checkType', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
+  { text: '示值设备名称', value: 'valueEquipmentName', align: 'center', required: true, width: '220' },
+  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '180' },
+  { text: '核查类型', value: 'checkType', align: 'center', required: true, width: '180' },
+  { text: 'U(k=2)', value: 'urel', align: 'center', required: true, width: '180' },
 ])
 
-// 温度值多选
+// 多选
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
 
 // 校验表格（点击保存的时候、增加行用）
-const checkList = (list: any, title: string) => {
-  // return useCheckList(list, columns.value, title)
+const checkList = (list: any) => {
+  return useCheckList(list, columns.value, '核查项表格')
 }
 
 /**
- * 增加行公共方法
+ * 增加行
  * @param list 要操作的数组
  * @param title 操作的表格
  */
-const addRow = (list: IList[], title: string) => {
-  // if (checkList(list, `${title}表格`)) {
-  //   if (list.length) { // 增加行时默认上一行数据
-  //     list.push({
-  //       id: '',
-  //       checkPoint: list[list.length - 1].checkPoint, //	核查点(直接存字典value)
-  //       checkType: list[list.length - 1].checkType, //	核查类型
-  //       cycleNumber: list[list.length - 1].cycleNumber, //	循环次数
-  //       equipmentId: list[list.length - 1].equipmentId, //	配套设备id
-  //       itemCategoryId: list[list.length - 1].itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
-  //       params: list[list.length - 1].params, //	核查项目(直接存字典value)
-  //       remark: list[list.length - 1].remark, //	核查项备注(每个数据存储的核查项备注相同，前端取列表中一个即可)
-  //       resolution: list[list.length - 1].resolution, //		分辨力
-  //       testType: list[list.length - 1].testType, // 核查点类型(直接存字典value)
-  //       unit: list[list.length - 1].unit, //	单位(直接存字典value)
-  //       urel: list[list.length - 1].urel, //	测量标准相对扩展不确定度urel
-  //     })
-  //   }
-  //   else {
-  //     list.push({
-  //       checkPoint: '', //	核查点
-  //       checkType: '', //	核查类型(直接存字典value，多个逗号分隔)
-  //       cycleNumber: 6, //	循环次数
-  //       equipmentId: infoId.value, //	配套设备id
-  //       itemCategoryId: form.value.itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
-  //       params: '', //	核查项目(直接存字典value)
-  //       remark: '', //	核查项备注
-  //       resolution: 0.0001, //	分辨力
-  //       testType: title, //	核查点类型(直接存字典value)
-  //       unit: '', //	单位(直接存字典value)
-  //       urel: 0, //	测量标准相对扩展不确定度urel
-  //     })
-  //   }
-  // }
+const addRow = () => {
+  if (checkList(list.value)) {
+    if (list.value.length) { // 增加行时默认上一行数据
+      list.value.push({
+        id: '', //	id，更新/删除使用参数
+        checkPoint: list.value[list.value.length - 1].checkPoint, //	核查点
+        checkType: list.value[list.value.length - 1].checkType, //	核查类型(直接存字典value)
+        cycleNumber: list.value[list.value.length - 1].cycleNumber, //	循环次数
+        manufactureNo: list.value[list.value.length - 1].manufactureNo, //	出厂编号
+        model: list.value[list.value.length - 1].model, //	型号规格
+        params: list.value[list.value.length - 1].params, //	核查项目(直接存字典value)
+        remark: list.value[list.value.length - 1].remark, //	核查项备注
+        urel: list.value[list.value.length - 1].urel, //	U(k=2)
+        valueEquipmentId: list.value[list.value.length - 1].valueEquipmentId, //	设备台账id
+        valueEquipmentName: list.value[list.value.length - 1].valueEquipmentName, //	示值设备名称
+        equipmentId: list.value[list.value.length - 1].equipmentId, //	配套设备id
+        itemCategoryId: list.value[list.value.length - 1].itemCategoryId, // 核查项分类id(能够确定是哪个标准装置)
+      })
+    }
+    else {
+      list.value.push({
+        id: '', //	id，更新/删除使用参数
+        checkPoint: '', //	核查点
+        checkType: ['重复性', '稳定性'], //	核查类型(直接存字典value)
+        cycleNumber: '6', //	循环次数
+        manufactureNo: '', //	出厂编号
+        model: '', //	型号规格
+        params: '', //	核查项目(直接存字典value)
+        remark: '', //	核查项备注
+        urel: undefined, //	U(k=2)
+        valueEquipmentId: '', //	设备台账id
+        valueEquipmentName: '', //	示值设备名称
+        equipmentId: infoId.value, //	配套设备id
+        itemCategoryId: form.value.itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
+      })
+    }
+  }
 }
 /**
  * 删除行公共方法
@@ -121,6 +141,24 @@
     })
   }
 }
+// --------------------------------------选择设备-------------------------------------------------
+const selectEquipmentDialogRef = ref() // 选择设备组件ref
+const selectIndex = ref() // 选择设备的行数
+// 点击选择设备
+const selectEquipment = (index: number) => {
+  selectIndex.value = index
+  selectEquipmentDialogRef.value.initDialog()
+}
+
+// 确定选择设备
+const confirmSelectEquipment = (value: any) => {
+  if (value.length) {
+    list.value[selectIndex.value].valueEquipmentId = value[0].id //	设备台账id
+    list.value[selectIndex.value].model = value[0].model //	型号规格
+    list.value[selectIndex.value].manufactureNo = value[0].manufactureNo //	出厂编号
+    list.value[selectIndex.value].valueEquipmentName = value[0].equipmentName //	示值设备名称
+  }
+}
 
 // ---------------------------------------按钮-----------------------------------------------------
 // 点击关闭
@@ -145,46 +183,59 @@
 
 // 点击保存
 const save = () => {
-  // if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
-  // if (!checkList(list.value, '核查项表格')) { return false }
-  // const params = {
-  //   itemCategoryId: form.value.itemCategoryId, // 核查项分类id
-  //   checkItemDataPistonGaugeList: list.value,
-  // }
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
-  // config(params).then((res) => {
-  //   ElMessage.success('已保存')
-  //   pageType.value = 'detail'
-  //   loading.close()
-  // })
+  if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
+  if (!checkList(list.value)) { return false }
+  if (!checkArrayDataUnique()) { return false }
+  const params = {
+    itemCategoryId: form.value.itemCategoryId, // 核查项分类id
+    checkItemDataETwoList: list.value,
+    equipmentId: infoId.value, // 配套设备id
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  config(params).then((res) => {
+    ElMessage.success('已保存')
+    pageType.value = 'detail'
+    loading.close()
+  })
+}
+
+// 校验表格中不能同时存在核查点两个属性的两条数据
+function checkArrayDataUnique() {
+  for (let i = 0; i < list.value.length; i++) {
+    const j = i + 1
+    for (let j = 0; j < list.value.length; j++) {
+      if (i !== j && list.value[i].checkPoint === list.value[j].checkPoint) {
+        ElMessage.warning(`核查项表格第${i + 1}行和第${j + 1}行的核查点重复了`)
+        return false
+      }
+    }
+  }
+  return true
 }
 
 // 获取详情
 const getInfo = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   const params = {
     equipmentId: equipmentId.value, // 设备id
     belongStandardEquipment: form.value.belongStandardEquipment, // 检校标准装置code
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     itemCategoryName: form.value.itemCategoryName, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   list.value = res.data.checkItemDataPistonGaugeList.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       resolution: Number(item.resolution),
-  //     }
-  //   })
-  //   loading.close()
-  // })
+  getCheckItemDetail(params).then((res) => {
+    if (res && res.data && res.data.checkItemDataETwoList && res.data.checkItemDataETwoList.length) {
+      list.value = res.data.checkItemDataETwoList
+    }
+    loading.close()
+  })
 }
 
 // ------------------------------------------钩子--------------------------------------------------
@@ -201,7 +252,7 @@
   form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 核查项标准装置id
   form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 核查项标准装置id
   equipmentId.value = $route.query.equipmentId as string // 设备id
-  // getInfo()
+  getInfo()
 })
 </script>
 
@@ -299,7 +350,7 @@
 
     <detail-block title="核查项" style="padding-bottom: 20px;">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow(list)">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
         <el-button type="info" @click="delRow(checkoutList, list)">
@@ -325,6 +376,57 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
+          <template #default="scope">
+            <!-- 核查点 -->
+            <el-select
+              v-if="item.value === 'checkPoint' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              filterable
+              :placeholder="pageType === 'detail' ? ' ' : `${item.text}`"
+            >
+              <el-option v-for="i of checkPointList" :key="i.id" :label="i.name" :value="i.value" />
+            </el-select>
+            <!-- 设备名称 -->
+            <el-input v-if="item.value === 'valueEquipmentName' && pageType !== 'detail'" v-model="scope.row[item.value]" :placeholder="pageType === 'detail' ? ' ' : `${item.text}`" disabled>
+              <template #append>
+                <el-button size="small" @click="selectEquipment(scope.$index)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+            <el-input
+              v-if="(item.value === 'model' || item.value === 'manufactureNo') && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              :placeholder="pageType === 'detail' ? ' ' : `${item.text}`"
+              disabled
+            />
+            <!-- 循环次数 -->
+            <el-input-number
+              v-if="item.value === 'cycleNumber' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+              :step="1"
+              :precision="0"
+              disabled
+            />
+            <!-- U(k=2) -->
+            <select-by-dict
+              v-if="item.value === 'urel' && pageType !== 'detail'"
+              v-model:model-value="scope.row[item.value]"
+              placeholder="U(k=2)"
+              dict-code="standard8U"
+            />
+            <!-- 核查类型 -->
+            <el-select v-if="pageType !== 'detail' && item.value === 'checkType'" v-model="scope.row[item.value]" disabled clearable multiple placeholder="请选择">
+              <el-option
+                v-for="item in checkTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
         </el-table-column>
       </el-table>
     </detail-block>
@@ -352,5 +454,8 @@
       </el-row>
     </el-form>
   </app-container>
+
+  <!-- 选择设备台账 -->
+  <select-equipment-dialog ref="selectEquipmentDialogRef" :is-multi="false" @confirm="confirmSelectEquipment" />
 </template>
 
diff --git a/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts b/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
index 44dc61a..8ac3b00 100644
--- a/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
+++ b/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
@@ -1,3 +1,15 @@
 export interface IList {
-  id?: string //	id，更新/删除使用参数
+  id: string //	id，更新/删除使用参数
+  checkPoint: string //	核查点
+  checkType: string[] //	核查类型(直接存字典value)
+  cycleNumber: string //	循环次数
+  equipmentId: string //	配套设备id
+  itemCategoryId: string //	核查项分类id(能够确定是哪个标准装置)
+  manufactureNo: string //	出厂编号
+  model: string //	型号规格
+  params: string //	核查项目(直接存字典value)
+  remark: string //	核查项备注
+  urel: number | undefined //	U(k=2)
+  valueEquipmentId: string //	设备台账id
+  valueEquipmentName: string //	示值设备名称
 }
diff --git a/src/views/equipement/standard/checkData/checkData-readMe.md b/src/views/equipement/standard/checkData/checkData-readMe.md
index 5e9598f..d5ac177 100644
--- a/src/views/equipement/standard/checkData/checkData-readMe.md
+++ b/src/views/equipement/standard/checkData/checkData-readMe.md
@@ -3,6 +3,6 @@
 1. 通用--稳定性：如果日期小于4个，那结论都是合格，反之，通过计算的结果去判断合格还是不合格
 2. 通用--稳定性：新建核查数据的时候，在保存之前要先校验一下本次核查日期有没有数据，没有不允许保存
           原因：如果保存成功，且结论为合格的话，那下一次新建核查会把这次的数据查出来（通过查询历史日期核查数据接口），则下一次的稳定性计算就会报错
-3. 二等铂标准装置：如果是否进行此项核查为否，则保存的时候不存本次数据，并且列表列表置灰不可编 辑。
+3. 二等铂标准装置：如果是否进行此项核查为否，则保存的时候不存本次数据，并且列表列表置灰不可编辑。
 4. 通用--根据核查配置项去影响核查数据的tab，无论是新建还是编辑都需要从核查配置中去判断展示哪些tab
 
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index f339d6e..a73988e 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -627,7 +627,7 @@
                 :disabled="pageType === 'detail'"
                 @change="handleChangeAddress"
               >
-                <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
diff --git a/src/views/equipement/standard/checkRecord/components/basic.vue b/src/views/equipement/standard/checkRecord/components/basic.vue
index 79148ab..0c86eb9 100644
--- a/src/views/equipement/standard/checkRecord/components/basic.vue
+++ b/src/views/equipement/standard/checkRecord/components/basic.vue
@@ -50,7 +50,7 @@
 const fileType = ref('pdf') // 文件类型，pdf还是word
 const fetchInfo = () => {
   getInfo({ id: infoId.value }).then((res) => {
-    form.value.checkRecordFile = res.data.checkRecordWordFile // 核查记录模板
+    form.value.checkRecordFile = res.data.checkRecordWordFile || res.data.checkRecordFile // 核查记录模板
     console.log('------核查记录模板', form.value.checkRecordFile)
     if (form.value.checkRecordFile.slice(form.value.checkRecordFile.length - 3) === 'pdf') {
       fileType.value = 'pdf'

diff --git a/src/commonMethods/useCheckList.ts b/src/commonMethods/useCheckList.ts
index 2497127..d661202 100644
--- a/src/commonMethods/useCheckList.ts
+++ b/src/commonMethods/useCheckList.ts
@@ -11,7 +11,7 @@
  * @param dependedValue // 被依赖项条件
  * @param requireLength // 要检查的表格数据长度是否大于0
  */
-export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false) {
+export function useCheckList(list: any, columns: any, tableTitle = '', depend?: string, depended?: string, dependedValue?: number | string, requireLength = false): boolean {
   for (let index = 0; index < list.length; index++) {
     const item = list[index]
     for (const prop of columns) {
diff --git a/src/views/equipement/standard/book/components/config/eighth/config.vue b/src/views/equipement/standard/book/components/config/eighth/config.vue
index fb7bacb..3b2a79e 100644
--- a/src/views/equipement/standard/book/components/config/eighth/config.vue
+++ b/src/views/equipement/standard/book/components/config/eighth/config.vue
@@ -2,13 +2,13 @@
 <script name="StandardBookEquipmentConfig" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IList } from './eighth-interface'
-import TemplateTable from './templateTable.vue'
 import type { dictType } from '@/global'
 import { useCheckList } from '@/commonMethods/useCheckList'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { config, getCheckItemDetail } from '@/api/equipment/standard/book'
-import { calc } from '@/utils/useCalc'
 import { getDictByCode } from '@/api/system/dict'
+import SelectByDict from '@/components/SelectByDict/index.vue'
+import SelectEquipmentDialog from '@/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue'
 
 const textMap: { [key: string]: string } = {
   edit: '编辑',
@@ -42,69 +42,89 @@
   }
   console.log('pageType.value', pageType.value)
 }
+// ------------------------------------------字典----------------------------------------------
+const checkTypeList = ref<dictType[]>([]) // 核查类型
+const checkPointList = ref<dictType[]>([]) // 核查类型
+
+/**
+ * 获取字典
+ */
+function getDict() {
+  // 核查类型
+  getDictByCode('bizFirstStandardCheckType').then((response) => {
+    checkTypeList.value = response.data
+  })
+  // 核查点
+  getDictByCode('Standard8CheckPoint').then((response) => {
+    checkPointList.value = response.data
+  })
+}
+getDict()
 // -------------------------------------------核查项-----------------------------------------------
 const list = ref<IList[]>([])
 const checkoutList = ref<IList[]>([])
 const columns = ref<TableColumn[]>([
-  { text: '核查点', value: 'params', align: 'center', required: true },
-  { text: '项目', value: 'checkPoint', align: 'center', required: true },
-  { text: '单位', value: 'unit', align: 'center', required: true },
-  { text: '核查类型', value: 'resolution', align: 'center', required: true },
-  { text: '扩展不确定度U', value: 'cycleNumber', align: 'center', required: true },
-  { text: '示值设备名称', value: 'checkType', align: 'center', required: true },
-  { text: '型号规格', value: 'checkType', align: 'center', required: true },
-  { text: '出厂编号', value: 'checkType', align: 'center', required: true },
+  { text: '核查点', value: 'checkPoint', align: 'center', required: true },
+  { text: '示值设备名称', value: 'valueEquipmentName', align: 'center', required: true, width: '220' },
+  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '循环次数', value: 'cycleNumber', align: 'center', required: true, width: '180' },
+  { text: '核查类型', value: 'checkType', align: 'center', required: true, width: '180' },
+  { text: 'U(k=2)', value: 'urel', align: 'center', required: true, width: '180' },
 ])
 
-// 温度值多选
+// 多选
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
 
 // 校验表格（点击保存的时候、增加行用）
-const checkList = (list: any, title: string) => {
-  // return useCheckList(list, columns.value, title)
+const checkList = (list: any) => {
+  return useCheckList(list, columns.value, '核查项表格')
 }
 
 /**
- * 增加行公共方法
+ * 增加行
  * @param list 要操作的数组
  * @param title 操作的表格
  */
-const addRow = (list: IList[], title: string) => {
-  // if (checkList(list, `${title}表格`)) {
-  //   if (list.length) { // 增加行时默认上一行数据
-  //     list.push({
-  //       id: '',
-  //       checkPoint: list[list.length - 1].checkPoint, //	核查点(直接存字典value)
-  //       checkType: list[list.length - 1].checkType, //	核查类型
-  //       cycleNumber: list[list.length - 1].cycleNumber, //	循环次数
-  //       equipmentId: list[list.length - 1].equipmentId, //	配套设备id
-  //       itemCategoryId: list[list.length - 1].itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
-  //       params: list[list.length - 1].params, //	核查项目(直接存字典value)
-  //       remark: list[list.length - 1].remark, //	核查项备注(每个数据存储的核查项备注相同，前端取列表中一个即可)
-  //       resolution: list[list.length - 1].resolution, //		分辨力
-  //       testType: list[list.length - 1].testType, // 核查点类型(直接存字典value)
-  //       unit: list[list.length - 1].unit, //	单位(直接存字典value)
-  //       urel: list[list.length - 1].urel, //	测量标准相对扩展不确定度urel
-  //     })
-  //   }
-  //   else {
-  //     list.push({
-  //       checkPoint: '', //	核查点
-  //       checkType: '', //	核查类型(直接存字典value，多个逗号分隔)
-  //       cycleNumber: 6, //	循环次数
-  //       equipmentId: infoId.value, //	配套设备id
-  //       itemCategoryId: form.value.itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
-  //       params: '', //	核查项目(直接存字典value)
-  //       remark: '', //	核查项备注
-  //       resolution: 0.0001, //	分辨力
-  //       testType: title, //	核查点类型(直接存字典value)
-  //       unit: '', //	单位(直接存字典value)
-  //       urel: 0, //	测量标准相对扩展不确定度urel
-  //     })
-  //   }
-  // }
+const addRow = () => {
+  if (checkList(list.value)) {
+    if (list.value.length) { // 增加行时默认上一行数据
+      list.value.push({
+        id: '', //	id，更新/删除使用参数
+        checkPoint: list.value[list.value.length - 1].checkPoint, //	核查点
+        checkType: list.value[list.value.length - 1].checkType, //	核查类型(直接存字典value)
+        cycleNumber: list.value[list.value.length - 1].cycleNumber, //	循环次数
+        manufactureNo: list.value[list.value.length - 1].manufactureNo, //	出厂编号
+        model: list.value[list.value.length - 1].model, //	型号规格
+        params: list.value[list.value.length - 1].params, //	核查项目(直接存字典value)
+        remark: list.value[list.value.length - 1].remark, //	核查项备注
+        urel: list.value[list.value.length - 1].urel, //	U(k=2)
+        valueEquipmentId: list.value[list.value.length - 1].valueEquipmentId, //	设备台账id
+        valueEquipmentName: list.value[list.value.length - 1].valueEquipmentName, //	示值设备名称
+        equipmentId: list.value[list.value.length - 1].equipmentId, //	配套设备id
+        itemCategoryId: list.value[list.value.length - 1].itemCategoryId, // 核查项分类id(能够确定是哪个标准装置)
+      })
+    }
+    else {
+      list.value.push({
+        id: '', //	id，更新/删除使用参数
+        checkPoint: '', //	核查点
+        checkType: ['重复性', '稳定性'], //	核查类型(直接存字典value)
+        cycleNumber: '6', //	循环次数
+        manufactureNo: '', //	出厂编号
+        model: '', //	型号规格
+        params: '', //	核查项目(直接存字典value)
+        remark: '', //	核查项备注
+        urel: undefined, //	U(k=2)
+        valueEquipmentId: '', //	设备台账id
+        valueEquipmentName: '', //	示值设备名称
+        equipmentId: infoId.value, //	配套设备id
+        itemCategoryId: form.value.itemCategoryId, //	核查项分类id(能够确定是哪个标准装置)
+      })
+    }
+  }
 }
 /**
  * 删除行公共方法
@@ -121,6 +141,24 @@
     })
   }
 }
+// --------------------------------------选择设备-------------------------------------------------
+const selectEquipmentDialogRef = ref() // 选择设备组件ref
+const selectIndex = ref() // 选择设备的行数
+// 点击选择设备
+const selectEquipment = (index: number) => {
+  selectIndex.value = index
+  selectEquipmentDialogRef.value.initDialog()
+}
+
+// 确定选择设备
+const confirmSelectEquipment = (value: any) => {
+  if (value.length) {
+    list.value[selectIndex.value].valueEquipmentId = value[0].id //	设备台账id
+    list.value[selectIndex.value].model = value[0].model //	型号规格
+    list.value[selectIndex.value].manufactureNo = value[0].manufactureNo //	出厂编号
+    list.value[selectIndex.value].valueEquipmentName = value[0].equipmentName //	示值设备名称
+  }
+}
 
 // ---------------------------------------按钮-----------------------------------------------------
 // 点击关闭
@@ -145,46 +183,59 @@
 
 // 点击保存
 const save = () => {
-  // if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
-  // if (!checkList(list.value, '核查项表格')) { return false }
-  // const params = {
-  //   itemCategoryId: form.value.itemCategoryId, // 核查项分类id
-  //   checkItemDataPistonGaugeList: list.value,
-  // }
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
-  // config(params).then((res) => {
-  //   ElMessage.success('已保存')
-  //   pageType.value = 'detail'
-  //   loading.close()
-  // })
+  if (!list.value.length) { ElMessage.warning('核查项不能为空'); return false }
+  if (!checkList(list.value)) { return false }
+  if (!checkArrayDataUnique()) { return false }
+  const params = {
+    itemCategoryId: form.value.itemCategoryId, // 核查项分类id
+    checkItemDataETwoList: list.value,
+    equipmentId: infoId.value, // 配套设备id
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  config(params).then((res) => {
+    ElMessage.success('已保存')
+    pageType.value = 'detail'
+    loading.close()
+  })
+}
+
+// 校验表格中不能同时存在核查点两个属性的两条数据
+function checkArrayDataUnique() {
+  for (let i = 0; i < list.value.length; i++) {
+    const j = i + 1
+    for (let j = 0; j < list.value.length; j++) {
+      if (i !== j && list.value[i].checkPoint === list.value[j].checkPoint) {
+        ElMessage.warning(`核查项表格第${i + 1}行和第${j + 1}行的核查点重复了`)
+        return false
+      }
+    }
+  }
+  return true
 }
 
 // 获取详情
 const getInfo = () => {
-  // const loading = ElLoading.service({
-  //   lock: true,
-  //   text: '加载中',
-  //   background: 'rgba(255, 255, 255, 0.6)',
-  // })
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
   const params = {
     equipmentId: equipmentId.value, // 设备id
     belongStandardEquipment: form.value.belongStandardEquipment, // 检校标准装置code
     itemCategoryId: form.value.itemCategoryId, // 核查项分类id
     itemCategoryName: form.value.itemCategoryName, // 核查项分类名称
   }
-  // getCheckItemDetail(params).then((res) => {
-  //   list.value = res.data.checkItemDataPistonGaugeList.map((item: any) => {
-  //     return {
-  //       ...item,
-  //       resolution: Number(item.resolution),
-  //     }
-  //   })
-  //   loading.close()
-  // })
+  getCheckItemDetail(params).then((res) => {
+    if (res && res.data && res.data.checkItemDataETwoList && res.data.checkItemDataETwoList.length) {
+      list.value = res.data.checkItemDataETwoList
+    }
+    loading.close()
+  })
 }
 
 // ------------------------------------------钩子--------------------------------------------------
@@ -201,7 +252,7 @@
   form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string // 核查项标准装置id
   form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string // 核查项标准装置id
   equipmentId.value = $route.query.equipmentId as string // 设备id
-  // getInfo()
+  getInfo()
 })
 </script>
 
@@ -299,7 +350,7 @@
 
     <detail-block title="核查项" style="padding-bottom: 20px;">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="primary" @click="addRow(list)">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
         <el-button type="info" @click="delRow(checkoutList, list)">
@@ -325,6 +376,57 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
+          <template #default="scope">
+            <!-- 核查点 -->
+            <el-select
+              v-if="item.value === 'checkPoint' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              filterable
+              :placeholder="pageType === 'detail' ? ' ' : `${item.text}`"
+            >
+              <el-option v-for="i of checkPointList" :key="i.id" :label="i.name" :value="i.value" />
+            </el-select>
+            <!-- 设备名称 -->
+            <el-input v-if="item.value === 'valueEquipmentName' && pageType !== 'detail'" v-model="scope.row[item.value]" :placeholder="pageType === 'detail' ? ' ' : `${item.text}`" disabled>
+              <template #append>
+                <el-button size="small" @click="selectEquipment(scope.$index)">
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+            <el-input
+              v-if="(item.value === 'model' || item.value === 'manufactureNo') && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              :placeholder="pageType === 'detail' ? ' ' : `${item.text}`"
+              disabled
+            />
+            <!-- 循环次数 -->
+            <el-input-number
+              v-if="item.value === 'cycleNumber' && pageType !== 'detail'"
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+              :step="1"
+              :precision="0"
+              disabled
+            />
+            <!-- U(k=2) -->
+            <select-by-dict
+              v-if="item.value === 'urel' && pageType !== 'detail'"
+              v-model:model-value="scope.row[item.value]"
+              placeholder="U(k=2)"
+              dict-code="standard8U"
+            />
+            <!-- 核查类型 -->
+            <el-select v-if="pageType !== 'detail' && item.value === 'checkType'" v-model="scope.row[item.value]" disabled clearable multiple placeholder="请选择">
+              <el-option
+                v-for="item in checkTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
         </el-table-column>
       </el-table>
     </detail-block>
@@ -352,5 +454,8 @@
       </el-row>
     </el-form>
   </app-container>
+
+  <!-- 选择设备台账 -->
+  <select-equipment-dialog ref="selectEquipmentDialogRef" :is-multi="false" @confirm="confirmSelectEquipment" />
 </template>
 
diff --git a/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts b/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
index 44dc61a..8ac3b00 100644
--- a/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
+++ b/src/views/equipement/standard/book/components/config/eighth/eighth-interface.ts
@@ -1,3 +1,15 @@
 export interface IList {
-  id?: string //	id，更新/删除使用参数
+  id: string //	id，更新/删除使用参数
+  checkPoint: string //	核查点
+  checkType: string[] //	核查类型(直接存字典value)
+  cycleNumber: string //	循环次数
+  equipmentId: string //	配套设备id
+  itemCategoryId: string //	核查项分类id(能够确定是哪个标准装置)
+  manufactureNo: string //	出厂编号
+  model: string //	型号规格
+  params: string //	核查项目(直接存字典value)
+  remark: string //	核查项备注
+  urel: number | undefined //	U(k=2)
+  valueEquipmentId: string //	设备台账id
+  valueEquipmentName: string //	示值设备名称
 }
diff --git a/src/views/equipement/standard/checkData/checkData-readMe.md b/src/views/equipement/standard/checkData/checkData-readMe.md
index 5e9598f..d5ac177 100644
--- a/src/views/equipement/standard/checkData/checkData-readMe.md
+++ b/src/views/equipement/standard/checkData/checkData-readMe.md
@@ -3,6 +3,6 @@
 1. 通用--稳定性：如果日期小于4个，那结论都是合格，反之，通过计算的结果去判断合格还是不合格
 2. 通用--稳定性：新建核查数据的时候，在保存之前要先校验一下本次核查日期有没有数据，没有不允许保存
           原因：如果保存成功，且结论为合格的话，那下一次新建核查会把这次的数据查出来（通过查询历史日期核查数据接口），则下一次的稳定性计算就会报错
-3. 二等铂标准装置：如果是否进行此项核查为否，则保存的时候不存本次数据，并且列表列表置灰不可编 辑。
+3. 二等铂标准装置：如果是否进行此项核查为否，则保存的时候不存本次数据，并且列表列表置灰不可编辑。
 4. 通用--根据核查配置项去影响核查数据的tab，无论是新建还是编辑都需要从核查配置中去判断展示哪些tab
 
diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue
index f339d6e..a73988e 100644
--- a/src/views/equipement/standard/checkData/detail.vue
+++ b/src/views/equipement/standard/checkData/detail.vue
@@ -627,7 +627,7 @@
                 :disabled="pageType === 'detail'"
                 @change="handleChangeAddress"
               >
-                <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id" />
+                <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
diff --git a/src/views/equipement/standard/checkRecord/components/basic.vue b/src/views/equipement/standard/checkRecord/components/basic.vue
index 79148ab..0c86eb9 100644
--- a/src/views/equipement/standard/checkRecord/components/basic.vue
+++ b/src/views/equipement/standard/checkRecord/components/basic.vue
@@ -50,7 +50,7 @@
 const fileType = ref('pdf') // 文件类型，pdf还是word
 const fetchInfo = () => {
   getInfo({ id: infoId.value }).then((res) => {
-    form.value.checkRecordFile = res.data.checkRecordWordFile // 核查记录模板
+    form.value.checkRecordFile = res.data.checkRecordWordFile || res.data.checkRecordFile // 核查记录模板
     console.log('------核查记录模板', form.value.checkRecordFile)
     if (form.value.checkRecordFile.slice(form.value.checkRecordFile.length - 3) === 'pdf') {
       fileType.value = 'pdf'
diff --git a/src/views/equipement/standard/checkRecord/detail.vue b/src/views/equipement/standard/checkRecord/detail.vue
index a93f6c8..2e9e9e1 100644
--- a/src/views/equipement/standard/checkRecord/detail.vue
+++ b/src/views/equipement/standard/checkRecord/detail.vue
@@ -173,7 +173,7 @@
 }
 // -----------------------------------------------钩子-----------------------------
 watch(() => approvalStatusName.value, (val) => {
-  if (val === '全部' || val === '草稿箱' || pageType.value === 'add') { // 全部草稿箱把审批详情删了
+  if (val === '草稿箱' || pageType.value === 'add') { // 全部草稿箱把审批详情删了
     if (radioMenus.value[radioMenus.value.length - 1].value === 'approval-record') {
       radioMenus.value.pop()
     }