diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
new file mode 100644
index 0000000..0b4fecf
--- /dev/null
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -0,0 +1,201 @@
+<!-- 查询所用设备（测量设备） -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: 160, fixed: true },
+  { text: '名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: 58 },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: 165 },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
new file mode 100644
index 0000000..0b4fecf
--- /dev/null
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -0,0 +1,201 @@
+<!-- 查询所用设备（测量设备） -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: 160, fixed: true },
+  { text: '名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: 58 },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: 165 },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
new file mode 100644
index 0000000..6ff117e
--- /dev/null
+++ b/src/views/business/lab/components/selectSample.vue
@@ -0,0 +1,186 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        id: item.sampleId,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
new file mode 100644
index 0000000..0b4fecf
--- /dev/null
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -0,0 +1,201 @@
+<!-- 查询所用设备（测量设备） -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: 160, fixed: true },
+  { text: '名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: 58 },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: 165 },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
new file mode 100644
index 0000000..6ff117e
--- /dev/null
+++ b/src/views/business/lab/components/selectSample.vue
@@ -0,0 +1,186 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        id: item.sampleId,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectTemplate.vue b/src/views/business/lab/components/selectTemplate.vue
new file mode 100644
index 0000000..bb4b98e
--- /dev/null
+++ b/src/views/business/lab/components/selectTemplate.vue
@@ -0,0 +1,159 @@
+<!-- 选择原始记录模板 -->
+<script lang="ts" setup name="SelectTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180', fixed: true },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150', fixed: true },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '原始记录模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateCreator = ''
+  searchQuery.templateName = ''
+  searchQuery.templateNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原始记录模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
new file mode 100644
index 0000000..0b4fecf
--- /dev/null
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -0,0 +1,201 @@
+<!-- 查询所用设备（测量设备） -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: 160, fixed: true },
+  { text: '名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: 58 },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: 165 },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
new file mode 100644
index 0000000..6ff117e
--- /dev/null
+++ b/src/views/business/lab/components/selectSample.vue
@@ -0,0 +1,186 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        id: item.sampleId,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectTemplate.vue b/src/views/business/lab/components/selectTemplate.vue
new file mode 100644
index 0000000..bb4b98e
--- /dev/null
+++ b/src/views/business/lab/components/selectTemplate.vue
@@ -0,0 +1,159 @@
+<!-- 选择原始记录模板 -->
+<script lang="ts" setup name="SelectTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180', fixed: true },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150', fixed: true },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '原始记录模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateCreator = ''
+  searchQuery.templateName = ''
+  searchQuery.templateNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原始记录模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 63a0849..79bb1a7 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -26,6 +26,17 @@
 const loadingTable = ref(false) // 表格loading
 const trainTime = ref('') // 记录时间数组
 const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
@@ -43,17 +54,7 @@
   loadingTable.value = false
 }
 fetchData(true)
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
-  { text: '房间号', value: 'roomNumber', align: 'center' },
-  { text: '记录人', value: 'recorder', align: 'center' },
-  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
-  { text: '温度(℃)', value: 'temperature', align: 'center' },
-  { text: '湿度(%)', value: 'humidity', align: 'center' },
-  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
-  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -148,7 +149,7 @@
   fetchData(true)
 }
 
-// 获取下拉框数据
+// 获取房间号
 getTypeSelect('roomNumber').then((res) => {
   roomNumberList.value = res.data
 })

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
new file mode 100644
index 0000000..0b4fecf
--- /dev/null
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -0,0 +1,201 @@
+<!-- 查询所用设备（测量设备） -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: 160, fixed: true },
+  { text: '名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: 58 },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: 165 },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
new file mode 100644
index 0000000..6ff117e
--- /dev/null
+++ b/src/views/business/lab/components/selectSample.vue
@@ -0,0 +1,186 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        id: item.sampleId,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectTemplate.vue b/src/views/business/lab/components/selectTemplate.vue
new file mode 100644
index 0000000..bb4b98e
--- /dev/null
+++ b/src/views/business/lab/components/selectTemplate.vue
@@ -0,0 +1,159 @@
+<!-- 选择原始记录模板 -->
+<script lang="ts" setup name="SelectTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180', fixed: true },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150', fixed: true },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '原始记录模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateCreator = ''
+  searchQuery.templateName = ''
+  searchQuery.templateNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原始记录模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 63a0849..79bb1a7 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -26,6 +26,17 @@
 const loadingTable = ref(false) // 表格loading
 const trainTime = ref('') // 记录时间数组
 const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
@@ -43,17 +54,7 @@
   loadingTable.value = false
 }
 fetchData(true)
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
-  { text: '房间号', value: 'roomNumber', align: 'center' },
-  { text: '记录人', value: 'recorder', align: 'center' },
-  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
-  { text: '温度(℃)', value: 'temperature', align: 'center' },
-  { text: '湿度(%)', value: 'humidity', align: 'center' },
-  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
-  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -148,7 +149,7 @@
   fetchData(true)
 }
 
-// 获取下拉框数据
+// 获取房间号
 getTypeSelect('roomNumber').then((res) => {
   roomNumberList.value = res.data
 })
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index ef91bfd..d8b58bf 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -1,6 +1,6 @@
 // 列表查询接口
 export interface IListQuery {
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   manufacturingNo: string	// 出厂编号
   originalRecordCode: string	// 原始记录单编号
@@ -22,7 +22,7 @@
     manufacturingNo: string	// 出厂编号
     sampleModel: string // 样品型号
   }
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   createTime: string // 创建时间
   remark: string // 备注
@@ -35,3 +35,14 @@
   value: string
 }
 
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
+

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
new file mode 100644
index 0000000..0b4fecf
--- /dev/null
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -0,0 +1,201 @@
+<!-- 查询所用设备（测量设备） -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: 160, fixed: true },
+  { text: '名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: 58 },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: 165 },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
new file mode 100644
index 0000000..6ff117e
--- /dev/null
+++ b/src/views/business/lab/components/selectSample.vue
@@ -0,0 +1,186 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        id: item.sampleId,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectTemplate.vue b/src/views/business/lab/components/selectTemplate.vue
new file mode 100644
index 0000000..bb4b98e
--- /dev/null
+++ b/src/views/business/lab/components/selectTemplate.vue
@@ -0,0 +1,159 @@
+<!-- 选择原始记录模板 -->
+<script lang="ts" setup name="SelectTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180', fixed: true },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150', fixed: true },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '原始记录模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateCreator = ''
+  searchQuery.templateName = ''
+  searchQuery.templateNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原始记录模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 63a0849..79bb1a7 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -26,6 +26,17 @@
 const loadingTable = ref(false) // 表格loading
 const trainTime = ref('') // 记录时间数组
 const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
@@ -43,17 +54,7 @@
   loadingTable.value = false
 }
 fetchData(true)
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
-  { text: '房间号', value: 'roomNumber', align: 'center' },
-  { text: '记录人', value: 'recorder', align: 'center' },
-  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
-  { text: '温度(℃)', value: 'temperature', align: 'center' },
-  { text: '湿度(%)', value: 'humidity', align: 'center' },
-  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
-  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -148,7 +149,7 @@
   fetchData(true)
 }
 
-// 获取下拉框数据
+// 获取房间号
 getTypeSelect('roomNumber').then((res) => {
   roomNumberList.value = res.data
 })
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index ef91bfd..d8b58bf 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -1,6 +1,6 @@
 // 列表查询接口
 export interface IListQuery {
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   manufacturingNo: string	// 出厂编号
   originalRecordCode: string	// 原始记录单编号
@@ -22,7 +22,7 @@
     manufacturingNo: string	// 出厂编号
     sampleModel: string // 样品型号
   }
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   createTime: string // 创建时间
   remark: string // 备注
@@ -35,3 +35,14 @@
   value: string
 }
 
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 7994d21..d663752 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -13,7 +13,7 @@
 const $router = useRouter() // 初始化路由
 // 查询条件
 const listQuery = ref<IListQuery>({
-  calibrationCategory: '',	// 校验类别
+  measureCategory: '',	// 校验类别
   createUser: '',	// 创建人
   manufacturingNo: '',	// 出厂编号
   originalRecordCode: '',	// 原始记录单编号
@@ -38,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
@@ -65,7 +65,7 @@
         sampleName: item.customerSampleInfo.sampleName, // 样品名称
         manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
         sampleModel: item.customerSampleInfo.sampleModel, // 型号
-        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory) ? mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name : '', // 校检类别
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
       }
     })
     total.value = res.data.total
@@ -81,7 +81,7 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    calibrationCategory: '',	// 校验类别
+    measureCategory: '',	// 校验类别
     createUser: '',	// 创建人
     manufacturingNo: '',	// 出厂编号
     originalRecordCode: '',	// 原始记录单编号
@@ -103,7 +103,7 @@
   })
   if (list.value.length > 0) {
     const params = {
-      calibrationCategory: '',	// 校验类别
+      measureCategory: '',	// 校验类别
       createUser: '',	// 创建人
       manufacturingNo: '',	// 出厂编号
       originalRecordCode: '',	// 原始记录单编号
@@ -239,7 +239,7 @@
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.calibrationCategory"
+          v-model="listQuery.measureCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
new file mode 100644
index 0000000..0b4fecf
--- /dev/null
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -0,0 +1,201 @@
+<!-- 查询所用设备（测量设备） -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: 160, fixed: true },
+  { text: '名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: 58 },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: 165 },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
new file mode 100644
index 0000000..6ff117e
--- /dev/null
+++ b/src/views/business/lab/components/selectSample.vue
@@ -0,0 +1,186 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        id: item.sampleId,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectTemplate.vue b/src/views/business/lab/components/selectTemplate.vue
new file mode 100644
index 0000000..bb4b98e
--- /dev/null
+++ b/src/views/business/lab/components/selectTemplate.vue
@@ -0,0 +1,159 @@
+<!-- 选择原始记录模板 -->
+<script lang="ts" setup name="SelectTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180', fixed: true },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150', fixed: true },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '原始记录模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateCreator = ''
+  searchQuery.templateName = ''
+  searchQuery.templateNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原始记录模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 63a0849..79bb1a7 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -26,6 +26,17 @@
 const loadingTable = ref(false) // 表格loading
 const trainTime = ref('') // 记录时间数组
 const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
@@ -43,17 +54,7 @@
   loadingTable.value = false
 }
 fetchData(true)
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
-  { text: '房间号', value: 'roomNumber', align: 'center' },
-  { text: '记录人', value: 'recorder', align: 'center' },
-  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
-  { text: '温度(℃)', value: 'temperature', align: 'center' },
-  { text: '湿度(%)', value: 'humidity', align: 'center' },
-  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
-  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -148,7 +149,7 @@
   fetchData(true)
 }
 
-// 获取下拉框数据
+// 获取房间号
 getTypeSelect('roomNumber').then((res) => {
   roomNumberList.value = res.data
 })
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index ef91bfd..d8b58bf 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -1,6 +1,6 @@
 // 列表查询接口
 export interface IListQuery {
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   manufacturingNo: string	// 出厂编号
   originalRecordCode: string	// 原始记录单编号
@@ -22,7 +22,7 @@
     manufacturingNo: string	// 出厂编号
     sampleModel: string // 样品型号
   }
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   createTime: string // 创建时间
   remark: string // 备注
@@ -35,3 +35,14 @@
   value: string
 }
 
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 7994d21..d663752 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -13,7 +13,7 @@
 const $router = useRouter() // 初始化路由
 // 查询条件
 const listQuery = ref<IListQuery>({
-  calibrationCategory: '',	// 校验类别
+  measureCategory: '',	// 校验类别
   createUser: '',	// 创建人
   manufacturingNo: '',	// 出厂编号
   originalRecordCode: '',	// 原始记录单编号
@@ -38,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
@@ -65,7 +65,7 @@
         sampleName: item.customerSampleInfo.sampleName, // 样品名称
         manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
         sampleModel: item.customerSampleInfo.sampleModel, // 型号
-        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory) ? mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name : '', // 校检类别
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
       }
     })
     total.value = res.data.total
@@ -81,7 +81,7 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    calibrationCategory: '',	// 校验类别
+    measureCategory: '',	// 校验类别
     createUser: '',	// 创建人
     manufacturingNo: '',	// 出厂编号
     originalRecordCode: '',	// 原始记录单编号
@@ -103,7 +103,7 @@
   })
   if (list.value.length > 0) {
     const params = {
-      calibrationCategory: '',	// 校验类别
+      measureCategory: '',	// 校验类别
       createUser: '',	// 创建人
       manufacturingNo: '',	// 出厂编号
       originalRecordCode: '',	// 原始记录单编号
@@ -239,7 +239,7 @@
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.calibrationCategory"
+          v-model="listQuery.measureCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index cd53837..ad1a2c7 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -4,9 +4,11 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import OrderDialog from '../components/orderDialog.vue'
 import SampleDialog from '../components/sampleDialog.vue'
-import PrimitiveLogDialog from '../components/primitiveLogDialog.vue'
+import selectSample from '../components/selectSample.vue'
+import selectTemplate from '../components/selectTemplate.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { columnsType, dictType } from './primitiveLogList'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
@@ -21,15 +23,27 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const orderVisible = ref(false) // 控制委托书对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -43,59 +57,79 @@
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
-// 新建上传参数
+// 新建上传参数--用于调接口上传
 const formInline = ref({
-  originalRecordCode: '', // 	原始记录编号
+  originalRecordCode: '', // 原始记录编号
   originalRecordName: '', // 原始记录名称
-  calibrationCategory: '', // 检校类别
+  measureCategory: '', // 检校类别
   calibrationTime: '', // 		检校时间
   environmentId: '', // 环境记录单id
   calibrationPlace: '', // 检校地点
   orderId: '', // 	委托书id
+  customerId: '', // 	委托方id
   sampleId: '', // 	样品id
   templateId: '', // 	原始记录模板id
-  originalRecordFile: '', // 	minio存储文件名
+  templateName: '', // 原始记录模板名称
+  originalRecordFile: '', // 	minio存储文件名--附件
   remark: '', // 备注
   createUser: '', // 创建人id
+  businessEnvironmentRecord: {
+    temperature: '', // 环境记录单温度
+    humidity: '', // 环境记录单相对湿度
+    environmentCode: '', // 环境记录单编号
+  }, // 环境记录单信息
+  businessOrder: { // 委托书
+    orderCode: '', // 委托书编号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    customerPhone: '', // 委托方电话
+    customerAddress: '', // 委托方地址
+  },
+  customerSampleInfo: { // 样品信息
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    manufacturingNo: '', // 出厂编号
+    sampleModel: '', // 型号
+    manufacturer: '', // 生产厂家
+    deliverer: '', // 送检人
+    delivererTel: '', // 送检人联系方式
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
+    measureContent: '', // 检定项目
+  },
+  fixedAssetsList: [] as any, // 测量设备
 })
-// 数据详情无需上传
+// 数据详情无需上传--用于显示详情
 const fromListInfo = ref({
-  environmentName: '', // 环境记录单名称
+  environmentCode: '', // 环境记录单编号
   calibrationLocation: '', // 校验地点
   temperature: '', // 环境记录单温度
-  dampness: '', // 环境记录单相对湿度
-  orderNo: '', // 委托方编号
-  orderCode: '', // 委托方代码
-  orderName: '', // 委托方名称
-  orderPhone: '', // 委托方电话
-  orderLocation: '', // 委托方地址
+  humidity: '', // 环境记录单相对湿度
+  orderCode: '', // 委托书编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerAddress: '', // 委托方地址
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  factoryNo: '', // 出厂编号
-  model: '', // 型号
+  manufacturingNo: '', // 出厂编号
+  sampleModel: '', // 型号
   manufacturer: '', // 生产厂家
-  submissionUser: '', // 送检人
-  submissionPhone: '', // 送检人联系方式
-  submissionTime: '', // 送检时间
-  inspectionTime: '', // 检完时间
-  verificationItems: '', // 检定项目
-  templateName: '', // 原始记录模板
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+  submissionTime: '', // 预计送达时间
+  inspectionTime: '', // 要求检完时间
+  measureContent: '', // 检定项目
+  templateId: '', // 原始记录模板id
+  originalRecordFile: '', // 原始记录附件
+  sampleId: '', // 样品id
+  orderId: '', // 委托书id
   fixedAssetsList: [], // 底部设备数组
   fileList: [], // 底部文件表格数组
   applyEquipmentList: [], // 底部设备详情数组
+  businessEnvironmentRecord: {}, // 环境记录单信息
 })
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-}
-// 模拟检测类型的下拉框数组
-const standardOwnerOptions = ref([
-  { name: '检测', id: '1' },
-  { name: '校准', id: '2' },
-  { name: '检定', id: '3' },
-  { name: '验收检定', id: '4' },
-])
+
 // 数据
 const list = ref<object[]>([])
 // 标准配套设备更换表格总数
@@ -116,22 +150,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -154,7 +180,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -163,6 +189,7 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
@@ -225,62 +252,29 @@
 }
 // 表单验证规则
 const rules = ref({
-  originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
-  calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
-  ],
-  calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
-  ],
-  environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
-  ],
-  calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
-  ],
-  temperature: [
+  'originalRecordName': [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
+  'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
+  'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
+  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
+  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+  'businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
   ],
-  orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
-  ],
-  sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
-  ],
-  factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  model: [
-    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
-  ],
-  manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
-  ],
-  verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
-  ],
+  'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 // 第几条数据选择
 const listIndex = ref(0)
@@ -298,6 +292,14 @@
   listIndex.value = index
   equipmentDialog.value.initDialog()
 }
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+
 // 点击增加行
 const addRoow = () => {
   if (
@@ -336,11 +338,13 @@
     fromListInfo.value.fileList.push({})
   }
 }
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -434,47 +438,134 @@
   standarDialog.value.initDialog()
 }
 
+// ----------------------------选择环境记录单------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
 const environmentalClick = () => {
   environmentalDialog.value.initDialog()
 }
+// 选择环境记录单表格确认
+const environmentalAdd = (data: IEnvironmental) => {
+  formInline.value.environmentId = data.id // 环境记录单id
+  formInline.value.businessEnvironmentRecord = data // 环境记录单信息
+}
 
-// 环境记录单表格确认
-const environmentalAdd = (data: rowReturn) => {
-  formInline.value.environmentId = data.id
+// ---------------------------------委托书---------------------------------------
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
 }
-// 委托方组件ref
-const orderDialog = ref()
-// 点击选择委托书
-const orderClick = () => {
-  orderDialog.value.initDialog()
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
 }
-// 委托方表格确认后
-const orderAdd = (data: rowReturn) => {
-  formInline.value.orderId = data.id
+// 选好委托书
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    formInline.value.orderId = val[0].id // 委托书id
+    formInline.value.customerId = val[0].customerId// 委托方id
+    formInline.value.businessOrder = val[0]
+  }
 }
-// 样品组件ref
-const sampleDialog = ref()
+// -----------------------------------样品----------------------------------------
 // 点击选择样品
-const sampleClick = () => {
-  sampleDialog.value.initDialog()
+const handleClickSample = () => {
+  if (!formInline.value.orderId) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  sampleVisible.value = true
 }
-// 样品组件弹窗选择完成后
-const sampleAdd = (data: rowReturn) => {
-  formInline.value.sampleId = data.id
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
 }
-// 原始记录组件ref
-const primitiveLogDialog = ref()
-// 点击原始记录选择
-const primitiveLogClick = () => {
-  primitiveLogDialog.value.initDialog()
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    formInline.value.sampleId = val[0].id// 样品id
+    formInline.value.customerSampleInfo = val[0] // 样品信息
+  }
 }
-// 原始记录选择完成之后
-const primitiveLogAdd = (data: rowReturn) => {
-  formInline.value.templateId = data.id
+
+// -----------------------------------原始记录模板-------------------------------
+// 选择环境记录单Ref
+const templateDialog = ref()
+// 选择环境记录单
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
 }
+// 选择环境记录单表格确认
+const confirmCheckoutTemplate = (val: any) => {
+  // formInline.value.environmentId = data.id // 环境记录单id
+  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
+  formInline.value.templateId = val.id// 	原始记录模板id
+  formInline.value.templateName = val.templateName// 原始记录模板名称
+}
+
+// -------------------------------------所用设备-----------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.fixedAssetsList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.fixedAssetsList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  console.log('------')
+  console.log(val)
+
+  if (val && val.length) {
+    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -563,6 +654,9 @@
   standard: '',
   extarCss: '',
 })
+onMounted(() => {
+  getDict() // 获取字典
+})
 </script>
 
 <template>
@@ -595,13 +689,12 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordCode">
+            <el-form-item label="原始记录编号:">
               <el-input
                 v-model.trim="formInline.originalRecordCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入原始记录编号'"
+                placeholder="系统自动生成"
                 class="full-width-input"
-                clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -617,17 +710,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校专业:" prop="calibrationCategory">
+            <el-form-item label="检校类别:" prop="measureCategory">
               <el-select
-                v-model="formInline.calibrationCategory"
+                v-model="formInline.measureCategory"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                :placeholder="pageType === 'detail' ? '' : '请选择检校类别'"
                 size="default"
                 style="width: 100%;"
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
+                  v-for="item in mesureCategoryList"
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
@@ -649,27 +742,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="环境记录单编号:" prop="environmentName">
-              <el-input
-                v-model.trim="fromListInfo.environmentName"
-                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单编号'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
-              >
-                <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                    @click="environmentalClick"
-                  >
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
@@ -684,39 +756,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="环境记录单编号:" prop="businessEnvironmentRecord.environmentCode">
               <el-input
-                v-model.trim="fromListInfo.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                v-model.trim="formInline.businessEnvironmentRecord.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单编号'"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="dampness">
-              <el-input
-                v-model.trim="fromListInfo.dampness"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="委托书编号:" prop="orderNo">
-              <el-input
-                v-model.trim="fromListInfo.orderNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="orderClick"
+                    @click="environmentalClick"
                   >
                     选择
                   </el-button>
@@ -725,55 +775,96 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="orderCode">
+            <el-form-item label="温度(℃):" prop="businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.orderCode"
+                v-model.trim="formInline.businessEnvironmentRecord.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):" prop="businessEnvironmentRecord.humidity">
+              <el-input
+                v-model.trim="formInline.businessEnvironmentRecord.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="委托书编号:" prop="businessOrder.orderCode">
+              <el-input
+                v-model.trim="formInline.businessOrder.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
+              <el-input
+                v-model.trim="formInline.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="orderName">
+            <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.orderName"
+                v-model.trim="formInline.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="orderPhone">
+            <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.orderPhone"
+                v-model.trim="formInline.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="orderLocation">
+            <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.orderLocation"
+                v-model.trim="formInline.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -782,7 +873,7 @@
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="sampleClick"
+                    @click="handleClickSample"
                   >
                     选择
                   </el-button>
@@ -791,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -804,9 +895,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="factoryNo">
+            <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.factoryNo"
+                v-model.trim="formInline.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -815,9 +906,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -826,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -836,12 +927,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.submissionUser"
+                v-model.trim="formInline.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -852,7 +941,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.submissionPhone"
+                v-model.trim="formInline.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -863,7 +952,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.submissionTime"
+                v-model="formInline.customerSampleInfo.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -875,12 +964,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.inspectionTime"
+                v-model="formInline.customerSampleInfo.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -891,9 +980,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="fromListInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -919,16 +1008,16 @@
           <el-col :span="6">
             <el-form-item label="原始记录模板:">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录模板'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="primitiveLogClick"
+                    @click="handleClickTemplate"
                   >
                     选择
                   </el-button>
@@ -953,19 +1042,19 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -981,6 +1070,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -999,7 +1089,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1064,15 +1154,15 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
-  <!-- 选择委托方弹窗 -->
-  <order-dialog ref="orderDialog" @add="orderAdd" />
-  <!-- 选择样品弹窗 -->
-  <sample-dialog ref="sampleDialog" @add="sampleAdd" />
-  <!-- 选择原始记录单 -->
-  <primitive-log-dialog ref="primitiveLogDialog" @add="primitiveLogAdd" />
+  <!-- 选择委托书组件 -->
+  <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+  <!-- 选择样品组件 -->
+  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
 </template>
 
 <style lang="scss">

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
new file mode 100644
index 0000000..0b4fecf
--- /dev/null
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -0,0 +1,201 @@
+<!-- 查询所用设备（测量设备） -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: 160, fixed: true },
+  { text: '名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: 58 },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: 165 },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
new file mode 100644
index 0000000..6ff117e
--- /dev/null
+++ b/src/views/business/lab/components/selectSample.vue
@@ -0,0 +1,186 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        id: item.sampleId,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectTemplate.vue b/src/views/business/lab/components/selectTemplate.vue
new file mode 100644
index 0000000..bb4b98e
--- /dev/null
+++ b/src/views/business/lab/components/selectTemplate.vue
@@ -0,0 +1,159 @@
+<!-- 选择原始记录模板 -->
+<script lang="ts" setup name="SelectTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180', fixed: true },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150', fixed: true },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '原始记录模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateCreator = ''
+  searchQuery.templateName = ''
+  searchQuery.templateNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原始记录模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 63a0849..79bb1a7 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -26,6 +26,17 @@
 const loadingTable = ref(false) // 表格loading
 const trainTime = ref('') // 记录时间数组
 const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
@@ -43,17 +54,7 @@
   loadingTable.value = false
 }
 fetchData(true)
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
-  { text: '房间号', value: 'roomNumber', align: 'center' },
-  { text: '记录人', value: 'recorder', align: 'center' },
-  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
-  { text: '温度(℃)', value: 'temperature', align: 'center' },
-  { text: '湿度(%)', value: 'humidity', align: 'center' },
-  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
-  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -148,7 +149,7 @@
   fetchData(true)
 }
 
-// 获取下拉框数据
+// 获取房间号
 getTypeSelect('roomNumber').then((res) => {
   roomNumberList.value = res.data
 })
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index ef91bfd..d8b58bf 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -1,6 +1,6 @@
 // 列表查询接口
 export interface IListQuery {
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   manufacturingNo: string	// 出厂编号
   originalRecordCode: string	// 原始记录单编号
@@ -22,7 +22,7 @@
     manufacturingNo: string	// 出厂编号
     sampleModel: string // 样品型号
   }
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   createTime: string // 创建时间
   remark: string // 备注
@@ -35,3 +35,14 @@
   value: string
 }
 
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 7994d21..d663752 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -13,7 +13,7 @@
 const $router = useRouter() // 初始化路由
 // 查询条件
 const listQuery = ref<IListQuery>({
-  calibrationCategory: '',	// 校验类别
+  measureCategory: '',	// 校验类别
   createUser: '',	// 创建人
   manufacturingNo: '',	// 出厂编号
   originalRecordCode: '',	// 原始记录单编号
@@ -38,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
@@ -65,7 +65,7 @@
         sampleName: item.customerSampleInfo.sampleName, // 样品名称
         manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
         sampleModel: item.customerSampleInfo.sampleModel, // 型号
-        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory) ? mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name : '', // 校检类别
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
       }
     })
     total.value = res.data.total
@@ -81,7 +81,7 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    calibrationCategory: '',	// 校验类别
+    measureCategory: '',	// 校验类别
     createUser: '',	// 创建人
     manufacturingNo: '',	// 出厂编号
     originalRecordCode: '',	// 原始记录单编号
@@ -103,7 +103,7 @@
   })
   if (list.value.length > 0) {
     const params = {
-      calibrationCategory: '',	// 校验类别
+      measureCategory: '',	// 校验类别
       createUser: '',	// 创建人
       manufacturingNo: '',	// 出厂编号
       originalRecordCode: '',	// 原始记录单编号
@@ -239,7 +239,7 @@
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.calibrationCategory"
+          v-model="listQuery.measureCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index cd53837..ad1a2c7 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -4,9 +4,11 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import OrderDialog from '../components/orderDialog.vue'
 import SampleDialog from '../components/sampleDialog.vue'
-import PrimitiveLogDialog from '../components/primitiveLogDialog.vue'
+import selectSample from '../components/selectSample.vue'
+import selectTemplate from '../components/selectTemplate.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { columnsType, dictType } from './primitiveLogList'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
@@ -21,15 +23,27 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const orderVisible = ref(false) // 控制委托书对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -43,59 +57,79 @@
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
-// 新建上传参数
+// 新建上传参数--用于调接口上传
 const formInline = ref({
-  originalRecordCode: '', // 	原始记录编号
+  originalRecordCode: '', // 原始记录编号
   originalRecordName: '', // 原始记录名称
-  calibrationCategory: '', // 检校类别
+  measureCategory: '', // 检校类别
   calibrationTime: '', // 		检校时间
   environmentId: '', // 环境记录单id
   calibrationPlace: '', // 检校地点
   orderId: '', // 	委托书id
+  customerId: '', // 	委托方id
   sampleId: '', // 	样品id
   templateId: '', // 	原始记录模板id
-  originalRecordFile: '', // 	minio存储文件名
+  templateName: '', // 原始记录模板名称
+  originalRecordFile: '', // 	minio存储文件名--附件
   remark: '', // 备注
   createUser: '', // 创建人id
+  businessEnvironmentRecord: {
+    temperature: '', // 环境记录单温度
+    humidity: '', // 环境记录单相对湿度
+    environmentCode: '', // 环境记录单编号
+  }, // 环境记录单信息
+  businessOrder: { // 委托书
+    orderCode: '', // 委托书编号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    customerPhone: '', // 委托方电话
+    customerAddress: '', // 委托方地址
+  },
+  customerSampleInfo: { // 样品信息
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    manufacturingNo: '', // 出厂编号
+    sampleModel: '', // 型号
+    manufacturer: '', // 生产厂家
+    deliverer: '', // 送检人
+    delivererTel: '', // 送检人联系方式
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
+    measureContent: '', // 检定项目
+  },
+  fixedAssetsList: [] as any, // 测量设备
 })
-// 数据详情无需上传
+// 数据详情无需上传--用于显示详情
 const fromListInfo = ref({
-  environmentName: '', // 环境记录单名称
+  environmentCode: '', // 环境记录单编号
   calibrationLocation: '', // 校验地点
   temperature: '', // 环境记录单温度
-  dampness: '', // 环境记录单相对湿度
-  orderNo: '', // 委托方编号
-  orderCode: '', // 委托方代码
-  orderName: '', // 委托方名称
-  orderPhone: '', // 委托方电话
-  orderLocation: '', // 委托方地址
+  humidity: '', // 环境记录单相对湿度
+  orderCode: '', // 委托书编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerAddress: '', // 委托方地址
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  factoryNo: '', // 出厂编号
-  model: '', // 型号
+  manufacturingNo: '', // 出厂编号
+  sampleModel: '', // 型号
   manufacturer: '', // 生产厂家
-  submissionUser: '', // 送检人
-  submissionPhone: '', // 送检人联系方式
-  submissionTime: '', // 送检时间
-  inspectionTime: '', // 检完时间
-  verificationItems: '', // 检定项目
-  templateName: '', // 原始记录模板
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+  submissionTime: '', // 预计送达时间
+  inspectionTime: '', // 要求检完时间
+  measureContent: '', // 检定项目
+  templateId: '', // 原始记录模板id
+  originalRecordFile: '', // 原始记录附件
+  sampleId: '', // 样品id
+  orderId: '', // 委托书id
   fixedAssetsList: [], // 底部设备数组
   fileList: [], // 底部文件表格数组
   applyEquipmentList: [], // 底部设备详情数组
+  businessEnvironmentRecord: {}, // 环境记录单信息
 })
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-}
-// 模拟检测类型的下拉框数组
-const standardOwnerOptions = ref([
-  { name: '检测', id: '1' },
-  { name: '校准', id: '2' },
-  { name: '检定', id: '3' },
-  { name: '验收检定', id: '4' },
-])
+
 // 数据
 const list = ref<object[]>([])
 // 标准配套设备更换表格总数
@@ -116,22 +150,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -154,7 +180,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -163,6 +189,7 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
@@ -225,62 +252,29 @@
 }
 // 表单验证规则
 const rules = ref({
-  originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
-  calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
-  ],
-  calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
-  ],
-  environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
-  ],
-  calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
-  ],
-  temperature: [
+  'originalRecordName': [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
+  'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
+  'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
+  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
+  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+  'businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
   ],
-  orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
-  ],
-  sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
-  ],
-  factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  model: [
-    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
-  ],
-  manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
-  ],
-  verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
-  ],
+  'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 // 第几条数据选择
 const listIndex = ref(0)
@@ -298,6 +292,14 @@
   listIndex.value = index
   equipmentDialog.value.initDialog()
 }
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+
 // 点击增加行
 const addRoow = () => {
   if (
@@ -336,11 +338,13 @@
     fromListInfo.value.fileList.push({})
   }
 }
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -434,47 +438,134 @@
   standarDialog.value.initDialog()
 }
 
+// ----------------------------选择环境记录单------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
 const environmentalClick = () => {
   environmentalDialog.value.initDialog()
 }
+// 选择环境记录单表格确认
+const environmentalAdd = (data: IEnvironmental) => {
+  formInline.value.environmentId = data.id // 环境记录单id
+  formInline.value.businessEnvironmentRecord = data // 环境记录单信息
+}
 
-// 环境记录单表格确认
-const environmentalAdd = (data: rowReturn) => {
-  formInline.value.environmentId = data.id
+// ---------------------------------委托书---------------------------------------
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
 }
-// 委托方组件ref
-const orderDialog = ref()
-// 点击选择委托书
-const orderClick = () => {
-  orderDialog.value.initDialog()
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
 }
-// 委托方表格确认后
-const orderAdd = (data: rowReturn) => {
-  formInline.value.orderId = data.id
+// 选好委托书
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    formInline.value.orderId = val[0].id // 委托书id
+    formInline.value.customerId = val[0].customerId// 委托方id
+    formInline.value.businessOrder = val[0]
+  }
 }
-// 样品组件ref
-const sampleDialog = ref()
+// -----------------------------------样品----------------------------------------
 // 点击选择样品
-const sampleClick = () => {
-  sampleDialog.value.initDialog()
+const handleClickSample = () => {
+  if (!formInline.value.orderId) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  sampleVisible.value = true
 }
-// 样品组件弹窗选择完成后
-const sampleAdd = (data: rowReturn) => {
-  formInline.value.sampleId = data.id
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
 }
-// 原始记录组件ref
-const primitiveLogDialog = ref()
-// 点击原始记录选择
-const primitiveLogClick = () => {
-  primitiveLogDialog.value.initDialog()
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    formInline.value.sampleId = val[0].id// 样品id
+    formInline.value.customerSampleInfo = val[0] // 样品信息
+  }
 }
-// 原始记录选择完成之后
-const primitiveLogAdd = (data: rowReturn) => {
-  formInline.value.templateId = data.id
+
+// -----------------------------------原始记录模板-------------------------------
+// 选择环境记录单Ref
+const templateDialog = ref()
+// 选择环境记录单
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
 }
+// 选择环境记录单表格确认
+const confirmCheckoutTemplate = (val: any) => {
+  // formInline.value.environmentId = data.id // 环境记录单id
+  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
+  formInline.value.templateId = val.id// 	原始记录模板id
+  formInline.value.templateName = val.templateName// 原始记录模板名称
+}
+
+// -------------------------------------所用设备-----------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.fixedAssetsList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.fixedAssetsList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  console.log('------')
+  console.log(val)
+
+  if (val && val.length) {
+    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -563,6 +654,9 @@
   standard: '',
   extarCss: '',
 })
+onMounted(() => {
+  getDict() // 获取字典
+})
 </script>
 
 <template>
@@ -595,13 +689,12 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordCode">
+            <el-form-item label="原始记录编号:">
               <el-input
                 v-model.trim="formInline.originalRecordCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入原始记录编号'"
+                placeholder="系统自动生成"
                 class="full-width-input"
-                clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -617,17 +710,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校专业:" prop="calibrationCategory">
+            <el-form-item label="检校类别:" prop="measureCategory">
               <el-select
-                v-model="formInline.calibrationCategory"
+                v-model="formInline.measureCategory"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                :placeholder="pageType === 'detail' ? '' : '请选择检校类别'"
                 size="default"
                 style="width: 100%;"
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
+                  v-for="item in mesureCategoryList"
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
@@ -649,27 +742,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="环境记录单编号:" prop="environmentName">
-              <el-input
-                v-model.trim="fromListInfo.environmentName"
-                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单编号'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
-              >
-                <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                    @click="environmentalClick"
-                  >
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
@@ -684,39 +756,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="环境记录单编号:" prop="businessEnvironmentRecord.environmentCode">
               <el-input
-                v-model.trim="fromListInfo.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                v-model.trim="formInline.businessEnvironmentRecord.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单编号'"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="dampness">
-              <el-input
-                v-model.trim="fromListInfo.dampness"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="委托书编号:" prop="orderNo">
-              <el-input
-                v-model.trim="fromListInfo.orderNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="orderClick"
+                    @click="environmentalClick"
                   >
                     选择
                   </el-button>
@@ -725,55 +775,96 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="orderCode">
+            <el-form-item label="温度(℃):" prop="businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.orderCode"
+                v-model.trim="formInline.businessEnvironmentRecord.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):" prop="businessEnvironmentRecord.humidity">
+              <el-input
+                v-model.trim="formInline.businessEnvironmentRecord.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="委托书编号:" prop="businessOrder.orderCode">
+              <el-input
+                v-model.trim="formInline.businessOrder.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
+              <el-input
+                v-model.trim="formInline.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="orderName">
+            <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.orderName"
+                v-model.trim="formInline.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="orderPhone">
+            <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.orderPhone"
+                v-model.trim="formInline.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="orderLocation">
+            <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.orderLocation"
+                v-model.trim="formInline.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -782,7 +873,7 @@
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="sampleClick"
+                    @click="handleClickSample"
                   >
                     选择
                   </el-button>
@@ -791,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -804,9 +895,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="factoryNo">
+            <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.factoryNo"
+                v-model.trim="formInline.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -815,9 +906,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -826,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -836,12 +927,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.submissionUser"
+                v-model.trim="formInline.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -852,7 +941,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.submissionPhone"
+                v-model.trim="formInline.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -863,7 +952,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.submissionTime"
+                v-model="formInline.customerSampleInfo.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -875,12 +964,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.inspectionTime"
+                v-model="formInline.customerSampleInfo.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -891,9 +980,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="fromListInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -919,16 +1008,16 @@
           <el-col :span="6">
             <el-form-item label="原始记录模板:">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录模板'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="primitiveLogClick"
+                    @click="handleClickTemplate"
                   >
                     选择
                   </el-button>
@@ -953,19 +1042,19 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -981,6 +1070,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -999,7 +1089,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1064,15 +1154,15 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
-  <!-- 选择委托方弹窗 -->
-  <order-dialog ref="orderDialog" @add="orderAdd" />
-  <!-- 选择样品弹窗 -->
-  <sample-dialog ref="sampleDialog" @add="sampleAdd" />
-  <!-- 选择原始记录单 -->
-  <primitive-log-dialog ref="primitiveLogDialog" @add="primitiveLogAdd" />
+  <!-- 选择委托书组件 -->
+  <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+  <!-- 选择样品组件 -->
+  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 7b1923a..1ba8293 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -225,7 +225,7 @@
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
@@ -235,7 +235,7 @@
 // 点击批量增加
 const multiAdd = () => {
   if (!dataForm.value.customerNo) {
-    ElMessage.warning('请先选择委托方')
+    ElMessage.warning('请先选择委托书')
     return
   }
   sampleVisible.value = true
@@ -780,7 +780,7 @@
       </div>
     </div>
     <!-- 选择委托方组件 -->
-    <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
     <!-- 选择样品组件 -->
     <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
new file mode 100644
index 0000000..0b4fecf
--- /dev/null
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -0,0 +1,201 @@
+<!-- 查询所用设备（测量设备） -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: 160, fixed: true },
+  { text: '名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: 58 },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: 165 },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
new file mode 100644
index 0000000..6ff117e
--- /dev/null
+++ b/src/views/business/lab/components/selectSample.vue
@@ -0,0 +1,186 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        id: item.sampleId,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectTemplate.vue b/src/views/business/lab/components/selectTemplate.vue
new file mode 100644
index 0000000..bb4b98e
--- /dev/null
+++ b/src/views/business/lab/components/selectTemplate.vue
@@ -0,0 +1,159 @@
+<!-- 选择原始记录模板 -->
+<script lang="ts" setup name="SelectTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180', fixed: true },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150', fixed: true },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '原始记录模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateCreator = ''
+  searchQuery.templateName = ''
+  searchQuery.templateNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原始记录模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 63a0849..79bb1a7 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -26,6 +26,17 @@
 const loadingTable = ref(false) // 表格loading
 const trainTime = ref('') // 记录时间数组
 const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
@@ -43,17 +54,7 @@
   loadingTable.value = false
 }
 fetchData(true)
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
-  { text: '房间号', value: 'roomNumber', align: 'center' },
-  { text: '记录人', value: 'recorder', align: 'center' },
-  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
-  { text: '温度(℃)', value: 'temperature', align: 'center' },
-  { text: '湿度(%)', value: 'humidity', align: 'center' },
-  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
-  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -148,7 +149,7 @@
   fetchData(true)
 }
 
-// 获取下拉框数据
+// 获取房间号
 getTypeSelect('roomNumber').then((res) => {
   roomNumberList.value = res.data
 })
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index ef91bfd..d8b58bf 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -1,6 +1,6 @@
 // 列表查询接口
 export interface IListQuery {
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   manufacturingNo: string	// 出厂编号
   originalRecordCode: string	// 原始记录单编号
@@ -22,7 +22,7 @@
     manufacturingNo: string	// 出厂编号
     sampleModel: string // 样品型号
   }
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   createTime: string // 创建时间
   remark: string // 备注
@@ -35,3 +35,14 @@
   value: string
 }
 
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 7994d21..d663752 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -13,7 +13,7 @@
 const $router = useRouter() // 初始化路由
 // 查询条件
 const listQuery = ref<IListQuery>({
-  calibrationCategory: '',	// 校验类别
+  measureCategory: '',	// 校验类别
   createUser: '',	// 创建人
   manufacturingNo: '',	// 出厂编号
   originalRecordCode: '',	// 原始记录单编号
@@ -38,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
@@ -65,7 +65,7 @@
         sampleName: item.customerSampleInfo.sampleName, // 样品名称
         manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
         sampleModel: item.customerSampleInfo.sampleModel, // 型号
-        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory) ? mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name : '', // 校检类别
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
       }
     })
     total.value = res.data.total
@@ -81,7 +81,7 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    calibrationCategory: '',	// 校验类别
+    measureCategory: '',	// 校验类别
     createUser: '',	// 创建人
     manufacturingNo: '',	// 出厂编号
     originalRecordCode: '',	// 原始记录单编号
@@ -103,7 +103,7 @@
   })
   if (list.value.length > 0) {
     const params = {
-      calibrationCategory: '',	// 校验类别
+      measureCategory: '',	// 校验类别
       createUser: '',	// 创建人
       manufacturingNo: '',	// 出厂编号
       originalRecordCode: '',	// 原始记录单编号
@@ -239,7 +239,7 @@
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.calibrationCategory"
+          v-model="listQuery.measureCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index cd53837..ad1a2c7 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -4,9 +4,11 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import OrderDialog from '../components/orderDialog.vue'
 import SampleDialog from '../components/sampleDialog.vue'
-import PrimitiveLogDialog from '../components/primitiveLogDialog.vue'
+import selectSample from '../components/selectSample.vue'
+import selectTemplate from '../components/selectTemplate.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { columnsType, dictType } from './primitiveLogList'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
@@ -21,15 +23,27 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const orderVisible = ref(false) // 控制委托书对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -43,59 +57,79 @@
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
-// 新建上传参数
+// 新建上传参数--用于调接口上传
 const formInline = ref({
-  originalRecordCode: '', // 	原始记录编号
+  originalRecordCode: '', // 原始记录编号
   originalRecordName: '', // 原始记录名称
-  calibrationCategory: '', // 检校类别
+  measureCategory: '', // 检校类别
   calibrationTime: '', // 		检校时间
   environmentId: '', // 环境记录单id
   calibrationPlace: '', // 检校地点
   orderId: '', // 	委托书id
+  customerId: '', // 	委托方id
   sampleId: '', // 	样品id
   templateId: '', // 	原始记录模板id
-  originalRecordFile: '', // 	minio存储文件名
+  templateName: '', // 原始记录模板名称
+  originalRecordFile: '', // 	minio存储文件名--附件
   remark: '', // 备注
   createUser: '', // 创建人id
+  businessEnvironmentRecord: {
+    temperature: '', // 环境记录单温度
+    humidity: '', // 环境记录单相对湿度
+    environmentCode: '', // 环境记录单编号
+  }, // 环境记录单信息
+  businessOrder: { // 委托书
+    orderCode: '', // 委托书编号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    customerPhone: '', // 委托方电话
+    customerAddress: '', // 委托方地址
+  },
+  customerSampleInfo: { // 样品信息
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    manufacturingNo: '', // 出厂编号
+    sampleModel: '', // 型号
+    manufacturer: '', // 生产厂家
+    deliverer: '', // 送检人
+    delivererTel: '', // 送检人联系方式
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
+    measureContent: '', // 检定项目
+  },
+  fixedAssetsList: [] as any, // 测量设备
 })
-// 数据详情无需上传
+// 数据详情无需上传--用于显示详情
 const fromListInfo = ref({
-  environmentName: '', // 环境记录单名称
+  environmentCode: '', // 环境记录单编号
   calibrationLocation: '', // 校验地点
   temperature: '', // 环境记录单温度
-  dampness: '', // 环境记录单相对湿度
-  orderNo: '', // 委托方编号
-  orderCode: '', // 委托方代码
-  orderName: '', // 委托方名称
-  orderPhone: '', // 委托方电话
-  orderLocation: '', // 委托方地址
+  humidity: '', // 环境记录单相对湿度
+  orderCode: '', // 委托书编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerAddress: '', // 委托方地址
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  factoryNo: '', // 出厂编号
-  model: '', // 型号
+  manufacturingNo: '', // 出厂编号
+  sampleModel: '', // 型号
   manufacturer: '', // 生产厂家
-  submissionUser: '', // 送检人
-  submissionPhone: '', // 送检人联系方式
-  submissionTime: '', // 送检时间
-  inspectionTime: '', // 检完时间
-  verificationItems: '', // 检定项目
-  templateName: '', // 原始记录模板
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+  submissionTime: '', // 预计送达时间
+  inspectionTime: '', // 要求检完时间
+  measureContent: '', // 检定项目
+  templateId: '', // 原始记录模板id
+  originalRecordFile: '', // 原始记录附件
+  sampleId: '', // 样品id
+  orderId: '', // 委托书id
   fixedAssetsList: [], // 底部设备数组
   fileList: [], // 底部文件表格数组
   applyEquipmentList: [], // 底部设备详情数组
+  businessEnvironmentRecord: {}, // 环境记录单信息
 })
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-}
-// 模拟检测类型的下拉框数组
-const standardOwnerOptions = ref([
-  { name: '检测', id: '1' },
-  { name: '校准', id: '2' },
-  { name: '检定', id: '3' },
-  { name: '验收检定', id: '4' },
-])
+
 // 数据
 const list = ref<object[]>([])
 // 标准配套设备更换表格总数
@@ -116,22 +150,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -154,7 +180,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -163,6 +189,7 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
@@ -225,62 +252,29 @@
 }
 // 表单验证规则
 const rules = ref({
-  originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
-  calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
-  ],
-  calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
-  ],
-  environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
-  ],
-  calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
-  ],
-  temperature: [
+  'originalRecordName': [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
+  'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
+  'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
+  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
+  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+  'businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
   ],
-  orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
-  ],
-  sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
-  ],
-  factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  model: [
-    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
-  ],
-  manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
-  ],
-  verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
-  ],
+  'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 // 第几条数据选择
 const listIndex = ref(0)
@@ -298,6 +292,14 @@
   listIndex.value = index
   equipmentDialog.value.initDialog()
 }
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+
 // 点击增加行
 const addRoow = () => {
   if (
@@ -336,11 +338,13 @@
     fromListInfo.value.fileList.push({})
   }
 }
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -434,47 +438,134 @@
   standarDialog.value.initDialog()
 }
 
+// ----------------------------选择环境记录单------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
 const environmentalClick = () => {
   environmentalDialog.value.initDialog()
 }
+// 选择环境记录单表格确认
+const environmentalAdd = (data: IEnvironmental) => {
+  formInline.value.environmentId = data.id // 环境记录单id
+  formInline.value.businessEnvironmentRecord = data // 环境记录单信息
+}
 
-// 环境记录单表格确认
-const environmentalAdd = (data: rowReturn) => {
-  formInline.value.environmentId = data.id
+// ---------------------------------委托书---------------------------------------
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
 }
-// 委托方组件ref
-const orderDialog = ref()
-// 点击选择委托书
-const orderClick = () => {
-  orderDialog.value.initDialog()
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
 }
-// 委托方表格确认后
-const orderAdd = (data: rowReturn) => {
-  formInline.value.orderId = data.id
+// 选好委托书
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    formInline.value.orderId = val[0].id // 委托书id
+    formInline.value.customerId = val[0].customerId// 委托方id
+    formInline.value.businessOrder = val[0]
+  }
 }
-// 样品组件ref
-const sampleDialog = ref()
+// -----------------------------------样品----------------------------------------
 // 点击选择样品
-const sampleClick = () => {
-  sampleDialog.value.initDialog()
+const handleClickSample = () => {
+  if (!formInline.value.orderId) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  sampleVisible.value = true
 }
-// 样品组件弹窗选择完成后
-const sampleAdd = (data: rowReturn) => {
-  formInline.value.sampleId = data.id
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
 }
-// 原始记录组件ref
-const primitiveLogDialog = ref()
-// 点击原始记录选择
-const primitiveLogClick = () => {
-  primitiveLogDialog.value.initDialog()
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    formInline.value.sampleId = val[0].id// 样品id
+    formInline.value.customerSampleInfo = val[0] // 样品信息
+  }
 }
-// 原始记录选择完成之后
-const primitiveLogAdd = (data: rowReturn) => {
-  formInline.value.templateId = data.id
+
+// -----------------------------------原始记录模板-------------------------------
+// 选择环境记录单Ref
+const templateDialog = ref()
+// 选择环境记录单
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
 }
+// 选择环境记录单表格确认
+const confirmCheckoutTemplate = (val: any) => {
+  // formInline.value.environmentId = data.id // 环境记录单id
+  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
+  formInline.value.templateId = val.id// 	原始记录模板id
+  formInline.value.templateName = val.templateName// 原始记录模板名称
+}
+
+// -------------------------------------所用设备-----------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.fixedAssetsList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.fixedAssetsList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  console.log('------')
+  console.log(val)
+
+  if (val && val.length) {
+    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -563,6 +654,9 @@
   standard: '',
   extarCss: '',
 })
+onMounted(() => {
+  getDict() // 获取字典
+})
 </script>
 
 <template>
@@ -595,13 +689,12 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordCode">
+            <el-form-item label="原始记录编号:">
               <el-input
                 v-model.trim="formInline.originalRecordCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入原始记录编号'"
+                placeholder="系统自动生成"
                 class="full-width-input"
-                clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -617,17 +710,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校专业:" prop="calibrationCategory">
+            <el-form-item label="检校类别:" prop="measureCategory">
               <el-select
-                v-model="formInline.calibrationCategory"
+                v-model="formInline.measureCategory"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                :placeholder="pageType === 'detail' ? '' : '请选择检校类别'"
                 size="default"
                 style="width: 100%;"
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
+                  v-for="item in mesureCategoryList"
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
@@ -649,27 +742,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="环境记录单编号:" prop="environmentName">
-              <el-input
-                v-model.trim="fromListInfo.environmentName"
-                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单编号'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
-              >
-                <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                    @click="environmentalClick"
-                  >
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
@@ -684,39 +756,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="环境记录单编号:" prop="businessEnvironmentRecord.environmentCode">
               <el-input
-                v-model.trim="fromListInfo.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                v-model.trim="formInline.businessEnvironmentRecord.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单编号'"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="dampness">
-              <el-input
-                v-model.trim="fromListInfo.dampness"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="委托书编号:" prop="orderNo">
-              <el-input
-                v-model.trim="fromListInfo.orderNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="orderClick"
+                    @click="environmentalClick"
                   >
                     选择
                   </el-button>
@@ -725,55 +775,96 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="orderCode">
+            <el-form-item label="温度(℃):" prop="businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.orderCode"
+                v-model.trim="formInline.businessEnvironmentRecord.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):" prop="businessEnvironmentRecord.humidity">
+              <el-input
+                v-model.trim="formInline.businessEnvironmentRecord.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="委托书编号:" prop="businessOrder.orderCode">
+              <el-input
+                v-model.trim="formInline.businessOrder.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
+              <el-input
+                v-model.trim="formInline.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="orderName">
+            <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.orderName"
+                v-model.trim="formInline.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="orderPhone">
+            <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.orderPhone"
+                v-model.trim="formInline.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="orderLocation">
+            <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.orderLocation"
+                v-model.trim="formInline.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -782,7 +873,7 @@
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="sampleClick"
+                    @click="handleClickSample"
                   >
                     选择
                   </el-button>
@@ -791,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -804,9 +895,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="factoryNo">
+            <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.factoryNo"
+                v-model.trim="formInline.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -815,9 +906,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -826,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -836,12 +927,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.submissionUser"
+                v-model.trim="formInline.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -852,7 +941,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.submissionPhone"
+                v-model.trim="formInline.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -863,7 +952,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.submissionTime"
+                v-model="formInline.customerSampleInfo.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -875,12 +964,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.inspectionTime"
+                v-model="formInline.customerSampleInfo.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -891,9 +980,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="fromListInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -919,16 +1008,16 @@
           <el-col :span="6">
             <el-form-item label="原始记录模板:">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录模板'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="primitiveLogClick"
+                    @click="handleClickTemplate"
                   >
                     选择
                   </el-button>
@@ -953,19 +1042,19 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -981,6 +1070,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -999,7 +1089,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1064,15 +1154,15 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
-  <!-- 选择委托方弹窗 -->
-  <order-dialog ref="orderDialog" @add="orderAdd" />
-  <!-- 选择样品弹窗 -->
-  <sample-dialog ref="sampleDialog" @add="sampleAdd" />
-  <!-- 选择原始记录单 -->
-  <primitive-log-dialog ref="primitiveLogDialog" @add="primitiveLogAdd" />
+  <!-- 选择委托书组件 -->
+  <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+  <!-- 选择样品组件 -->
+  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 7b1923a..1ba8293 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -225,7 +225,7 @@
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
@@ -235,7 +235,7 @@
 // 点击批量增加
 const multiAdd = () => {
   if (!dataForm.value.customerNo) {
-    ElMessage.warning('请先选择委托方')
+    ElMessage.warning('请先选择委托书')
     return
   }
   sampleVisible.value = true
@@ -780,7 +780,7 @@
       </div>
     </div>
     <!-- 选择委托方组件 -->
-    <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
     <!-- 选择样品组件 -->
     <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 0f00a0c..4ee6d72 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -1,5 +1,5 @@
 <!-- 选择委托书dialog -->
-<script setup lang="ts" name="SelectSample">
+<script setup lang="ts" name="SelectOrder">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
@@ -162,7 +162,7 @@
 
 <template>
   <div>
-    <el-dialog v-model="visible" title="选择委托书" @close="cancle">
+    <el-dialog v-model="visible" title="选择委托书" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -221,7 +221,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center" fixed>

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
new file mode 100644
index 0000000..0b4fecf
--- /dev/null
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -0,0 +1,201 @@
+<!-- 查询所用设备（测量设备） -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: 160, fixed: true },
+  { text: '名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: 58 },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: 165 },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
new file mode 100644
index 0000000..6ff117e
--- /dev/null
+++ b/src/views/business/lab/components/selectSample.vue
@@ -0,0 +1,186 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        id: item.sampleId,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectTemplate.vue b/src/views/business/lab/components/selectTemplate.vue
new file mode 100644
index 0000000..bb4b98e
--- /dev/null
+++ b/src/views/business/lab/components/selectTemplate.vue
@@ -0,0 +1,159 @@
+<!-- 选择原始记录模板 -->
+<script lang="ts" setup name="SelectTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180', fixed: true },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150', fixed: true },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '原始记录模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateCreator = ''
+  searchQuery.templateName = ''
+  searchQuery.templateNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原始记录模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 63a0849..79bb1a7 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -26,6 +26,17 @@
 const loadingTable = ref(false) // 表格loading
 const trainTime = ref('') // 记录时间数组
 const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
@@ -43,17 +54,7 @@
   loadingTable.value = false
 }
 fetchData(true)
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
-  { text: '房间号', value: 'roomNumber', align: 'center' },
-  { text: '记录人', value: 'recorder', align: 'center' },
-  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
-  { text: '温度(℃)', value: 'temperature', align: 'center' },
-  { text: '湿度(%)', value: 'humidity', align: 'center' },
-  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
-  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -148,7 +149,7 @@
   fetchData(true)
 }
 
-// 获取下拉框数据
+// 获取房间号
 getTypeSelect('roomNumber').then((res) => {
   roomNumberList.value = res.data
 })
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index ef91bfd..d8b58bf 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -1,6 +1,6 @@
 // 列表查询接口
 export interface IListQuery {
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   manufacturingNo: string	// 出厂编号
   originalRecordCode: string	// 原始记录单编号
@@ -22,7 +22,7 @@
     manufacturingNo: string	// 出厂编号
     sampleModel: string // 样品型号
   }
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   createTime: string // 创建时间
   remark: string // 备注
@@ -35,3 +35,14 @@
   value: string
 }
 
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 7994d21..d663752 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -13,7 +13,7 @@
 const $router = useRouter() // 初始化路由
 // 查询条件
 const listQuery = ref<IListQuery>({
-  calibrationCategory: '',	// 校验类别
+  measureCategory: '',	// 校验类别
   createUser: '',	// 创建人
   manufacturingNo: '',	// 出厂编号
   originalRecordCode: '',	// 原始记录单编号
@@ -38,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
@@ -65,7 +65,7 @@
         sampleName: item.customerSampleInfo.sampleName, // 样品名称
         manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
         sampleModel: item.customerSampleInfo.sampleModel, // 型号
-        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory) ? mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name : '', // 校检类别
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
       }
     })
     total.value = res.data.total
@@ -81,7 +81,7 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    calibrationCategory: '',	// 校验类别
+    measureCategory: '',	// 校验类别
     createUser: '',	// 创建人
     manufacturingNo: '',	// 出厂编号
     originalRecordCode: '',	// 原始记录单编号
@@ -103,7 +103,7 @@
   })
   if (list.value.length > 0) {
     const params = {
-      calibrationCategory: '',	// 校验类别
+      measureCategory: '',	// 校验类别
       createUser: '',	// 创建人
       manufacturingNo: '',	// 出厂编号
       originalRecordCode: '',	// 原始记录单编号
@@ -239,7 +239,7 @@
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.calibrationCategory"
+          v-model="listQuery.measureCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index cd53837..ad1a2c7 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -4,9 +4,11 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import OrderDialog from '../components/orderDialog.vue'
 import SampleDialog from '../components/sampleDialog.vue'
-import PrimitiveLogDialog from '../components/primitiveLogDialog.vue'
+import selectSample from '../components/selectSample.vue'
+import selectTemplate from '../components/selectTemplate.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { columnsType, dictType } from './primitiveLogList'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
@@ -21,15 +23,27 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const orderVisible = ref(false) // 控制委托书对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -43,59 +57,79 @@
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
-// 新建上传参数
+// 新建上传参数--用于调接口上传
 const formInline = ref({
-  originalRecordCode: '', // 	原始记录编号
+  originalRecordCode: '', // 原始记录编号
   originalRecordName: '', // 原始记录名称
-  calibrationCategory: '', // 检校类别
+  measureCategory: '', // 检校类别
   calibrationTime: '', // 		检校时间
   environmentId: '', // 环境记录单id
   calibrationPlace: '', // 检校地点
   orderId: '', // 	委托书id
+  customerId: '', // 	委托方id
   sampleId: '', // 	样品id
   templateId: '', // 	原始记录模板id
-  originalRecordFile: '', // 	minio存储文件名
+  templateName: '', // 原始记录模板名称
+  originalRecordFile: '', // 	minio存储文件名--附件
   remark: '', // 备注
   createUser: '', // 创建人id
+  businessEnvironmentRecord: {
+    temperature: '', // 环境记录单温度
+    humidity: '', // 环境记录单相对湿度
+    environmentCode: '', // 环境记录单编号
+  }, // 环境记录单信息
+  businessOrder: { // 委托书
+    orderCode: '', // 委托书编号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    customerPhone: '', // 委托方电话
+    customerAddress: '', // 委托方地址
+  },
+  customerSampleInfo: { // 样品信息
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    manufacturingNo: '', // 出厂编号
+    sampleModel: '', // 型号
+    manufacturer: '', // 生产厂家
+    deliverer: '', // 送检人
+    delivererTel: '', // 送检人联系方式
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
+    measureContent: '', // 检定项目
+  },
+  fixedAssetsList: [] as any, // 测量设备
 })
-// 数据详情无需上传
+// 数据详情无需上传--用于显示详情
 const fromListInfo = ref({
-  environmentName: '', // 环境记录单名称
+  environmentCode: '', // 环境记录单编号
   calibrationLocation: '', // 校验地点
   temperature: '', // 环境记录单温度
-  dampness: '', // 环境记录单相对湿度
-  orderNo: '', // 委托方编号
-  orderCode: '', // 委托方代码
-  orderName: '', // 委托方名称
-  orderPhone: '', // 委托方电话
-  orderLocation: '', // 委托方地址
+  humidity: '', // 环境记录单相对湿度
+  orderCode: '', // 委托书编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerAddress: '', // 委托方地址
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  factoryNo: '', // 出厂编号
-  model: '', // 型号
+  manufacturingNo: '', // 出厂编号
+  sampleModel: '', // 型号
   manufacturer: '', // 生产厂家
-  submissionUser: '', // 送检人
-  submissionPhone: '', // 送检人联系方式
-  submissionTime: '', // 送检时间
-  inspectionTime: '', // 检完时间
-  verificationItems: '', // 检定项目
-  templateName: '', // 原始记录模板
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+  submissionTime: '', // 预计送达时间
+  inspectionTime: '', // 要求检完时间
+  measureContent: '', // 检定项目
+  templateId: '', // 原始记录模板id
+  originalRecordFile: '', // 原始记录附件
+  sampleId: '', // 样品id
+  orderId: '', // 委托书id
   fixedAssetsList: [], // 底部设备数组
   fileList: [], // 底部文件表格数组
   applyEquipmentList: [], // 底部设备详情数组
+  businessEnvironmentRecord: {}, // 环境记录单信息
 })
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-}
-// 模拟检测类型的下拉框数组
-const standardOwnerOptions = ref([
-  { name: '检测', id: '1' },
-  { name: '校准', id: '2' },
-  { name: '检定', id: '3' },
-  { name: '验收检定', id: '4' },
-])
+
 // 数据
 const list = ref<object[]>([])
 // 标准配套设备更换表格总数
@@ -116,22 +150,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -154,7 +180,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -163,6 +189,7 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
@@ -225,62 +252,29 @@
 }
 // 表单验证规则
 const rules = ref({
-  originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
-  calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
-  ],
-  calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
-  ],
-  environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
-  ],
-  calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
-  ],
-  temperature: [
+  'originalRecordName': [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
+  'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
+  'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
+  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
+  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+  'businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
   ],
-  orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
-  ],
-  sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
-  ],
-  factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  model: [
-    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
-  ],
-  manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
-  ],
-  verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
-  ],
+  'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 // 第几条数据选择
 const listIndex = ref(0)
@@ -298,6 +292,14 @@
   listIndex.value = index
   equipmentDialog.value.initDialog()
 }
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+
 // 点击增加行
 const addRoow = () => {
   if (
@@ -336,11 +338,13 @@
     fromListInfo.value.fileList.push({})
   }
 }
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -434,47 +438,134 @@
   standarDialog.value.initDialog()
 }
 
+// ----------------------------选择环境记录单------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
 const environmentalClick = () => {
   environmentalDialog.value.initDialog()
 }
+// 选择环境记录单表格确认
+const environmentalAdd = (data: IEnvironmental) => {
+  formInline.value.environmentId = data.id // 环境记录单id
+  formInline.value.businessEnvironmentRecord = data // 环境记录单信息
+}
 
-// 环境记录单表格确认
-const environmentalAdd = (data: rowReturn) => {
-  formInline.value.environmentId = data.id
+// ---------------------------------委托书---------------------------------------
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
 }
-// 委托方组件ref
-const orderDialog = ref()
-// 点击选择委托书
-const orderClick = () => {
-  orderDialog.value.initDialog()
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
 }
-// 委托方表格确认后
-const orderAdd = (data: rowReturn) => {
-  formInline.value.orderId = data.id
+// 选好委托书
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    formInline.value.orderId = val[0].id // 委托书id
+    formInline.value.customerId = val[0].customerId// 委托方id
+    formInline.value.businessOrder = val[0]
+  }
 }
-// 样品组件ref
-const sampleDialog = ref()
+// -----------------------------------样品----------------------------------------
 // 点击选择样品
-const sampleClick = () => {
-  sampleDialog.value.initDialog()
+const handleClickSample = () => {
+  if (!formInline.value.orderId) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  sampleVisible.value = true
 }
-// 样品组件弹窗选择完成后
-const sampleAdd = (data: rowReturn) => {
-  formInline.value.sampleId = data.id
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
 }
-// 原始记录组件ref
-const primitiveLogDialog = ref()
-// 点击原始记录选择
-const primitiveLogClick = () => {
-  primitiveLogDialog.value.initDialog()
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    formInline.value.sampleId = val[0].id// 样品id
+    formInline.value.customerSampleInfo = val[0] // 样品信息
+  }
 }
-// 原始记录选择完成之后
-const primitiveLogAdd = (data: rowReturn) => {
-  formInline.value.templateId = data.id
+
+// -----------------------------------原始记录模板-------------------------------
+// 选择环境记录单Ref
+const templateDialog = ref()
+// 选择环境记录单
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
 }
+// 选择环境记录单表格确认
+const confirmCheckoutTemplate = (val: any) => {
+  // formInline.value.environmentId = data.id // 环境记录单id
+  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
+  formInline.value.templateId = val.id// 	原始记录模板id
+  formInline.value.templateName = val.templateName// 原始记录模板名称
+}
+
+// -------------------------------------所用设备-----------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.fixedAssetsList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.fixedAssetsList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  console.log('------')
+  console.log(val)
+
+  if (val && val.length) {
+    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -563,6 +654,9 @@
   standard: '',
   extarCss: '',
 })
+onMounted(() => {
+  getDict() // 获取字典
+})
 </script>
 
 <template>
@@ -595,13 +689,12 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordCode">
+            <el-form-item label="原始记录编号:">
               <el-input
                 v-model.trim="formInline.originalRecordCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入原始记录编号'"
+                placeholder="系统自动生成"
                 class="full-width-input"
-                clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -617,17 +710,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校专业:" prop="calibrationCategory">
+            <el-form-item label="检校类别:" prop="measureCategory">
               <el-select
-                v-model="formInline.calibrationCategory"
+                v-model="formInline.measureCategory"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                :placeholder="pageType === 'detail' ? '' : '请选择检校类别'"
                 size="default"
                 style="width: 100%;"
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
+                  v-for="item in mesureCategoryList"
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
@@ -649,27 +742,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="环境记录单编号:" prop="environmentName">
-              <el-input
-                v-model.trim="fromListInfo.environmentName"
-                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单编号'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
-              >
-                <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                    @click="environmentalClick"
-                  >
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
@@ -684,39 +756,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="环境记录单编号:" prop="businessEnvironmentRecord.environmentCode">
               <el-input
-                v-model.trim="fromListInfo.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                v-model.trim="formInline.businessEnvironmentRecord.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单编号'"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="dampness">
-              <el-input
-                v-model.trim="fromListInfo.dampness"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="委托书编号:" prop="orderNo">
-              <el-input
-                v-model.trim="fromListInfo.orderNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="orderClick"
+                    @click="environmentalClick"
                   >
                     选择
                   </el-button>
@@ -725,55 +775,96 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="orderCode">
+            <el-form-item label="温度(℃):" prop="businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.orderCode"
+                v-model.trim="formInline.businessEnvironmentRecord.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):" prop="businessEnvironmentRecord.humidity">
+              <el-input
+                v-model.trim="formInline.businessEnvironmentRecord.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="委托书编号:" prop="businessOrder.orderCode">
+              <el-input
+                v-model.trim="formInline.businessOrder.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
+              <el-input
+                v-model.trim="formInline.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="orderName">
+            <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.orderName"
+                v-model.trim="formInline.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="orderPhone">
+            <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.orderPhone"
+                v-model.trim="formInline.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="orderLocation">
+            <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.orderLocation"
+                v-model.trim="formInline.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -782,7 +873,7 @@
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="sampleClick"
+                    @click="handleClickSample"
                   >
                     选择
                   </el-button>
@@ -791,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -804,9 +895,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="factoryNo">
+            <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.factoryNo"
+                v-model.trim="formInline.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -815,9 +906,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -826,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -836,12 +927,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.submissionUser"
+                v-model.trim="formInline.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -852,7 +941,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.submissionPhone"
+                v-model.trim="formInline.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -863,7 +952,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.submissionTime"
+                v-model="formInline.customerSampleInfo.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -875,12 +964,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.inspectionTime"
+                v-model="formInline.customerSampleInfo.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -891,9 +980,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="fromListInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -919,16 +1008,16 @@
           <el-col :span="6">
             <el-form-item label="原始记录模板:">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录模板'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="primitiveLogClick"
+                    @click="handleClickTemplate"
                   >
                     选择
                   </el-button>
@@ -953,19 +1042,19 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -981,6 +1070,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -999,7 +1089,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1064,15 +1154,15 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
-  <!-- 选择委托方弹窗 -->
-  <order-dialog ref="orderDialog" @add="orderAdd" />
-  <!-- 选择样品弹窗 -->
-  <sample-dialog ref="sampleDialog" @add="sampleAdd" />
-  <!-- 选择原始记录单 -->
-  <primitive-log-dialog ref="primitiveLogDialog" @add="primitiveLogAdd" />
+  <!-- 选择委托书组件 -->
+  <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+  <!-- 选择样品组件 -->
+  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 7b1923a..1ba8293 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -225,7 +225,7 @@
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
@@ -235,7 +235,7 @@
 // 点击批量增加
 const multiAdd = () => {
   if (!dataForm.value.customerNo) {
-    ElMessage.warning('请先选择委托方')
+    ElMessage.warning('请先选择委托书')
     return
   }
   sampleVisible.value = true
@@ -780,7 +780,7 @@
       </div>
     </div>
     <!-- 选择委托方组件 -->
-    <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
     <!-- 选择样品组件 -->
     <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 0f00a0c..4ee6d72 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -1,5 +1,5 @@
 <!-- 选择委托书dialog -->
-<script setup lang="ts" name="SelectSample">
+<script setup lang="ts" name="SelectOrder">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
@@ -162,7 +162,7 @@
 
 <template>
   <div>
-    <el-dialog v-model="visible" title="选择委托书" @close="cancle">
+    <el-dialog v-model="visible" title="选择委托书" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -221,7 +221,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center" fixed>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index d49e5f7..2f8f8a4 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -1,3 +1,4 @@
+<!-- 委托书列表 -->
 <script lang="ts" setup name="OrderList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
new file mode 100644
index 0000000..0b4fecf
--- /dev/null
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -0,0 +1,201 @@
+<!-- 查询所用设备（测量设备） -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: 160, fixed: true },
+  { text: '名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: 58 },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: 165 },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
new file mode 100644
index 0000000..6ff117e
--- /dev/null
+++ b/src/views/business/lab/components/selectSample.vue
@@ -0,0 +1,186 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        id: item.sampleId,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectTemplate.vue b/src/views/business/lab/components/selectTemplate.vue
new file mode 100644
index 0000000..bb4b98e
--- /dev/null
+++ b/src/views/business/lab/components/selectTemplate.vue
@@ -0,0 +1,159 @@
+<!-- 选择原始记录模板 -->
+<script lang="ts" setup name="SelectTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180', fixed: true },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150', fixed: true },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '原始记录模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateCreator = ''
+  searchQuery.templateName = ''
+  searchQuery.templateNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原始记录模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 63a0849..79bb1a7 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -26,6 +26,17 @@
 const loadingTable = ref(false) // 表格loading
 const trainTime = ref('') // 记录时间数组
 const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
@@ -43,17 +54,7 @@
   loadingTable.value = false
 }
 fetchData(true)
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
-  { text: '房间号', value: 'roomNumber', align: 'center' },
-  { text: '记录人', value: 'recorder', align: 'center' },
-  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
-  { text: '温度(℃)', value: 'temperature', align: 'center' },
-  { text: '湿度(%)', value: 'humidity', align: 'center' },
-  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
-  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -148,7 +149,7 @@
   fetchData(true)
 }
 
-// 获取下拉框数据
+// 获取房间号
 getTypeSelect('roomNumber').then((res) => {
   roomNumberList.value = res.data
 })
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index ef91bfd..d8b58bf 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -1,6 +1,6 @@
 // 列表查询接口
 export interface IListQuery {
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   manufacturingNo: string	// 出厂编号
   originalRecordCode: string	// 原始记录单编号
@@ -22,7 +22,7 @@
     manufacturingNo: string	// 出厂编号
     sampleModel: string // 样品型号
   }
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   createTime: string // 创建时间
   remark: string // 备注
@@ -35,3 +35,14 @@
   value: string
 }
 
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 7994d21..d663752 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -13,7 +13,7 @@
 const $router = useRouter() // 初始化路由
 // 查询条件
 const listQuery = ref<IListQuery>({
-  calibrationCategory: '',	// 校验类别
+  measureCategory: '',	// 校验类别
   createUser: '',	// 创建人
   manufacturingNo: '',	// 出厂编号
   originalRecordCode: '',	// 原始记录单编号
@@ -38,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
@@ -65,7 +65,7 @@
         sampleName: item.customerSampleInfo.sampleName, // 样品名称
         manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
         sampleModel: item.customerSampleInfo.sampleModel, // 型号
-        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory) ? mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name : '', // 校检类别
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
       }
     })
     total.value = res.data.total
@@ -81,7 +81,7 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    calibrationCategory: '',	// 校验类别
+    measureCategory: '',	// 校验类别
     createUser: '',	// 创建人
     manufacturingNo: '',	// 出厂编号
     originalRecordCode: '',	// 原始记录单编号
@@ -103,7 +103,7 @@
   })
   if (list.value.length > 0) {
     const params = {
-      calibrationCategory: '',	// 校验类别
+      measureCategory: '',	// 校验类别
       createUser: '',	// 创建人
       manufacturingNo: '',	// 出厂编号
       originalRecordCode: '',	// 原始记录单编号
@@ -239,7 +239,7 @@
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.calibrationCategory"
+          v-model="listQuery.measureCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index cd53837..ad1a2c7 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -4,9 +4,11 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import OrderDialog from '../components/orderDialog.vue'
 import SampleDialog from '../components/sampleDialog.vue'
-import PrimitiveLogDialog from '../components/primitiveLogDialog.vue'
+import selectSample from '../components/selectSample.vue'
+import selectTemplate from '../components/selectTemplate.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { columnsType, dictType } from './primitiveLogList'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
@@ -21,15 +23,27 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const orderVisible = ref(false) // 控制委托书对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -43,59 +57,79 @@
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
-// 新建上传参数
+// 新建上传参数--用于调接口上传
 const formInline = ref({
-  originalRecordCode: '', // 	原始记录编号
+  originalRecordCode: '', // 原始记录编号
   originalRecordName: '', // 原始记录名称
-  calibrationCategory: '', // 检校类别
+  measureCategory: '', // 检校类别
   calibrationTime: '', // 		检校时间
   environmentId: '', // 环境记录单id
   calibrationPlace: '', // 检校地点
   orderId: '', // 	委托书id
+  customerId: '', // 	委托方id
   sampleId: '', // 	样品id
   templateId: '', // 	原始记录模板id
-  originalRecordFile: '', // 	minio存储文件名
+  templateName: '', // 原始记录模板名称
+  originalRecordFile: '', // 	minio存储文件名--附件
   remark: '', // 备注
   createUser: '', // 创建人id
+  businessEnvironmentRecord: {
+    temperature: '', // 环境记录单温度
+    humidity: '', // 环境记录单相对湿度
+    environmentCode: '', // 环境记录单编号
+  }, // 环境记录单信息
+  businessOrder: { // 委托书
+    orderCode: '', // 委托书编号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    customerPhone: '', // 委托方电话
+    customerAddress: '', // 委托方地址
+  },
+  customerSampleInfo: { // 样品信息
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    manufacturingNo: '', // 出厂编号
+    sampleModel: '', // 型号
+    manufacturer: '', // 生产厂家
+    deliverer: '', // 送检人
+    delivererTel: '', // 送检人联系方式
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
+    measureContent: '', // 检定项目
+  },
+  fixedAssetsList: [] as any, // 测量设备
 })
-// 数据详情无需上传
+// 数据详情无需上传--用于显示详情
 const fromListInfo = ref({
-  environmentName: '', // 环境记录单名称
+  environmentCode: '', // 环境记录单编号
   calibrationLocation: '', // 校验地点
   temperature: '', // 环境记录单温度
-  dampness: '', // 环境记录单相对湿度
-  orderNo: '', // 委托方编号
-  orderCode: '', // 委托方代码
-  orderName: '', // 委托方名称
-  orderPhone: '', // 委托方电话
-  orderLocation: '', // 委托方地址
+  humidity: '', // 环境记录单相对湿度
+  orderCode: '', // 委托书编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerAddress: '', // 委托方地址
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  factoryNo: '', // 出厂编号
-  model: '', // 型号
+  manufacturingNo: '', // 出厂编号
+  sampleModel: '', // 型号
   manufacturer: '', // 生产厂家
-  submissionUser: '', // 送检人
-  submissionPhone: '', // 送检人联系方式
-  submissionTime: '', // 送检时间
-  inspectionTime: '', // 检完时间
-  verificationItems: '', // 检定项目
-  templateName: '', // 原始记录模板
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+  submissionTime: '', // 预计送达时间
+  inspectionTime: '', // 要求检完时间
+  measureContent: '', // 检定项目
+  templateId: '', // 原始记录模板id
+  originalRecordFile: '', // 原始记录附件
+  sampleId: '', // 样品id
+  orderId: '', // 委托书id
   fixedAssetsList: [], // 底部设备数组
   fileList: [], // 底部文件表格数组
   applyEquipmentList: [], // 底部设备详情数组
+  businessEnvironmentRecord: {}, // 环境记录单信息
 })
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-}
-// 模拟检测类型的下拉框数组
-const standardOwnerOptions = ref([
-  { name: '检测', id: '1' },
-  { name: '校准', id: '2' },
-  { name: '检定', id: '3' },
-  { name: '验收检定', id: '4' },
-])
+
 // 数据
 const list = ref<object[]>([])
 // 标准配套设备更换表格总数
@@ -116,22 +150,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -154,7 +180,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -163,6 +189,7 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
@@ -225,62 +252,29 @@
 }
 // 表单验证规则
 const rules = ref({
-  originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
-  calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
-  ],
-  calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
-  ],
-  environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
-  ],
-  calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
-  ],
-  temperature: [
+  'originalRecordName': [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
+  'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
+  'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
+  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
+  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+  'businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
   ],
-  orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
-  ],
-  sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
-  ],
-  factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  model: [
-    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
-  ],
-  manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
-  ],
-  verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
-  ],
+  'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 // 第几条数据选择
 const listIndex = ref(0)
@@ -298,6 +292,14 @@
   listIndex.value = index
   equipmentDialog.value.initDialog()
 }
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+
 // 点击增加行
 const addRoow = () => {
   if (
@@ -336,11 +338,13 @@
     fromListInfo.value.fileList.push({})
   }
 }
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -434,47 +438,134 @@
   standarDialog.value.initDialog()
 }
 
+// ----------------------------选择环境记录单------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
 const environmentalClick = () => {
   environmentalDialog.value.initDialog()
 }
+// 选择环境记录单表格确认
+const environmentalAdd = (data: IEnvironmental) => {
+  formInline.value.environmentId = data.id // 环境记录单id
+  formInline.value.businessEnvironmentRecord = data // 环境记录单信息
+}
 
-// 环境记录单表格确认
-const environmentalAdd = (data: rowReturn) => {
-  formInline.value.environmentId = data.id
+// ---------------------------------委托书---------------------------------------
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
 }
-// 委托方组件ref
-const orderDialog = ref()
-// 点击选择委托书
-const orderClick = () => {
-  orderDialog.value.initDialog()
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
 }
-// 委托方表格确认后
-const orderAdd = (data: rowReturn) => {
-  formInline.value.orderId = data.id
+// 选好委托书
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    formInline.value.orderId = val[0].id // 委托书id
+    formInline.value.customerId = val[0].customerId// 委托方id
+    formInline.value.businessOrder = val[0]
+  }
 }
-// 样品组件ref
-const sampleDialog = ref()
+// -----------------------------------样品----------------------------------------
 // 点击选择样品
-const sampleClick = () => {
-  sampleDialog.value.initDialog()
+const handleClickSample = () => {
+  if (!formInline.value.orderId) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  sampleVisible.value = true
 }
-// 样品组件弹窗选择完成后
-const sampleAdd = (data: rowReturn) => {
-  formInline.value.sampleId = data.id
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
 }
-// 原始记录组件ref
-const primitiveLogDialog = ref()
-// 点击原始记录选择
-const primitiveLogClick = () => {
-  primitiveLogDialog.value.initDialog()
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    formInline.value.sampleId = val[0].id// 样品id
+    formInline.value.customerSampleInfo = val[0] // 样品信息
+  }
 }
-// 原始记录选择完成之后
-const primitiveLogAdd = (data: rowReturn) => {
-  formInline.value.templateId = data.id
+
+// -----------------------------------原始记录模板-------------------------------
+// 选择环境记录单Ref
+const templateDialog = ref()
+// 选择环境记录单
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
 }
+// 选择环境记录单表格确认
+const confirmCheckoutTemplate = (val: any) => {
+  // formInline.value.environmentId = data.id // 环境记录单id
+  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
+  formInline.value.templateId = val.id// 	原始记录模板id
+  formInline.value.templateName = val.templateName// 原始记录模板名称
+}
+
+// -------------------------------------所用设备-----------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.fixedAssetsList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.fixedAssetsList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  console.log('------')
+  console.log(val)
+
+  if (val && val.length) {
+    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -563,6 +654,9 @@
   standard: '',
   extarCss: '',
 })
+onMounted(() => {
+  getDict() // 获取字典
+})
 </script>
 
 <template>
@@ -595,13 +689,12 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordCode">
+            <el-form-item label="原始记录编号:">
               <el-input
                 v-model.trim="formInline.originalRecordCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入原始记录编号'"
+                placeholder="系统自动生成"
                 class="full-width-input"
-                clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -617,17 +710,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校专业:" prop="calibrationCategory">
+            <el-form-item label="检校类别:" prop="measureCategory">
               <el-select
-                v-model="formInline.calibrationCategory"
+                v-model="formInline.measureCategory"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                :placeholder="pageType === 'detail' ? '' : '请选择检校类别'"
                 size="default"
                 style="width: 100%;"
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
+                  v-for="item in mesureCategoryList"
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
@@ -649,27 +742,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="环境记录单编号:" prop="environmentName">
-              <el-input
-                v-model.trim="fromListInfo.environmentName"
-                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单编号'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
-              >
-                <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                    @click="environmentalClick"
-                  >
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
@@ -684,39 +756,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="环境记录单编号:" prop="businessEnvironmentRecord.environmentCode">
               <el-input
-                v-model.trim="fromListInfo.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                v-model.trim="formInline.businessEnvironmentRecord.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单编号'"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="dampness">
-              <el-input
-                v-model.trim="fromListInfo.dampness"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="委托书编号:" prop="orderNo">
-              <el-input
-                v-model.trim="fromListInfo.orderNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="orderClick"
+                    @click="environmentalClick"
                   >
                     选择
                   </el-button>
@@ -725,55 +775,96 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="orderCode">
+            <el-form-item label="温度(℃):" prop="businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.orderCode"
+                v-model.trim="formInline.businessEnvironmentRecord.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):" prop="businessEnvironmentRecord.humidity">
+              <el-input
+                v-model.trim="formInline.businessEnvironmentRecord.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="委托书编号:" prop="businessOrder.orderCode">
+              <el-input
+                v-model.trim="formInline.businessOrder.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
+              <el-input
+                v-model.trim="formInline.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="orderName">
+            <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.orderName"
+                v-model.trim="formInline.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="orderPhone">
+            <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.orderPhone"
+                v-model.trim="formInline.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="orderLocation">
+            <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.orderLocation"
+                v-model.trim="formInline.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -782,7 +873,7 @@
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="sampleClick"
+                    @click="handleClickSample"
                   >
                     选择
                   </el-button>
@@ -791,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -804,9 +895,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="factoryNo">
+            <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.factoryNo"
+                v-model.trim="formInline.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -815,9 +906,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -826,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -836,12 +927,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.submissionUser"
+                v-model.trim="formInline.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -852,7 +941,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.submissionPhone"
+                v-model.trim="formInline.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -863,7 +952,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.submissionTime"
+                v-model="formInline.customerSampleInfo.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -875,12 +964,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.inspectionTime"
+                v-model="formInline.customerSampleInfo.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -891,9 +980,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="fromListInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -919,16 +1008,16 @@
           <el-col :span="6">
             <el-form-item label="原始记录模板:">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录模板'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="primitiveLogClick"
+                    @click="handleClickTemplate"
                   >
                     选择
                   </el-button>
@@ -953,19 +1042,19 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -981,6 +1070,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -999,7 +1089,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1064,15 +1154,15 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
-  <!-- 选择委托方弹窗 -->
-  <order-dialog ref="orderDialog" @add="orderAdd" />
-  <!-- 选择样品弹窗 -->
-  <sample-dialog ref="sampleDialog" @add="sampleAdd" />
-  <!-- 选择原始记录单 -->
-  <primitive-log-dialog ref="primitiveLogDialog" @add="primitiveLogAdd" />
+  <!-- 选择委托书组件 -->
+  <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+  <!-- 选择样品组件 -->
+  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 7b1923a..1ba8293 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -225,7 +225,7 @@
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
@@ -235,7 +235,7 @@
 // 点击批量增加
 const multiAdd = () => {
   if (!dataForm.value.customerNo) {
-    ElMessage.warning('请先选择委托方')
+    ElMessage.warning('请先选择委托书')
     return
   }
   sampleVisible.value = true
@@ -780,7 +780,7 @@
       </div>
     </div>
     <!-- 选择委托方组件 -->
-    <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
     <!-- 选择样品组件 -->
     <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 0f00a0c..4ee6d72 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -1,5 +1,5 @@
 <!-- 选择委托书dialog -->
-<script setup lang="ts" name="SelectSample">
+<script setup lang="ts" name="SelectOrder">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
@@ -162,7 +162,7 @@
 
 <template>
   <div>
-    <el-dialog v-model="visible" title="选择委托书" @close="cancle">
+    <el-dialog v-model="visible" title="选择委托书" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -221,7 +221,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center" fixed>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index d49e5f7..2f8f8a4 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -1,3 +1,4 @@
+<!-- 委托书列表 -->
 <script lang="ts" setup name="OrderList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 5c14317..fd9a10b 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -15,8 +15,10 @@
 export interface IOrderList {
   id: string
   orderCode: string // 委托书编号
+  customerId: string // 委托方id
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerPhone?: string // 委托方电话
   customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式

diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 8745c27..985d230 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -148,6 +148,11 @@
 }
 // 单选选中
 const radioChange = () => {
+  console.log('---------')
+
+  console.log(singleChecked.value)
+  console.log(props.data)
+
   const checkValue = props.data.find((item: any) => item.id == singleChecked.value)
   emit('multiSelect', [checkValue])
 }
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 6c5dbf3..09e8b6d 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -20,4 +20,5 @@
   DEVICE_FIX_APPROVAL = 'sbglsbjxsq', // 设备检修申请
   DEVICE_FIX_ACCEPTANCE = 'sbglsbjxbyysd', // 设备检修保养验收单
   BUSINESS_CERT_PRINT = 'ywglzsdy', // 证书打印
+  BUSINESS_REPORT_ON_CREDENTIALS = 'ywglzsbg', // 证书报告
 }
diff --git a/src/views/business/lab/components/environmentalDialog.vue b/src/views/business/lab/components/environmentalDialog.vue
index c009446..ff64af3 100644
--- a/src/views/business/lab/components/environmentalDialog.vue
+++ b/src/views/business/lab/components/environmentalDialog.vue
@@ -1,125 +1,132 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
+<!-- 选择环境记录单弹窗 -->
+<script lang="ts" setup name="EnvironmentalDialog">
 import { ElMessage } from 'element-plus'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '环境记录单编号', value: 'name' },
-  { text: '房间号', value: 'name' },
-  { text: '记录人', value: 'name', align: 'center' },
-  { text: '记录时间', value: 'name', align: 'center', width: '180' }])
+import type { IEnvironmental, IListQuery, IRoomNumber } from '@/views/business/lab/environmental/environmentalList_interface'
+import { getEnvironmentRecordList } from '@/api/business/lab/environmentRecord'
+import { getTypeSelect } from '@/api/system/price'
 
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const listQuery = ref<IListQuery>({
+  environmentCode: '', // 记录单编号
+  roomNumber: '', // 房间号
+  beginTime: '', // 记录开始时间
+  endTime: '', // 记录结束时间
+  offset: 1, // 当前页
+  limit: 20, // 多少条
+})
+const loadingTable = ref(false) // loading
+const list = ref<IEnvironmental[]>([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160', fixed: true },
+  { text: '房间号', value: 'roomNumber', align: 'center', fixed: true },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
+const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+const checkoutList = ref<string[]>([]) // 多选选中参数
+
+// 查询列表
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getEnvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
+  loadingTable.value = false
 }
+fetchData(true)
+
 // 搜索
 const search = () => {
-  fetchData()
+  fetchData(true)
 }
-const selectTreeRef = ref()
 // 重置
-const reset = () => {
+const clearList = () => {
   listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
+    environmentCode: '', // 记录单编号
+    roomNumber: '', // 房间号
+    beginTime: '', // 记录开始时间
+    endTime: '', // 记录结束时间
+    offset: 1, // 当前页
+    limit: 20, // 多少条
   }
-  selectTreeRef.value.clearSelected()
-  search()
+  fetchData(true)
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
+const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
     listQuery.value.limit = val.size
   }
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
-  search()
+  fetchData(true)
 }
 // 点击保存
 const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
   }
   else {
-    ElMessage.warning('请先选择设备')
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
   }
 }
+
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
-  reset()
+  clearList()
 }
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 获取字典值
+async function getDict() {
+  // 获取房间号
+  getTypeSelect('roomNumber').then((res) => {
+    roomNumberList.value = res.data
+  })
+}
+
 // 初始化
 const initDialog = () => {
-  // reset()
   dialogFormVisible.value = true
-  fetchData()
+  getDict()
+  fetchData(true)
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="50%">
+  <el-dialog v-model="dialogFormVisible" title="选择环境记录单" width="60%">
     <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
+    <search-area :need-clear="true" @search="search" @clear="clearList">
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileName"
+          v-model.trim="listQuery.environmentCode"
           placeholder="编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.fileNo"
+          v-model.trim="listQuery.roomNumber"
           placeholder="房间号"
           clearable
         />
@@ -128,13 +135,20 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false" @change="changePage"
+        @multi-select="handleSelectionChange"
       >
+        <!-- 序号 -->
         <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
+          <el-table-column label="#" width="55" align="center" fixed>
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/business/lab/components/orderDialog.vue b/src/views/business/lab/components/orderDialog.vue
deleted file mode 100644
index c605f22..0000000
--- a/src/views/business/lab/components/orderDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '委托书编号', value: 'name' },
-  { text: '委托方代码', value: 'name' },
-  { text: '委托方名称', value: 'name', align: 'center' },
-  { text: '送样人', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择委托书" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="委托方编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="委托方名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/primitiveLogDialog.vue b/src/views/business/lab/components/primitiveLogDialog.vue
deleted file mode 100644
index 0a883a8..0000000
--- a/src/views/business/lab/components/primitiveLogDialog.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!-- 用户列表弹窗 -->
-<script lang="ts" setup name="selectPerson">
-import { ElMessage } from 'element-plus'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const emits = defineEmits(['add'])
-const dialogFormVisible = ref(false)
-// 查询条件
-const listQuery = ref({
-  effectiveEndTime: '',
-  effectiveStartTime: '',
-  effectiveStatus: '',
-  fileCode: '',
-  fileName: '',
-  fileNo: '',
-  fileType: '10',
-  formId: 'jlglwjsp',
-  ids: [],
-  limit: 20,
-  offset: 1,
-  publishEndTime: '',
-  publishStartTime: '',
-})
-const loadingTable = ref<boolean>(false)
-interface listType {
-  name: string
-  id: string
-}
-const list = ref<listType[]>([]) // 表格数据
-const total = ref<number>(0)
-const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
-  { text: '原始记录编号', value: 'name' },
-  { text: '原始记录名称', value: 'name' },
-  { text: '样品编号', value: 'name', align: 'center' },
-  { text: '样品名称', value: 'name', align: 'center', width: '180' }])
-
-// 获取数据列表
-const fetchData = () => {
-  select.value = -1
-  // listPageApi(listQuery.value).then((res) => {
-  //   if (res.code === 200) {
-  //     list.value = res.data.rows
-  //     total.value = res.data.total
-  //   }
-  // })
-  list.value = [{ name: 'xxx', id: '1' }]
-}
-// 搜索
-const search = () => {
-  fetchData()
-}
-const selectTreeRef = ref()
-// 重置
-const reset = () => {
-  listQuery.value = {
-    effectiveEndTime: '',
-    effectiveStartTime: '',
-    effectiveStatus: '',
-    fileCode: '',
-    fileName: '',
-    fileNo: '',
-    fileType: '10',
-    formId: 'jlglwjsp',
-    ids: [],
-    limit: 20,
-    offset: 1,
-    publishEndTime: '',
-    publishStartTime: '',
-  }
-  selectTreeRef.value.clearSelected()
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number;page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  search()
-}
-// 点击保存
-const submitForm = () => {
-  if (select.value >= 0) {
-    const person = list.value.filter((item, index) => index == select.value)[0]
-    emits('add', person)
-    dialogFormVisible.value = false
-    reset()
-  }
-  else {
-    ElMessage.warning('请先选择设备')
-  }
-}
-// 取消
-const resetForm = () => {
-  dialogFormVisible.value = false
-  reset()
-}
-// 初始化
-const initDialog = () => {
-  // reset()
-  dialogFormVisible.value = true
-  fetchData()
-}
-defineExpose({ initDialog })
-</script>
-
-<template>
-  <el-dialog v-model="dialogFormVisible" title="选择原始记录" width="50%">
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileName"
-          placeholder="原始记录编号"
-          clearable
-        />
-      </search-item>
-      <search-item>
-        <el-input
-          v-model.trim="listQuery.fileNo"
-          placeholder="原始记录名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <!-- 查询结果Table显示 -->
-    <div style="padding: 12px;">
-      <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" @change="changePage"
-      >
-        <template #preColumns>
-          <el-table-column label="选择" width="55" align="center">
-            <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确认</el-button>
-        <el-button @click="resetForm">
-          取消
-        </el-button>
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<style lang="scss" scoped>
-:deep(.el-radio__label) {
-  display: none;
-}
-</style>
diff --git a/src/views/business/lab/components/selectFiles.vue b/src/views/business/lab/components/selectFiles.vue
new file mode 100644
index 0000000..10df50e
--- /dev/null
+++ b/src/views/business/lab/components/selectFiles.vue
@@ -0,0 +1,195 @@
+<!-- 选择所依据的技术文件 -->
+<script setup lang="ts" name="SelectFiles">
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '名称', value: 'fileName', align: 'center', width: '130' },
+  { text: '编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '发布时间', value: 'publishTime', align: 'center', width: '180' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择所依据的技术文件" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
new file mode 100644
index 0000000..0b4fecf
--- /dev/null
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -0,0 +1,201 @@
+<!-- 查询所用设备（测量设备） -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+
+// 查询条件
+const searchQuery = ref({
+  equipmentNo: '', // 设备编号
+  equipmentName: '', // 名称
+  mesureType: '', // 检定方式
+  managerState: '1', // 管理状态 1表示在用（启封）
+  useDept: '', // 使用部门
+  assetType: '1', // 资产类型 1表示测量设备
+  equipmentCategory: '', // 设备类别
+  isCalibrationTestEquipment: '', // 校准/检定设备
+  isMeasureAccount: '', // 测量工装
+  isStandardSupportEquipment: '', // 标准配套设备
+  isFixedAssets: '', // 固定资产
+  validStartDate: '', // 有效开始日期
+  validEndDate: '', // 有效结束日期
+  abc: '',
+  limit: 20,
+  offset: 1,
+  // ids: [] as string[],
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: 160, fixed: true },
+  { text: '名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: 'ABC', value: 'abc', align: 'center', width: 58 },
+  { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center', width: 165 },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<fixedAssetsType[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  listPageApi(searchQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+        }
+      })
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  searchQuery.value = {
+    equipmentNo: '', // 设备编号
+    equipmentName: '', // 名称
+    mesureType: '', // 检定方式
+    managerState: '', // 管理状态
+    useDept: '', // 使用部门
+    assetType: '1', // 资产类型 1表示测量设备
+    equipmentCategory: '', // 设备类别
+    isCalibrationTestEquipment: '', // 校准/检定设备
+    isMeasureAccount: '', // 测量工装
+    isStandardSupportEquipment: '', // 标准配套设备
+    isFixedAssets: '', // 固定资产
+    validStartDate: '', // 有效开始日期
+    validEndDate: '', // 有效结束日期
+    abc: '',
+    limit: 20,
+    offset: 1,
+  // ids: [] as string[],
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('confirmCheckout', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+        <search-item>
+          <el-input v-model="searchQuery.equipmentName" placeholder="名称" clearable class="w-50 m-2" style="width: 185px;" />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectSample.vue b/src/views/business/lab/components/selectSample.vue
new file mode 100644
index 0000000..6ff117e
--- /dev/null
+++ b/src/views/business/lab/components/selectSample.vue
@@ -0,0 +1,186 @@
+<!-- 查询关联委托方的并且是已收入状态的样品 -->
+<script setup lang="ts" name="SelectSample">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import type { ISampleListQuery } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { ISampleList } from '@/views/customer/sample/list/sample_list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSampleList } from '@/api/business/schedule/interchangeReceipt'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  customerId: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['changeVisible', 'clickConfirmSample'])
+
+// 查询条件
+const listQuery: Ref<ISampleListQuery> = ref({
+  customerId: '', // 委托方id
+  sampleName: '', // 样品名称
+  sampleNo: '', // 样品编号
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '样品编号', value: 'sampleNo', width: '160', align: 'center', fixed: true },
+  { text: '样品名称', value: 'sampleName', width: '120', align: 'center', fixed: true },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '检定周期', value: 'measurePeriod', align: 'center' },
+  { text: '上次检定时间', value: 'measureLastTime', align: 'center', width: '180px' },
+  { text: '样品状态', value: 'sampleSatusName', align: 'center', width: '80px' },
+  { text: '备注', value: 'remark', align: 'center', width: '180px' },
+])
+// 表格数据
+const list = ref<ISampleList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.customerId = props.customerId
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: any) => {
+      return {
+        ...item,
+        id: item.sampleId,
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    customerId: '', // 委托方id
+    sampleName: '', // 样品名称
+    sampleNo: '', // 样品编号
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 点击取消
+const cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 点击确定
+const clickConfirmSample = () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  // 将选择好的样品传给父组件
+  emits('clickConfirmSample', checkoutList.value)
+  cancle()
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleNo"
+            placeholder="样品编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectTemplate.vue b/src/views/business/lab/components/selectTemplate.vue
new file mode 100644
index 0000000..bb4b98e
--- /dev/null
+++ b/src/views/business/lab/components/selectTemplate.vue
@@ -0,0 +1,159 @@
+<!-- 选择原始记录模板 -->
+<script lang="ts" setup name="SelectTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180', fixed: true },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150', fixed: true },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '原始记录模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateCreator = ''
+  searchQuery.templateName = ''
+  searchQuery.templateNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择环境记录单')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择原始记录模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 63a0849..79bb1a7 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -26,6 +26,17 @@
 const loadingTable = ref(false) // 表格loading
 const trainTime = ref('') // 记录时间数组
 const roomNumberList = ref<IRoomNumber[]>([]) // 房间号
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
+  { text: '房间号', value: 'roomNumber', align: 'center' },
+  { text: '记录人', value: 'recorder', align: 'center' },
+  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
+  { text: '温度(℃)', value: 'temperature', align: 'center' },
+  { text: '湿度(%)', value: 'humidity', align: 'center' },
+  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
+  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
+])
 
 // 查询列表
 const fetchData = (isNowPage: boolean) => {
@@ -43,17 +54,7 @@
   loadingTable.value = false
 }
 fetchData(true)
-// 表头
-const columns = ref<TableColumn[]>([
-  { text: '记录单号', value: 'environmentCode', align: 'center', width: '160' },
-  { text: '房间号', value: 'roomNumber', align: 'center' },
-  { text: '记录人', value: 'recorder', align: 'center' },
-  { text: '记录时间', value: 'recordTime', width: '180', align: 'center' },
-  { text: '温度(℃)', value: 'temperature', align: 'center' },
-  { text: '湿度(%)', value: 'humidity', align: 'center' },
-  { text: '输出电压(V)', value: 'outputVoltage', align: 'center' },
-  { text: '零地电压(V)', value: 'zeroGroundVoltage', align: 'center' },
-])
+
 // 搜索
 const searchList = () => {
   fetchData(true)
@@ -148,7 +149,7 @@
   fetchData(true)
 }
 
-// 获取下拉框数据
+// 获取房间号
 getTypeSelect('roomNumber').then((res) => {
   roomNumberList.value = res.data
 })
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.ts b/src/views/business/lab/primitiveLog/primitiveLogList.ts
index ef91bfd..d8b58bf 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.ts
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.ts
@@ -1,6 +1,6 @@
 // 列表查询接口
 export interface IListQuery {
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   manufacturingNo: string	// 出厂编号
   originalRecordCode: string	// 原始记录单编号
@@ -22,7 +22,7 @@
     manufacturingNo: string	// 出厂编号
     sampleModel: string // 样品型号
   }
-  calibrationCategory: string	// 校验类别
+  measureCategory: string	// 校验类别
   createUser: string	// 创建人
   createTime: string // 创建时间
   remark: string // 备注
@@ -35,3 +35,14 @@
   value: string
 }
 
+// 所用设备表头
+export interface columnsType {
+  text: string // 文本
+  value: string // 列值
+  align: string // 是否居中、左、右
+  required: Boolean // 控制表格表头红色星号
+  choose: Boolean
+  time: Boolean
+  width?: string // 列宽
+}
+
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 7994d21..d663752 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -13,7 +13,7 @@
 const $router = useRouter() // 初始化路由
 // 查询条件
 const listQuery = ref<IListQuery>({
-  calibrationCategory: '',	// 校验类别
+  measureCategory: '',	// 校验类别
   createUser: '',	// 创建人
   manufacturingNo: '',	// 出厂编号
   originalRecordCode: '',	// 原始记录单编号
@@ -38,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '检校类别', value: 'calibrationCategory', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
   { text: '创建人', value: 'createUser', align: 'center' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
   { text: '备注', value: 'remark', align: 'center' },
@@ -65,7 +65,7 @@
         sampleName: item.customerSampleInfo.sampleName, // 样品名称
         manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
         sampleModel: item.customerSampleInfo.sampleModel, // 型号
-        calibrationCategory: mesureCategoryList.value.find(i => i.value === item.calibrationCategory) ? mesureCategoryList.value.find(i => i.value === item.calibrationCategory)!.name : '', // 校检类别
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
       }
     })
     total.value = res.data.total
@@ -81,7 +81,7 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    calibrationCategory: '',	// 校验类别
+    measureCategory: '',	// 校验类别
     createUser: '',	// 创建人
     manufacturingNo: '',	// 出厂编号
     originalRecordCode: '',	// 原始记录单编号
@@ -103,7 +103,7 @@
   })
   if (list.value.length > 0) {
     const params = {
-      calibrationCategory: '',	// 校验类别
+      measureCategory: '',	// 校验类别
       createUser: '',	// 创建人
       manufacturingNo: '',	// 出厂编号
       originalRecordCode: '',	// 原始记录单编号
@@ -239,7 +239,7 @@
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.calibrationCategory"
+          v-model="listQuery.measureCategory"
           placeholder="请选择检测类别"
           style="width: 195px;"
           clearable
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index cd53837..ad1a2c7 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -4,9 +4,11 @@
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
 import EnvironmentalDialog from '../components/environmentalDialog.vue'
-import OrderDialog from '../components/orderDialog.vue'
 import SampleDialog from '../components/sampleDialog.vue'
-import PrimitiveLogDialog from '../components/primitiveLogDialog.vue'
+import selectSample from '../components/selectSample.vue'
+import selectTemplate from '../components/selectTemplate.vue'
+import selectMeasureDevice from '../components/selectMeasureDevice.vue'
+import type { columnsType, dictType } from './primitiveLogList'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
@@ -21,15 +23,27 @@
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getDictByCode } from '@/api/system/dict'
+import type { IEnvironmental } from '@/views/business/lab/environmental/environmentalList_interface'
+import selectOrder from '@/views/business/schedule/interchangeReceipt/selectOrder.vue'
+import type { ISampleList } from '@/views/business/schedule/interchangeReceipt/receiptList-interface'
+import type { IOrderList } from '@/views/business/schedule/order/orderList_interface'
+import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
-const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '查看',
 } // 字典
+const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const orderVisible = ref(false) // 控制委托书对话框显隐
+const sampleVisible = ref(false) // 控制选择样品对话框显隐
+const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
+const checkoutMeasureDeviceList = ref([]) // 所用设备多选
 // 从路由中获取页面类型参数
 const $route = useRoute()
 const formId = ref<string>('')
@@ -43,59 +57,79 @@
 }
 // 检验是否为空的ref
 const ruleFormRef = ref<FormInstance>()
-// 新建上传参数
+// 新建上传参数--用于调接口上传
 const formInline = ref({
-  originalRecordCode: '', // 	原始记录编号
+  originalRecordCode: '', // 原始记录编号
   originalRecordName: '', // 原始记录名称
-  calibrationCategory: '', // 检校类别
+  measureCategory: '', // 检校类别
   calibrationTime: '', // 		检校时间
   environmentId: '', // 环境记录单id
   calibrationPlace: '', // 检校地点
   orderId: '', // 	委托书id
+  customerId: '', // 	委托方id
   sampleId: '', // 	样品id
   templateId: '', // 	原始记录模板id
-  originalRecordFile: '', // 	minio存储文件名
+  templateName: '', // 原始记录模板名称
+  originalRecordFile: '', // 	minio存储文件名--附件
   remark: '', // 备注
   createUser: '', // 创建人id
+  businessEnvironmentRecord: {
+    temperature: '', // 环境记录单温度
+    humidity: '', // 环境记录单相对湿度
+    environmentCode: '', // 环境记录单编号
+  }, // 环境记录单信息
+  businessOrder: { // 委托书
+    orderCode: '', // 委托书编号
+    customerNo: '', // 委托方代码
+    customerName: '', // 委托方名称
+    customerPhone: '', // 委托方电话
+    customerAddress: '', // 委托方地址
+  },
+  customerSampleInfo: { // 样品信息
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    manufacturingNo: '', // 出厂编号
+    sampleModel: '', // 型号
+    manufacturer: '', // 生产厂家
+    deliverer: '', // 送检人
+    delivererTel: '', // 送检人联系方式
+    planDeliverTime: '', // 预计送达时间
+    requireOverTime: '', // 要求检完时间
+    measureContent: '', // 检定项目
+  },
+  fixedAssetsList: [] as any, // 测量设备
 })
-// 数据详情无需上传
+// 数据详情无需上传--用于显示详情
 const fromListInfo = ref({
-  environmentName: '', // 环境记录单名称
+  environmentCode: '', // 环境记录单编号
   calibrationLocation: '', // 校验地点
   temperature: '', // 环境记录单温度
-  dampness: '', // 环境记录单相对湿度
-  orderNo: '', // 委托方编号
-  orderCode: '', // 委托方代码
-  orderName: '', // 委托方名称
-  orderPhone: '', // 委托方电话
-  orderLocation: '', // 委托方地址
+  humidity: '', // 环境记录单相对湿度
+  orderCode: '', // 委托书编号
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  customerPhone: '', // 委托方电话
+  customerAddress: '', // 委托方地址
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
-  factoryNo: '', // 出厂编号
-  model: '', // 型号
+  manufacturingNo: '', // 出厂编号
+  sampleModel: '', // 型号
   manufacturer: '', // 生产厂家
-  submissionUser: '', // 送检人
-  submissionPhone: '', // 送检人联系方式
-  submissionTime: '', // 送检时间
-  inspectionTime: '', // 检完时间
-  verificationItems: '', // 检定项目
-  templateName: '', // 原始记录模板
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+  submissionTime: '', // 预计送达时间
+  inspectionTime: '', // 要求检完时间
+  measureContent: '', // 检定项目
+  templateId: '', // 原始记录模板id
+  originalRecordFile: '', // 原始记录附件
+  sampleId: '', // 样品id
+  orderId: '', // 委托书id
   fixedAssetsList: [], // 底部设备数组
   fileList: [], // 底部文件表格数组
   applyEquipmentList: [], // 底部设备详情数组
+  businessEnvironmentRecord: {}, // 环境记录单信息
 })
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-}
-// 模拟检测类型的下拉框数组
-const standardOwnerOptions = ref([
-  { name: '检测', id: '1' },
-  { name: '校准', id: '2' },
-  { name: '检定', id: '3' },
-  { name: '验收检定', id: '4' },
-])
+
 // 数据
 const list = ref<object[]>([])
 // 标准配套设备更换表格总数
@@ -116,22 +150,14 @@
   approval: '',
   approvalTime: '',
 })
-// 标准配套设备表头类型
-interface columnsType {
-  text: string
-  value: string
-  align: string
-  required: Boolean
-  choose: Boolean
-  time: Boolean
-}
 
-// 标准配套设备更换表头
+// 所用设备表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: '240',
     required: true,
     choose: true,
     time: false,
@@ -154,7 +180,7 @@
   },
   {
     text: '出厂编号',
-    value: 'mesureResult',
+    value: 'manufacturingNo',
     align: 'center',
     required: true,
     choose: false,
@@ -163,6 +189,7 @@
   {
     text: '证书有效期',
     value: 'validDate',
+    width: '120',
     align: 'center',
     required: true,
     choose: false,
@@ -225,62 +252,29 @@
 }
 // 表单验证规则
 const rules = ref({
-  originalRecordCode: [
-    { required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  originalRecordName: [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
-  calibrationCategory: [
-    { required: true, message: '校验专业不能为空', trigger: ['blur', 'change'] },
-  ],
-  calibrationTime: [
-    { required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] },
-  ],
-  environmentName: [
-    { required: true, message: '环境记录单不能为空', trigger: ['blur', 'change'] },
-  ],
-  calibrationLocation: [
-    { required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] },
-  ],
-  temperature: [
+  'originalRecordName': [{ required: true, message: '原始记录名称不能为空', trigger: ['blur', 'change'] }],
+  'measureCategory': [{ required: true, message: '校验类别不能为空', trigger: ['blur', 'change'] }],
+  'calibrationTime': [{ required: true, message: '校验时间不能为空', trigger: ['blur', 'change'] }],
+  'businessEnvironmentRecord.environmentCode': [{ required: true, message: '环境记录单编号不能为空', trigger: ['blur', 'change'] }],
+  'calibrationLocation': [{ required: true, message: '校验地点不能为空', trigger: ['blur', 'change'] }],
+  'businessEnvironmentRecord.temperature': [
     { required: true, message: '温度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '温度只能为数字', trigger: ['blur', 'change'] },
   ],
-  dampness: [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
+  'businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度不能为空', trigger: ['blur', 'change'] },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '相对湿度只能为数字', trigger: ['blur', 'change'] },
   ],
-  orderNo: [
-    { required: true, message: '委托方编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderCode: [
-    { required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderName: [
-    { required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderPhone: [
-    { required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] },
-  ],
-  orderLocation: [
-    { required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] },
-  ],
-  sampleNo: [
-    { required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  sampleName: [
-    { required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] },
-  ],
-  factoryNo: [
-    { required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] },
-  ],
-  model: [
-    { required: true, message: '型号不能为空', trigger: ['blur', 'change'] },
-  ],
-  manufacturer: [
-    { required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] },
-  ],
-  verificationItems: [
-    { required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] },
-  ],
+  'businessOrder.orderCode': [{ required: true, message: '委托书编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.sampleModel': [{ required: true, message: '样品型号不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
 })
 // 第几条数据选择
 const listIndex = ref(0)
@@ -298,6 +292,14 @@
   listIndex.value = index
   equipmentDialog.value.initDialog()
 }
+
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+
 // 点击增加行
 const addRoow = () => {
   if (
@@ -336,11 +338,13 @@
     fromListInfo.value.fileList.push({})
   }
 }
+
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
+
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
@@ -434,47 +438,134 @@
   standarDialog.value.initDialog()
 }
 
+// ----------------------------选择环境记录单------------------------------------
 // 选择环境记录单Ref
 const environmentalDialog = ref()
 // 选择环境记录单
 const environmentalClick = () => {
   environmentalDialog.value.initDialog()
 }
+// 选择环境记录单表格确认
+const environmentalAdd = (data: IEnvironmental) => {
+  formInline.value.environmentId = data.id // 环境记录单id
+  formInline.value.businessEnvironmentRecord = data // 环境记录单信息
+}
 
-// 环境记录单表格确认
-const environmentalAdd = (data: rowReturn) => {
-  formInline.value.environmentId = data.id
+// ---------------------------------委托书---------------------------------------
+// 点击选择委托书编号
+const handleClickOrder = () => {
+  orderVisible.value = true
 }
-// 委托方组件ref
-const orderDialog = ref()
-// 点击选择委托书
-const orderClick = () => {
-  orderDialog.value.initDialog()
+// 修改委托书对话框显隐
+const changeOrderVisible = (val: boolean) => {
+  orderVisible.value = val
 }
-// 委托方表格确认后
-const orderAdd = (data: rowReturn) => {
-  formInline.value.orderId = data.id
+// 选好委托书
+const confirmCheckoutOrder = (val: any) => {
+  if (val && val.length) {
+    formInline.value.orderId = val[0].id // 委托书id
+    formInline.value.customerId = val[0].customerId// 委托方id
+    formInline.value.businessOrder = val[0]
+  }
 }
-// 样品组件ref
-const sampleDialog = ref()
+// -----------------------------------样品----------------------------------------
 // 点击选择样品
-const sampleClick = () => {
-  sampleDialog.value.initDialog()
+const handleClickSample = () => {
+  if (!formInline.value.orderId) {
+    ElMessage.warning('请先选择委托书')
+    return
+  }
+  sampleVisible.value = true
 }
-// 样品组件弹窗选择完成后
-const sampleAdd = (data: rowReturn) => {
-  formInline.value.sampleId = data.id
+
+// 修改委托方对话框显隐
+const changeSampleVisible = (val: boolean) => {
+  sampleVisible.value = val
 }
-// 原始记录组件ref
-const primitiveLogDialog = ref()
-// 点击原始记录选择
-const primitiveLogClick = () => {
-  primitiveLogDialog.value.initDialog()
+// 选好样品
+const clickConfirmSample = (val: any) => {
+  if (val && val.length) {
+    formInline.value.sampleId = val[0].id// 样品id
+    formInline.value.customerSampleInfo = val[0] // 样品信息
+  }
 }
-// 原始记录选择完成之后
-const primitiveLogAdd = (data: rowReturn) => {
-  formInline.value.templateId = data.id
+
+// -----------------------------------原始记录模板-------------------------------
+// 选择环境记录单Ref
+const templateDialog = ref()
+// 选择环境记录单
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
 }
+// 选择环境记录单表格确认
+const confirmCheckoutTemplate = (val: any) => {
+  // formInline.value.environmentId = data.id // 环境记录单id
+  // formInline.value.businessEnvironmentRecord = data // 环境记录单信息
+  formInline.value.templateId = val.id// 	原始记录模板id
+  formInline.value.templateName = val.templateName// 原始记录模板名称
+}
+
+// -------------------------------------所用设备-----------------------------------
+// 点击所用设备增加行
+const addMeasureDeviceRow = () => {
+  const index = formInline.value.fixedAssetsList.findIndex((item: fixedAssetsType) =>
+    !item.equipmentNo && !item.equipmentName)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  formInline.value.fixedAssetsList.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    validDate: '', // 有效日期
+    manufacturingNo: '', // 出厂编号
+  })
+}
+
+// 点击所用设备删除行
+const delMeasureDeviceRow = () => {
+  if (checkoutMeasureDeviceList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
+      formInline.value.fixedAssetsList.forEach((element: fixedAssetsType, index: number) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          formInline.value.fixedAssetsList.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
+// 点击选择测量设备编号
+const handleClickMeasureDevice = (index: number) => {
+  measureDeviceVisible.value = true
+  selectIndex.value = index
+}
+// 修改测量设备对话框显隐
+const changeMeasureDeviceVisible = (val: boolean) => {
+  measureDeviceVisible.value = val
+}
+// 选好测量设备
+const confirmCheckoutMeasureDevice = (val: any) => {
+  console.log('------')
+  console.log(val)
+
+  if (val && val.length) {
+    const index = formInline.value.fixedAssetsList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    formInline.value.fixedAssetsList.splice(selectIndex.value, 1, val[0])
+  }
+}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -563,6 +654,9 @@
   standard: '',
   extarCss: '',
 })
+onMounted(() => {
+  getDict() // 获取字典
+})
 </script>
 
 <template>
@@ -595,13 +689,12 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="originalRecordCode">
+            <el-form-item label="原始记录编号:">
               <el-input
                 v-model.trim="formInline.originalRecordCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入原始记录编号'"
+                placeholder="系统自动生成"
                 class="full-width-input"
-                clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -617,17 +710,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校专业:" prop="calibrationCategory">
+            <el-form-item label="检校类别:" prop="measureCategory">
               <el-select
-                v-model="formInline.calibrationCategory"
+                v-model="formInline.measureCategory"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                :placeholder="pageType === 'detail' ? '' : '请选择检校类别'"
                 size="default"
                 style="width: 100%;"
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
+                  v-for="item in mesureCategoryList"
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
@@ -649,27 +742,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="环境记录单编号:" prop="environmentName">
-              <el-input
-                v-model.trim="fromListInfo.environmentName"
-                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单编号'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
-              >
-                <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                    @click="environmentalClick"
-                  >
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item
               label="检校地点:"
@@ -684,39 +756,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="temperature">
+            <el-form-item label="环境记录单编号:" prop="businessEnvironmentRecord.environmentCode">
               <el-input
-                v-model.trim="fromListInfo.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                v-model.trim="formInline.businessEnvironmentRecord.environmentCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择环境记录单编号'"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="dampness">
-              <el-input
-                v-model.trim="fromListInfo.dampness"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="委托书编号:" prop="orderNo">
-              <el-input
-                v-model.trim="fromListInfo.orderNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
-                class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="orderClick"
+                    @click="environmentalClick"
                   >
                     选择
                   </el-button>
@@ -725,55 +775,96 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="orderCode">
+            <el-form-item label="温度(℃):" prop="businessEnvironmentRecord.temperature">
               <el-input
-                v-model.trim="fromListInfo.orderCode"
+                v-model.trim="formInline.businessEnvironmentRecord.temperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):" prop="businessEnvironmentRecord.humidity">
+              <el-input
+                v-model.trim="formInline.businessEnvironmentRecord.humidity"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="委托书编号:" prop="businessOrder.orderCode">
+              <el-input
+                v-model.trim="formInline.businessOrder.orderCode"
+                :placeholder="pageType === 'detail' ? '' : '请选择委托书编号'"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="handleClickOrder"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="businessOrder.customerNo">
+              <el-input
+                v-model.trim="formInline.businessOrder.customerNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="orderName">
+            <el-form-item label="委托方名称:" prop="businessOrder.customerName">
               <el-input
-                v-model.trim="fromListInfo.orderName"
+                v-model.trim="formInline.businessOrder.customerName"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="orderPhone">
+            <el-form-item label="委托方电话:" prop="businessOrder.customerPhone">
               <el-input
-                v-model.trim="fromListInfo.orderPhone"
+                v-model.trim="formInline.businessOrder.customerPhone"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="orderLocation">
+            <el-form-item label="委托方地址:" prop="businessOrder.customerAddress">
               <el-input
-                v-model.trim="fromListInfo.orderLocation"
+                v-model.trim="formInline.businessOrder.customerAddress"
                 :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="sampleNo">
+            <el-form-item label="样品编号:" prop="customerSampleInfo.sampleNo">
               <el-input
-                v-model.trim="fromListInfo.sampleNo"
+                v-model.trim="formInline.customerSampleInfo.sampleNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
@@ -782,7 +873,7 @@
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="sampleClick"
+                    @click="handleClickSample"
                   >
                     选择
                   </el-button>
@@ -791,9 +882,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="sampleName">
+            <el-form-item label="样品名称:" prop="customerSampleInfo.sampleName">
               <el-input
-                v-model.trim="fromListInfo.sampleName"
+                v-model.trim="formInline.customerSampleInfo.sampleName"
                 :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
@@ -804,9 +895,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="factoryNo">
+            <el-form-item label="出厂编号:" prop="customerSampleInfo.manufacturingNo">
               <el-input
-                v-model.trim="fromListInfo.factoryNo"
+                v-model.trim="formInline.customerSampleInfo.manufacturingNo"
                 :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
@@ -815,9 +906,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="model">
+            <el-form-item label="型号:" prop="customerSampleInfo.sampleModel">
               <el-input
-                v-model.trim="fromListInfo.model"
+                v-model.trim="formInline.customerSampleInfo.sampleModel"
                 :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
@@ -826,9 +917,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="manufacturer">
+            <el-form-item label="生产厂家:" prop="customerSampleInfo.manufacturer">
               <el-input
-                v-model.trim="fromListInfo.manufacturer"
+                v-model.trim="formInline.customerSampleInfo.manufacturer"
                 :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
@@ -836,12 +927,10 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="送检人:">
               <el-input
-                v-model.trim="fromListInfo.submissionUser"
+                v-model.trim="formInline.customerSampleInfo.deliverer"
                 :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
@@ -852,7 +941,7 @@
           <el-col :span="6">
             <el-form-item label="联系方式:">
               <el-input
-                v-model.trim="fromListInfo.submissionPhone"
+                v-model.trim="formInline.customerSampleInfo.delivererTel"
                 :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
@@ -863,7 +952,7 @@
           <el-col :span="6">
             <el-form-item label="预计送达时间:">
               <el-date-picker
-                v-model="fromListInfo.submissionTime"
+                v-model="formInline.customerSampleInfo.planDeliverTime"
                 type="datetime"
                 style="width: 100%;"
                 clearable
@@ -875,12 +964,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="预计检完时间:">
+            <el-form-item label="要求检完时间:">
               <el-date-picker
-                v-model="fromListInfo.inspectionTime"
+                v-model="formInline.customerSampleInfo.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                :placeholder="pageType === 'detail' ? '' : '请选择要求检完时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
                 value-format="YYYY-MM-DD hh:mm:ss"
@@ -891,9 +980,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="verificationItems">
+            <el-form-item label="检定项目:" prop="measureContent">
               <el-input
-                v-model.trim="fromListInfo.verificationItems"
+                v-model.trim="fromListInfo.measureContent"
                 :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
@@ -919,16 +1008,16 @@
           <el-col :span="6">
             <el-form-item label="原始记录模板:">
               <el-input
-                v-model.trim="fromListInfo.templateName"
+                v-model.trim="formInline.templateName"
                 :placeholder="pageType === 'detail' ? '' : '请选择原始记录模板'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
                   <el-button
                     size="small"
-                    @click="primitiveLogClick"
+                    @click="handleClickTemplate"
                   >
                     选择
                   </el-button>
@@ -953,19 +1042,19 @@
     </detail-page>
     <detail-block title=" 所用设备">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
           增加行
         </el-button>
         <el-button
           v-if="pageType !== 'detail'"
           type="info"
-          @click="removeRow('1')"
+          @click="delMeasureDeviceRow"
         >
           删除行
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.fixedAssetsList"
+        :data="formInline.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
@@ -981,6 +1070,7 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
+          :width="item.width"
           align="center"
         >
           <template #header>
@@ -999,7 +1089,7 @@
                 <el-button
                   v-if="pageType !== 'detail'"
                   size="small"
-                  @click="chooseList(scope.row, scope.$index)"
+                  @click="handleClickMeasureDevice(scope.$index)"
                 >
                   选择
                 </el-button>
@@ -1064,15 +1154,15 @@
     </detail-block>
   </app-container>
   <!-- 选择设备弹窗 -->
-  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
+  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
   <!-- 选择环境记录单弹窗 -->
   <environmental-dialog ref="environmentalDialog" @add="environmentalAdd" />
-  <!-- 选择委托方弹窗 -->
-  <order-dialog ref="orderDialog" @add="orderAdd" />
-  <!-- 选择样品弹窗 -->
-  <sample-dialog ref="sampleDialog" @add="sampleAdd" />
-  <!-- 选择原始记录单 -->
-  <primitive-log-dialog ref="primitiveLogDialog" @add="primitiveLogAdd" />
+  <!-- 选择委托书组件 -->
+  <select-order v-model:visible="orderVisible" @confirm-checkout="confirmCheckoutOrder" @change-visible="changeOrderVisible" />
+  <!-- 选择样品组件 -->
+  <select-sample v-model:visible="sampleVisible" :customer-id="formInline.customerId" @click-confirm-sample="clickConfirmSample" @change-visible="changeSampleVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-template ref="templateDialog" @add="confirmCheckoutTemplate" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
index 7b1923a..1ba8293 100644
--- a/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
+++ b/src/views/business/schedule/interchangeReceipt/receiptEdit.vue
@@ -225,7 +225,7 @@
     dataForm.value.orderTime = val[0].orderTime // 委托日期
     dataForm.value.requireOverTime = val[0].requireOverTime // 完成时间
     dataForm.value.customerNo = val[0].customerNo // 委托方代码
-    dataForm.value.customerId = val[0].id // 委托方id
+    dataForm.value.customerId = val[0].customerId // 委托方id
     dataForm.value.customerName = val[0].customerName // 委托方名称
     dataForm.value.customerAddress = val[0].customerAddress // 委托方地址
   }
@@ -235,7 +235,7 @@
 // 点击批量增加
 const multiAdd = () => {
   if (!dataForm.value.customerNo) {
-    ElMessage.warning('请先选择委托方')
+    ElMessage.warning('请先选择委托书')
     return
   }
   sampleVisible.value = true
@@ -780,7 +780,7 @@
       </div>
     </div>
     <!-- 选择委托方组件 -->
-    <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" />
+    <!-- <select-customer v-model:visible="customerVisible" @confirmCheckout="confirmCheckoutCustomer" @changeVisible="changeCustomerVisible" /> -->
     <!-- 选择样品组件 -->
     <select-sample v-model:visible="sampleVisible" :customer-id="dataForm.customerId" @clickConfirmSample="clickConfirmSample" @changeVisible="changeSampleVisible" />
     <!-- 选择委托书组件 -->
diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
index 0f00a0c..4ee6d72 100644
--- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue
+++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue
@@ -1,5 +1,5 @@
 <!-- 选择委托书dialog -->
-<script setup lang="ts" name="SelectSample">
+<script setup lang="ts" name="SelectOrder">
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage } from 'element-plus'
@@ -162,7 +162,7 @@
 
 <template>
   <div>
-    <el-dialog v-model="visible" title="选择委托书" @close="cancle">
+    <el-dialog v-model="visible" title="选择委托书" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
@@ -221,7 +221,7 @@
         is-showmulti-select
         :is-multi="false"
         @change="changePage"
-        @multiSelect="handleSelectionChange"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center" fixed>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index d49e5f7..2f8f8a4 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -1,3 +1,4 @@
+<!-- 委托书列表 -->
 <script lang="ts" setup name="OrderList">
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
index 5c14317..fd9a10b 100644
--- a/src/views/business/schedule/order/orderList_interface.ts
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -15,8 +15,10 @@
 export interface IOrderList {
   id: string
   orderCode: string // 委托书编号
+  customerId: string // 委托方id
   customerNo: string // 委托方代码
   customerName: string // 委托方名称
+  customerPhone?: string // 委托方电话
   customerAddress: string // 委托方地址
   deliverer: string // 送检人
   delivererTel: string // 送样人联系方式
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index 16c437a..9cda336 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -165,8 +165,8 @@
     // 不合格率：不合格总人次/考核总人次
     const notQualifiedRate = ((notQualifiedCount / total) * 100).toFixed(2)
     TrainLogSList.value = [
-      { name: `合  格   ${qualifiedCount}人 - ${qualifiedRate}%`, value: qualifiedCount },
-      { name: `不合格   ${notQualifiedCount}人 - ${notQualifiedRate}%`, value: notQualifiedCount },
+      { name: `合   格   ${qualifiedCount}人次 - ${qualifiedRate}%`, value: qualifiedCount },
+      { name: `不合格   ${notQualifiedCount}人次 - ${notQualifiedRate}%`, value: notQualifiedCount },
     ]
   }).catch((_) => {
     // 处理异常